MTA-2712: Functional test maintenance. Part 1

Dmytro Aponasenko · Dmytro Aponasenko · commit e9484459bec7 · 2015-10-19T17:16:17.000+03:00
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
@@ -49,7 +49,7 @@ class FormPageActions extends PageActions
      *
      * @var string
      */
-    protected $deleteButton = '#delete';
+    protected $deleteButton = '.delete';
 
     /**
      * Magento loader
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/Compare/Sidebar.php
@@ -32,13 +32,6 @@ class Sidebar extends ListCompare
      */
     protected $clearAll = '#compare-clear-all';
 
-    /**
-     * Selector for alert.
-     *
-     * @var string
-     */
-    protected $alertModal = '._show[data-role=modal]';
-
     /**
      * Get compare products block content.
      *
@@ -86,9 +79,6 @@ function () use ($rootElement, $selector) {
             }
         );
         $this->_rootElement->find($this->clearAll)->click();
-        $element = $this->browser->find($this->alertModal);
-        /** @var \Magento\Ui\Test\Block\Adminhtml\Modal $modal */
-        $modal = $this->blockFactory->create('Magento\Ui\Test\Block\Adminhtml\Modal', ['element' => $element]);
-        $modal->acceptAlert();
+        $this->browser->acceptAlert();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml
@@ -271,7 +271,6 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInStock" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductGroupedPriceOnProductPage" />
         </variation>
         <variation name="CreateSimpleProductEntityTestVariation16">
             <data name="description" xsi:type="string">Create product with tax class and check absent special price</data>
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateVirtualProductEntityTest.xml
@@ -76,7 +76,6 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductGroupedPriceOnProductPage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductCustomOptionsOnProductPage" />
         </variation>
         <variation name="CreateVirtualProductEntityTestVariation6">
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateVirtualProductEntityTest.xml
@@ -118,7 +118,6 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductVisibleInCategory" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductGroupedPriceOnProductPage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
         </variation>
@@ -210,7 +209,6 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductForm" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSpecialPriceOnProductPage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductGroupedPriceOnProductPage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInCategory" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSearchableBySku" />
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Totals.php
@@ -10,83 +10,82 @@
 use Magento\Mtf\Client\Locator;
 
 /**
- * Class Totals
- * Cart totals block
+ * Cart totals block.
  */
 class Totals extends Block
 {
     /**
-     * Grand total search mask
+     * Grand total search mask.
      *
      * @var string
      */
     protected $grandTotal = '.grand.totals .price';
 
     /**
-     * Grand total search mask
+     * Grand total search mask.
      *
      * @var string
      */
     protected $grandTotalExclTax = '.totals.grand.excl span';
 
     /**
-     * Grand total search mask
+     * Grand total search mask.
      *
      * @var string
      */
     protected $grandTotalInclTax = '.totals.grand.incl span';
 
     /**
-     * Subtotal search mask
+     * Subtotal search mask.
      *
      * @var string
      */
     protected $subtotal = '.totals.sub .price';
 
     /**
-     * Subtotal search mask
+     * Subtotal search mask.
      *
      * @var string
      */
     protected $subtotalExclTax = '.totals.sub.excl .price';
 
     /**
-     * Subtotal search mask
+     * Subtotal search mask.
      *
      * @var string
      */
     protected $subtotalInclTax = '.totals.sub.incl .price';
 
     /**
-     * Tax search mask
+     * Tax search mask.
      *
      * @var string
      */
     protected $tax = '.totals-tax span';
 
     /**
-     * Get shipping price selector
+     * Get shipping price selector.
      *
      * @var string
      */
     protected $shippingPriceSelector = '.shipping.excl .price';
 
     /**
-     * Get discount
+     * Get discount.
      *
      * @var string
      */
     protected $discount = '[class=totals] .amount .price';
 
     /**
-     * Get shipping price including tax selector
+     * Get shipping price including tax selector.
      *
      * @var string
      */
     protected $shippingPriceInclTaxSelector = '.shipping.incl .price';
 
     /**
-     * Get shipping price block selector
+     * Get shipping price block selector.
      *
      * @var string
      */
@@ -100,7 +99,7 @@ class Totals extends Block
     protected $blockWaitElement = '.loading-mask';
 
     /**
-     * Get Grand Total Text
+     * Get Grand Total Text.
      *
      * @return string
      */
@@ -111,7 +110,7 @@ public function getGrandTotal()
     }
 
     /**
-     * Get Grand Total Text
+     * Get Grand Total Text.
      *
      * @return string|null
      */
