MTA-4014: Update extended functional tests suite for Cloud plan

lanken · lanken · commit 7e9194a6138d · 2017-01-06T14:22:51.000+02:00
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "magento/mtf": "1.0.0-rc43",
+        "magento/mtf": "1.0.0-rc47",
         "php": "~5.6.5|7.0.2|7.0.4|~7.0.6",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2"
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/FormPageActions.php
@@ -85,7 +85,7 @@ public function back()
      */
     public function reset()
     {
-        $this->waitBeforeClick();
+        $this->waitForElementVisible($this->resetButton);
         $this->_rootElement->find($this->resetButton)->click();
     }
 
@@ -94,7 +94,7 @@ public function reset()
      */
     public function saveAndContinue()
     {
-        $this->waitBeforeClick();
+        $this->waitForElementVisible($this->saveAndContinueButton);
         $this->_rootElement->find($this->saveAndContinueButton)->click();
         $this->waitForElementNotVisible('.popup popup-loading');
         $this->waitForElementNotVisible('.loader');
@@ -105,7 +105,7 @@ public function saveAndContinue()
      */
     public function save()
     {
-        $this->waitBeforeClick();
+        $this->waitForElementVisible($this->saveButton);
         $this->_rootElement->find($this->saveButton)->click();
         $this->waitForElementNotVisible($this->spinner);
         $this->waitForElementNotVisible($this->loader, Locator::SELECTOR_XPATH);
@@ -117,7 +117,10 @@ public function save()
      */
     public function delete()
     {
-        $this->waitBeforeClick();
+        $this->waitForElementNotVisible($this->spinner);
+        $this->waitForElementNotVisible($this->loader, Locator::SELECTOR_XPATH);
+        $this->waitForElementNotVisible($this->loaderOld, Locator::SELECTOR_XPATH);
+        $this->waitForElementVisible($this->deleteButton);
         $this->_rootElement->find($this->deleteButton)->click();
     }
 
@@ -130,16 +133,4 @@ public function checkDeleteButton()
     {
         return $this->_rootElement->find($this->deleteButton)->isVisible();
     }
-
-    /**
-     * Wait for User before clicking any Button which calls JS validation on correspondent form.
-     * See details in MAGETWO-31121.
-     *
-     * @return void
-     */
-    protected function waitBeforeClick()
-    {
-        time_nanosleep(0, 600000000);
-        usleep(1000000);
-    }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Widget/Grid.php
@@ -158,7 +158,7 @@ abstract class Grid extends Block
      *
      * @var string
      */
-    protected $loader = '[data-role="spinner"]';
+    protected $loader = '.admin__data-grid-outer-wrap [data-role="spinner"]';
 
     /**
      * Locator for next page action
@@ -293,7 +293,7 @@ public function searchAndSelect(array $filter)
         if ($selectItem->isVisible()) {
             $selectItem->click();
         } else {
-            throw new \Exception('Searched item was not found.');
+            throw new \Exception("Searched item was not found by filter\n" . print_r($filter, true));
         }
     }
 
@@ -467,6 +467,7 @@ public function isFirstRowVisible()
      */
     public function openFirstRow()
     {
+        $this->waitLoader();
         $this->_rootElement->find($this->firstRowSelector, Locator::SELECTOR_XPATH)->click();
     }
 
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.xml
@@ -153,11 +153,6 @@
             <url_key/>
         </fields>
     </search-engine-optimization>
-    <related>
-        <class>\Magento\Ui\Test\Block\Adminhtml\Section</class>
-        <selector>[data-index='related']</selector>
-        <strategy>css selector</strategy>
-    </related>
     <websites>
         <class>\Magento\Ui\Test\Block\Adminhtml\Section</class>
         <selector>[data-index='websites']</selector>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/NavigateUpSellProductsTest.php
@@ -6,8 +6,6 @@
 
 namespace Magento\Catalog\Test\TestCase\Product;
 
-use Magento\Mtf\Fixture\InjectableFixture;
-
 /**
  * Preconditions:
  * 1. Create products.
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.xml
@@ -110,7 +110,7 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertAttributeOptionsOnProductForm" />
         </variation>
         <variation name="CreateProductAttributeEntityTestVariation6">
-            <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes</data>
             <data name="attributeSet/dataset" xsi:type="string">custom_attribute_set</data>
             <data name="productAttribute/data/frontend_label" xsi:type="string">Dropdown_Admin_%isolation%</data>
             <data name="productAttribute/data/frontend_input" xsi:type="string">Dropdown</data>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplySeveralCatalogPriceRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/ApplySeveralCatalogPriceRuleEntityTest.xml
@@ -8,7 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\CatalogRule\Test\TestCase\ApplySeveralCatalogPriceRuleEntityTest" summary="Apply Several Catalog Price Rules " ticketId="MAGETWO-24780">
         <variation name="ApplySeveralCatalogRules_Sequentially">
-            <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes</data>
             <data name="catalogRulesOriginal/priority_0" xsi:type="string">catalog_price_rule_priority_0</data>
             <data name="catalogRulesOriginal/priority_1" xsi:type="string">-</data>
             <data name="catalogRulesOriginal/priority_2" xsi:type="string">catalog_price_rule_priority_2</data>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogRuleTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogRuleTest.xml
@@ -29,7 +29,7 @@
             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleAppliedShoppingCart" />
         </variation>
         <variation name="CatalogRule_Create_ForNewCustomerGroup_ApplyAsPercentage" summary="Apply Catalog Price Rules to Specific Customer Group" ticketId="MAGETWO-12908">
-            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
+            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test, to_maintain:yes</data>
             <data name="customer/dataset" xsi:type="string">customer_with_new_customer_group</data>
             <data name="product" xsi:type="string">simple_10_dollar</data>
             <data name="catalogPriceRule/data/name" xsi:type="string">rule_name%isolation%</data>
@@ -54,7 +54,7 @@
             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleAppliedShoppingCart" />
         </variation>
         <variation name="CatalogRule_Create_ForGuestUsers_ByProductAttribute_AdjustPriceToValue" summary="Create and Apply Catalog Price Rule with Product Attribute in Condition" ticketId="MAGETWO-30095">
-            <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes</data>
             <data name="product" xsi:type="string">product_with_custom_color_attribute</data>
             <data name="catalogPriceRule/data/name" xsi:type="string">Catalog Price Rule %isolation%</data>
             <data name="catalogPriceRule/data/is_active" xsi:type="string">Active</data>
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/UpdateCatalogPriceRuleEntityTest.xml b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/UpdateCatalogPriceRuleEntityTest.xml
@@ -19,7 +19,7 @@
             <constraint name="Magento\CatalogRule\Test\Constraint\AssertCatalogPriceRuleNotAppliedProductPage" />
         </variation>
         <variation name="CatalogRule_Update_Name_Description_Status_Conditions_Action_DiscountAmount">
-            <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
+            <data name="tag" xsi:type="string">test_type:extended_acceptance_test, to_maintain:yes</data>
             <data name="catalogPriceRuleOriginal/dataset" xsi:type="string">active_catalog_price_rule_with_conditions</data>
             <data name="catalogPriceRule/data/name" xsi:type="string">New Catalog Price Rule Name %isolation%</data>
             <data name="catalogPriceRule/data/description" xsi:type="string">New Catalog Price Rule Description %isolation%</data>
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestStep/CreateSalesRuleStep.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/TestStep/CreateSalesRuleStep.php
@@ -59,7 +59,6 @@ public function run()
     {
         $result['salesRule'] = null;
         if ($this->salesRule !== null) {
-            $this->deleteAllSalesRule->run();
             $salesRule = $this->fixtureFactory->createByCode(
                 'salesRule',
                 ['dataset' => $this->salesRule]
diff --git a/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.xml b/dev/tests/functional/tests/app/Magento/Sitemap/Test/TestCase/CreateSitemapEntityTest.xml
@@ -8,7 +8,6 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Sitemap\Test\TestCase\CreateSitemapEntityTest" summary="Create Sitemap" ticketId="MAGETWO-23277">
         <variation name="CreateSitemapEntityTestVariation1">
-            <data name="tag" xsi:type="string">test_type:extended_acceptance_test</data>
             <data name="sitemap/data/sitemap_filename" xsi:type="string">sitemap.xml</data>
             <data name="sitemap/data/sitemap_path" xsi:type="string">/</data>
             <constraint name="Magento\Sitemap\Test\Constraint\AssertSitemapSuccessSaveMessage" />
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/Curl/RemoveTaxRule.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Handler/Curl/RemoveTaxRule.php
@@ -39,9 +39,9 @@ class RemoveTaxRule extends Curl
     public function persist(FixtureInterface $fixture = null)
     {
         $this->taxRuleGridUrl = $_ENV['app_backend_url'] . 'tax/rule/index/';
-        $curl = $this->_getCurl($this->taxRuleGridUrl);
+        $curl = $this->getCurl($this->taxRuleGridUrl);
         $response = $curl->read();
-        $this->_removeTaxRules($response);
+        $this->removeTaxRules($response);
         $curl->close();
         return $response;
     }
@@ -72,7 +72,7 @@ protected function removeTaxRules($data)
             return null;
         }
         foreach ($result[1] as $taxRuleId) {
-            $this->_deleteTaxRuleRequest((int)$taxRuleId);
+            $this->deleteTaxRuleRequest((int)$taxRuleId);
             break;
         }
 
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php
@@ -59,7 +59,6 @@ public function run()
     {
         $result['taxRule'] = null;
         if ($this->taxRule !== null) {
-            $this->deleteAllTaxRule->run();
             $taxRuleDataSets = explode(',', $this->taxRule);
             foreach ($taxRuleDataSets as $taxRuleDataSet) {
                 $taxRule = $this->fixtureFactory->createByCode(
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/DataGrid.php
diff --git a/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/Modal.php b/dev/tests/functional/tests/app/Magento/Ui/Test/Block/Adminhtml/Modal.php
diff --git a/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/extended_acceptance.xml b/dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/extended_acceptance.xml

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"require": {`
`3`		`- "magento/mtf": "1.0.0-rc43",`
	`3`	`+ "magento/mtf": "1.0.0-rc47",`
`4`	`4`	`"php": "~5.6.5\|7.0.2\|7.0.4\|~7.0.6",`
`5`	`5`	`"phpunit/phpunit": "4.1.0",`
`6`	`6`	`"phpunit/phpunit-selenium": ">=1.2"`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ abstract class Grid extends Block`
`158`	`158`	`*`
`159`	`159`	`* @var string`
`160`	`160`	`*/`
`161`		`- protected $loader = '[data-role="spinner"]';`
	`161`	`+ protected $loader = '.admin__data-grid-outer-wrap [data-role="spinner"]';`
`162`	`162`
`163`	`163`	`/**`
`164`	`164`	`* Locator for next page action`
`@@ -293,7 +293,7 @@ public function searchAndSelect(array $filter)`
`293`	`293`	`if ($selectItem->isVisible()) {`
`294`	`294`	`$selectItem->click();`
`295`	`295`	`} else {`
`296`		`- throw new \Exception('Searched item was not found.');`
	`296`	`+ throw new \Exception("Searched item was not found by filter\n" . print_r($filter, true));`
`297`	`297`	`}`
`298`	`298`	`}`
`299`	`299`
`@@ -467,6 +467,7 @@ public function isFirstRowVisible()`
`467`	`467`	`*/`
`468`	`468`	`public function openFirstRow()`
`469`	`469`	`{`
	`470`	`+ $this->waitLoader();`
`470`	`471`	`$this->_rootElement->find($this->firstRowSelector, Locator::SELECTOR_XPATH)->click();`
`471`	`472`	`}`
`472`	`473`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,6 @@ public function run()`
`59`	`59`	`{`
`60`	`60`	`$result['salesRule'] = null;`
`61`	`61`	`if ($this->salesRule !== null) {`
`62`		`- $this->deleteAllSalesRule->run();`
`63`	`62`	`$salesRule = $this->fixtureFactory->createByCode(`
`64`	`63`	`'salesRule',`
`65`	`64`	`['dataset' => $this->salesRule]`