Merge remote-tracking branch 'origin/MAGETWO-65710' into bugfixes

olysenko · olysenko · commit 0c6905e2f3c1 · 2017-03-24T11:55:24.000+02:00
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Test\Unit\Block\Adminhtml\System\Config;
+namespace Magento\Analytics\Test\Unit\Block\Adminhtml\System\Config;
 
 use Magento\Framework\Data\Form;
 use Magento\Analytics\Block\Adminhtml\System\Config\AdditionalComment;
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Test\Unit\Block\Adminhtml\System\Config;
+namespace Magento\Analytics\Test\Unit\Block\Adminhtml\System\Config;
 
 use Magento\Framework\Data\Form;
 use Magento\Analytics\Block\Adminhtml\System\Config\CollectionTimeLabel;
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Test\Unit\Block\Adminhtml\System\Config;
+namespace Magento\Analytics\Test\Unit\Block\Adminhtml\System\Config;
 
 use Magento\Analytics\Block\Adminhtml\System\Config\SubscriptionStatusLabel;
 use Magento\Analytics\Model\SubscriptionStatusProvider;
diff --git a/dev/tests/functional/tests/app/Magento/Analytics/Test/Block/System/Config/AnalyticsForm.php b/dev/tests/functional/tests/app/Magento/Analytics/Test/Block/System/Config/AnalyticsForm.php
@@ -72,7 +72,7 @@ public function isAnalyticsEnabled()
      * @param string $state
      * @return array|string
      */
-    public function analyticsToggle($state = 'Enabled')
+    public function analyticsToggle($state = 'Enable')
     {
         return $this->_rootElement->find($this->analyticsStatus, Locator::SELECTOR_CSS, 'select')->setValue($state);
     }

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public function isAnalyticsEnabled()`
`72`	`72`	`* @param string $state`
`73`	`73`	`* @return array\|string`
`74`	`74`	`*/`
`75`		`- public function analyticsToggle($state = 'Enabled')`
	`75`	`+ public function analyticsToggle($state = 'Enable')`
`76`	`76`	`{`
`77`	`77`	`return $this->_rootElement->find($this->analyticsStatus, Locator::SELECTOR_CSS, 'select')->setValue($state);`
`78`	`78`	`}`