@@ -122,7 +121,7 @@ public function getGrandTotalIncludingTax()
     }
 
     /**
-     * Get Grand Total Text
+     * Get Grand Total Text.
      *
      * @return string|null
      */
@@ -133,7 +132,7 @@ public function getGrandTotalExcludingTax()
     }
 
     /**
-     * Get Tax text from Order Totals
+     * Get Tax text from Order Totals.
      *
      * @return string|null
      */
@@ -144,7 +143,7 @@ public function getTax()
     }
 
     /**
-     * Check that Tax is visible
+     * Check that Tax is visible.
      *
      * @return bool
      */
@@ -154,7 +153,7 @@ public function isTaxVisible()
     }
 
     /**
-     * Get Subtotal text
+     * Get Subtotal text.
      *
      * @return string
      */
@@ -165,7 +164,7 @@ public function getSubtotal()
     }
 
     /**
-     * Get Subtotal text
+     * Get Subtotal text.
      *
      * @return string|null
      */
@@ -176,7 +175,7 @@ public function getSubtotalIncludingTax()
     }
 
     /**
-     * Get Subtotal text
+     * Get Subtotal text.
      *
      * @return string|null
      */
@@ -187,7 +186,7 @@ public function getSubtotalExcludingTax()
     }
 
     /**
-     * Method that escapes currency symbols
+     * Method that escapes currency symbols.
      *
      * @param string $price
      * @return string|null
@@ -199,7 +198,7 @@ protected function escapeCurrency($price)
     }
 
     /**
-     * Get discount
+     * Get discount.
      *
      * @return string|null
      */
@@ -210,7 +209,7 @@ public function getDiscount()
     }
 
     /**
-     * Get shipping price
+     * Get shipping price.
      *
      * @return string|null
      */
@@ -221,7 +220,7 @@ public function getShippingPrice()
     }
 
     /**
-     * Get shipping price
+     * Get shipping price.
      *
      * @return string|null
      */
@@ -232,7 +231,7 @@ public function getShippingPriceInclTax()
     }
 
     /**
-     * Is visible shipping price block
+     * Is visible shipping price block.
      *
      * @return bool
      */
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.xml
@@ -276,7 +276,6 @@
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
             <constraint name="Magento\Downloadable\Test\Constraint\AssertDownloadableProductForm" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductPage" />
-            <constraint name="Magento\Catalog\Test\Constraint\AssertProductGroupedPriceOnProductPage" />
         </variation>
         <variation name="CreateDownloadableProductEntityTestVariation15">
             <data name="description" xsi:type="string">Create product with tier price</data>
diff --git a/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Fedex/Test/TestCase/OnePageCheckoutTest.xml
@@ -18,6 +18,7 @@
             <data name="cart/data/shipping_method" xsi:type="string">International Economy</data>
             <data name="payment/method" xsi:type="string">checkmo</data>
             <data name="configData" xsi:type="string">checkmo, fedex, shipping_origin_US_CA</data>
+            <data name="tag" xsi:type="string">test_type:3rd_party_test</data>
             <constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage" />
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderInOrdersGrid" />
             <constraint name="Magento\Checkout\Test\Constraint\AssertCartIsEmpty" />
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Constraint/AssertGroupedPriceOnGroupedProductPage.php
diff --git a/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php b/dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Actions.php
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/TaxRate.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/TaxRate.php
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AssertTaxRuleApplying.php

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class FormPageActions extends PageActions`
`49`	`49`	`*`
`50`	`50`	`* @var string`
`51`	`51`	`*/`
`52`		`- protected $deleteButton = '#delete';`
	`52`	`+ protected $deleteButton = '.delete';`
`53`	`53`
`54`	`54`	`/**`
`55`	`55`	`* Magento loader`
Original file line number	Diff line number	Diff line change
`@@ -32,13 +32,6 @@ class Sidebar extends ListCompare`
`32`	`32`	`*/`
`33`	`33`	`protected $clearAll = '#compare-clear-all';`
`34`	`34`
`35`		`- /**`
`36`		`- * Selector for alert.`
`37`		`- *`
`38`		`- * @var string`
`39`		`- */`
`40`		`- protected $alertModal = '._show[data-role=modal]';`
`41`		`-`
`42`	`35`	`/**`
`43`	`36`	`* Get compare products block content.`
`44`	`37`	`*`
`@@ -86,9 +79,6 @@ function () use ($rootElement, $selector) {`
`86`	`79`	`}`
`87`	`80`	`);`
`88`	`81`	`$this->_rootElement->find($this->clearAll)->click();`
`89`		`- $element = $this->browser->find($this->alertModal);`
`90`		`- /** @var \Magento\Ui\Test\Block\Adminhtml\Modal $modal */`
`91`		`- $modal = $this->blockFactory->create('Magento\Ui\Test\Block\Adminhtml\Modal', ['element' => $element]);`
`92`		`- $modal->acceptAlert();`
	`82`	`+ $this->browser->acceptAlert();`
`93`	`83`	`}`
`94`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,83 +10,82 @@`
`10`	`10`	`use Magento\Mtf\Client\Locator;`
`11`	`11`
`12`	`12`	`/**`
`13`		`- * Class Totals`
`14`		`- * Cart totals block`
	`13`	`+ * Cart totals block.`
