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

olysenko · olysenko · commit eff7a26f11f2 · 2017-11-08T18:58:16.000+02:00
diff --git a/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/UpdateCustomVariableEntityTest.php b/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/UpdateCustomVariableEntityTest.php
@@ -119,9 +119,12 @@ public function tearDown()
             $storeIndex->getStoreGrid()->searchAndOpen(['store_title' => $this->store->getName()]);
             $storeNew = $this->objectManager->create(\Magento\Backend\Test\Page\Adminhtml\StoreNew::class);
             $storeNew->getFormPageActions()->delete();
+
+            /** @var \Magento\Backend\Test\Page\Adminhtml\StoreDelete $storeDelete */
             $storeDelete = $this->objectManager->create(\Magento\Backend\Test\Page\Adminhtml\StoreDelete::class);
             $storeDelete->getStoreForm()->fillForm(['create_backup' => 'No']);
             $storeDelete->getFormPageActions()->delete();
+            $storeDelete->getModalBlock()->acceptAlert();
         }
         $this->store = null;
     }
diff --git a/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/UpdateCustomVariableEntityTest.xml b/dev/tests/functional/tests/app/Magento/Variable/Test/TestCase/UpdateCustomVariableEntityTest.xml
@@ -19,7 +19,6 @@
             <constraint name="Magento\Variable\Test\Constraint\AssertCustomVariableInPage" />
         </variation>
         <variation name="UpdateCustomVariableEntityTestVariation2">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="customVariable/data/code" xsi:type="string">variableCode%isolation%</data>
             <data name="customVariable/data/name" xsi:type="string">variableName%isolation%</data>
             <data name="customVariable/data/use_default_value" xsi:type="string">No</data>
@@ -31,7 +30,6 @@
             <constraint name="Magento\Variable\Test\Constraint\AssertCustomVariableInPage" />
         </variation>
         <variation name="UpdateCustomVariableEntityTestVariation3">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="customVariable/data/code" xsi:type="string">variableCode%isolation%</data>
             <data name="customVariable/data/name" xsi:type="string">variableName%isolation%</data>
             <data name="customVariable/data/use_default_value" xsi:type="string">No</data>
@@ -44,7 +42,6 @@
             <constraint name="Magento\Variable\Test\Constraint\AssertCustomVariableInPage" />
         </variation>
         <variation name="UpdateCustomVariableEntityTestVariation4">
-            <data name="tag" xsi:type="string">stable:no</data>
             <data name="customVariable/data/code" xsi:type="string">variableCode%isolation%</data>
             <data name="customVariable/data/name" xsi:type="string">variableName%isolation%</data>
             <data name="customVariable/data/use_default_value" xsi:type="string">No</data>

Original file line number	Diff line number	Diff line change
`@@ -119,9 +119,12 @@ public function tearDown()`
`119`	`119`	`$storeIndex->getStoreGrid()->searchAndOpen(['store_title' => $this->store->getName()]);`
`120`	`120`	`$storeNew = $this->objectManager->create(\Magento\Backend\Test\Page\Adminhtml\StoreNew::class);`
`121`	`121`	`$storeNew->getFormPageActions()->delete();`
	`122`	`+`
	`123`	`+ /** @var \Magento\Backend\Test\Page\Adminhtml\StoreDelete $storeDelete */`
`122`	`124`	`$storeDelete = $this->objectManager->create(\Magento\Backend\Test\Page\Adminhtml\StoreDelete::class);`
`123`	`125`	`$storeDelete->getStoreForm()->fillForm(['create_backup' => 'No']);`
`124`	`126`	`$storeDelete->getFormPageActions()->delete();`
	`127`	`+ $storeDelete->getModalBlock()->acceptAlert();`
`125`	`128`	`}`
`126`	`129`	`$this->store = null;`
`127`	`130`	`}`