`15`	`14`	`*/`
`16`	`15`	`class Totals extends Block`
`17`	`16`	`{`
`18`	`17`	`/**`
`19`		`- * Grand total search mask`
	`18`	`+ * Grand total search mask.`
`20`	`19`	`*`
`21`	`20`	`* @var string`
`22`	`21`	`*/`
`23`	`22`	`protected $grandTotal = '.grand.totals .price';`
`24`	`23`
`25`	`24`	`/**`
`26`		`- * Grand total search mask`
	`25`	`+ * Grand total search mask.`
`27`	`26`	`*`
`28`	`27`	`* @var string`
`29`	`28`	`*/`
`30`	`29`	`protected $grandTotalExclTax = '.totals.grand.excl span';`
`31`	`30`
`32`	`31`	`/**`
`33`		`- * Grand total search mask`
	`32`	`+ * Grand total search mask.`
`34`	`33`	`*`
`35`	`34`	`* @var string`
`36`	`35`	`*/`
`37`	`36`	`protected $grandTotalInclTax = '.totals.grand.incl span';`
`38`	`37`
`39`	`38`	`/**`
`40`		`- * Subtotal search mask`
	`39`	`+ * Subtotal search mask.`
`41`	`40`	`*`
`42`	`41`	`* @var string`
`43`	`42`	`*/`
`44`	`43`	`protected $subtotal = '.totals.sub .price';`
`45`	`44`
`46`	`45`	`/**`
`47`		`- * Subtotal search mask`
	`46`	`+ * Subtotal search mask.`
`48`	`47`	`*`
`49`	`48`	`* @var string`
`50`	`49`	`*/`
`51`	`50`	`protected $subtotalExclTax = '.totals.sub.excl .price';`
`52`	`51`
`53`	`52`	`/**`
`54`		`- * Subtotal search mask`
	`53`	`+ * Subtotal search mask.`
`55`	`54`	`*`
`56`	`55`	`* @var string`
`57`	`56`	`*/`
`58`	`57`	`protected $subtotalInclTax = '.totals.sub.incl .price';`
`59`	`58`
`60`	`59`	`/**`
`61`		`- * Tax search mask`
	`60`	`+ * Tax search mask.`
`62`	`61`	`*`
`63`	`62`	`* @var string`
`64`	`63`	`*/`
`65`	`64`	`protected $tax = '.totals-tax span';`
`66`	`65`
`67`	`66`	`/**`
`68`		`- * Get shipping price selector`
	`67`	`+ * Get shipping price selector.`
`69`	`68`	`*`
`70`	`69`	`* @var string`
`71`	`70`	`*/`
`72`	`71`	`protected $shippingPriceSelector = '.shipping.excl .price';`
`73`	`72`
`74`	`73`	`/**`
`75`		`- * Get discount`
	`74`	`+ * Get discount.`
`76`	`75`	`*`
`77`	`76`	`* @var string`
`78`	`77`	`*/`
`79`	`78`	`protected $discount = '[class=totals] .amount .price';`
`80`	`79`
`81`	`80`	`/**`
`82`		`- * Get shipping price including tax selector`
	`81`	`+ * Get shipping price including tax selector.`
`83`	`82`	`*`
`84`	`83`	`* @var string`
`85`	`84`	`*/`
`86`	`85`	`protected $shippingPriceInclTaxSelector = '.shipping.incl .price';`
`87`	`86`
`88`	`87`	`/**`
`89`		`- * Get shipping price block selector`
	`88`	`+ * Get shipping price block selector.`
`90`	`89`	`*`
`91`	`90`	`* @var string`
`92`	`91`	`*/`
`@@ -100,7 +99,7 @@ class Totals extends Block`
`100`	`99`	`protected $blockWaitElement = '.loading-mask';`
`101`	`100`
`102`	`101`	`/**`
`103`		`- * Get Grand Total Text`
	`102`	`+ * Get Grand Total Text.`
`104`	`103`	`*`
`105`	`104`	`* @return string`
`106`	`105`	`*/`
`@@ -111,7 +110,7 @@ public function getGrandTotal()`
`111`	`110`	`}`
`112`	`111`
`113`	`112`	`/**`
`114`		`- * Get Grand Total Text`
	`113`	`+ * Get Grand Total Text.`
`115`	`114`	`*`
`116`	`115`	`* @return string\|null`
`117`	`116`	`*/`
`@@ -122,7 +121,7 @@ public function getGrandTotalIncludingTax()`
`122`	`121`	`}`
`123`	`122`
`124`	`123`	`/**`
`125`		`- * Get Grand Total Text`
	`124`	`+ * Get Grand Total Text.`
`126`	`125`	`*`
`127`	`126`	`* @return string\|null`
`128`	`127`	`*/`
`@@ -133,7 +132,7 @@ public function getGrandTotalExcludingTax()`
`133`	`132`	`}`
`134`	`133`
`135`	`134`	`/**`
`136`		`- * Get Tax text from Order Totals`
	`135`	`+ * Get Tax text from Order Totals.`
`137`	`136`	`*`
`138`	`137`	`* @return string\|null`
`139`	`138`	`*/`
`@@ -144,7 +143,7 @@ public function getTax()`
`144`	`143`	`}`
`145`	`144`
`146`	`145`	`/**`
`147`		`- * Check that Tax is visible`
	`146`	`+ * Check that Tax is visible.`
`148`	`147`	`*`
`149`	`148`	`* @return bool`
`150`	`149`	`*/`
`@@ -154,7 +153,7 @@ public function isTaxVisible()`
`154`	`153`	`}`
`155`	`154`
`156`	`155`	`/**`
`157`		`- * Get Subtotal text`
	`156`	`+ * Get Subtotal text.`
`158`	`157`	`*`
`159`	`158`	`* @return string`
`160`	`159`	`*/`
`@@ -165,7 +164,7 @@ public function getSubtotal()`
`165`	`164`	`}`
`166`	`165`
`167`	`166`	`/**`
`168`		`- * Get Subtotal text`
	`167`	`+ * Get Subtotal text.`
`169`	`168`	`*`
`170`	`169`	`* @return string\|null`
`171`	`170`	`*/`
`@@ -176,7 +175,7 @@ public function getSubtotalIncludingTax()`
`176`	`175`	`}`
`177`	`176`
`178`	`177`	`/**`
`179`		`- * Get Subtotal text`
	`178`	`+ * Get Subtotal text.`
`180`	`179`	`*`
`181`	`180`	`* @return string\|null`
`182`	`181`	`*/`
`@@ -187,7 +186,7 @@ public function getSubtotalExcludingTax()`
`187`	`186`	`}`
`188`	`187`
`189`	`188`	`/**`
`190`		`- * Method that escapes currency symbols`
	`189`	`+ * Method that escapes currency symbols.`
`191`	`190`	`*`
`192`	`191`	`* @param string $price`
`193`	`192`	`* @return string\|null`
`@@ -199,7 +198,7 @@ protected function escapeCurrency($price)`
`199`	`198`	`}`
`200`	`199`
`201`	`200`	`/**`
`202`		`- * Get discount`
	`201`	`+ * Get discount.`
`203`	`202`	`*`
`204`	`203`	`* @return string\|null`
`205`	`204`	`*/`
`@@ -210,7 +209,7 @@ public function getDiscount()`
`210`	`209`	`}`
`211`	`210`
`212`	`211`	`/**`
`213`		`- * Get shipping price`
	`212`	`+ * Get shipping price.`
`214`	`213`	`*`
`215`	`214`	`* @return string\|null`
`216`	`215`	`*/`
`@@ -221,7 +220,7 @@ public function getShippingPrice()`
`221`	`220`	`}`
`222`	`221`
`223`	`222`	`/**`
`224`		`- * Get shipping price`
	`223`	`+ * Get shipping price.`
`225`	`224`	`*`
`226`	`225`	`* @return string\|null`
`227`	`226`	`*/`
`@@ -232,7 +231,7 @@ public function getShippingPriceInclTax()`
`232`	`231`	`}`
`233`	`232`
`234`	`233`	`/**`
`235`		`- * Is visible shipping price block`
	`234`	`+ * Is visible shipping price block.`
`236`	`235`	`*`
`237`	`236`	`* @return bool`
`238`	`237`	`*/`