MTA-2145: Sync qmt repository with mainline - Sprint 12

Oleksii Kolesnyk · Dmytro Aponasenko · commit f035fbb4e1b6 · 2015-05-18T15:11:19.000Z
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Billing.php b/dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Billing.php
@@ -9,8 +9,6 @@
 use Magento\Customer\Test\Fixture\Address;
 use Magento\Customer\Test\Fixture\Customer;
 use Magento\Mtf\Block\Form;
-use Magento\Mtf\Fixture\FixtureInterface;
-use Magento\Mtf\Client\Element\SimpleElement;
 
 /**
  * Class Billing
@@ -51,10 +49,7 @@ public function fillBilling(
         $isShippingAddress = false
     ) {
         if ($billingAddress) {
-            $fields = $this->dataMapping($billingAddress->getData());
-            foreach ($fields as $field) {
-                $this->waitForElementVisible($field['selector'], $field['strategy']);
-            }
+            sleep(5);
             $this->fill($billingAddress);
         }
         if ($isShippingAddress) {
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Adminhtml/AgreementGrid.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Adminhtml/AgreementGrid.php
@@ -26,7 +26,7 @@ class AgreementGrid extends Grid
      *
      * @var string
      */
-    protected $firstRowSelector = '//tr[./td[contains(@class, "col-name")]][1]';
+    protected $firstRowSelector = '//tbody/tr[./td[contains(@class, "col-name")]][1]';
 
     /**
      * Filters array mapping
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Onepage/AgreementReview.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Block/Onepage/AgreementReview.php
@@ -35,7 +35,7 @@ class AgreementReview extends Review
      *
      * @var string
      */
-    protected $agreementCheckbox = './/input[contains(@id, "agreement")]';
+    protected $agreementCheckbox = 'input[name^=checkoutAgreements]';
 
     /**
      * Get notification massage
@@ -55,7 +55,7 @@ public function getNotificationMassage()
      */
     public function setAgreement($value)
     {
-        $this->_rootElement->find($this->agreementCheckbox, Locator::SELECTOR_XPATH, 'checkbox')->setValue($value);
+        $this->_rootElement->find($this->agreementCheckbox, Locator::SELECTOR_CSS, 'checkbox')->setValue($value);
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php
@@ -62,7 +62,6 @@ public function processAssert(
         $catalogProductView->getMessagesBlock()->waitSuccessMessage();
         $checkoutCart->open();
         $checkoutCart->getCartBlock()->getOnepageLinkBlock()->proceedToCheckout();
-        $checkoutOnepage->getLoginBlock()->guestCheckout();
         $checkoutOnepage->getLoginBlock()->clickContinue();
         $checkoutOnepage->getBillingBlock()->fill($billingAddress);
         $checkoutOnepage->getBillingBlock()->clickContinue();
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php
@@ -74,7 +74,6 @@ public function processAssert(
         $catalogProductView->getMessagesBlock()->waitSuccessMessage();
         $checkoutCart->open();
         $checkoutCart->getCartBlock()->getOnepageLinkBlock()->proceedToCheckout();
-        $checkoutOnepage->getLoginBlock()->guestCheckout();
         $checkoutOnepage->getLoginBlock()->clickContinue();
         $checkoutOnepage->getBillingBlock()->fill($billingAddress);
         $checkoutOnepage->getBillingBlock()->clickContinue();
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/CreateTermEntityTest.xml
@@ -7,7 +7,7 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
   <testCase name="Magento\CheckoutAgreements\Test\TestCase\CreateTermEntityTest">
-    <variation name="CreateTermEntityTestVariation1" firstConstraint="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" method="test">
+    <variation name="CreateTermEntityTestVariation1">
       <data name="description" xsi:type="string">Create enabled term entity with text value</data>
       <data name="product" xsi:type="string">catalogProductSimple::default</data>
       <data name="agreement/data/name" xsi:type="string">name%isolation%</data>
@@ -19,11 +19,11 @@
       <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
       <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
       <data name="payment/method" xsi:type="string">checkmo</data>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" next="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid"/>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid" next="Magento\CheckoutAgreements\Test\Constraint\AssertTermOnCheckout" prev="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage"/>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermOnCheckout" prev="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid"/>
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" />
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid" />
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermOnCheckout" />
     </variation>
-    <variation name="CreateTermEntityTestVariation2" firstConstraint="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" method="test">
+    <variation name="CreateTermEntityTestVariation2">
       <data name="description" xsi:type="string">Create enabled term entity with HTML value</data>
       <data name="product" xsi:type="string">catalogProductSimple::default</data>
       <data name="agreement/data/name" xsi:type="string">name%isolation%</data>
@@ -35,11 +35,11 @@
       <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
       <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
       <data name="payment/method" xsi:type="string">checkmo</data>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" next="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid"/>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid" next="Magento\CheckoutAgreements\Test\Constraint\AssertTermOnCheckout" prev="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage"/>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermOnCheckout" prev="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid"/>
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" />
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid" />
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermOnCheckout" />
     </variation>
-    <variation name="CreateTermEntityTestVariation3" firstConstraint="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" method="test">
+    <variation name="CreateTermEntityTestVariation3">
       <data name="description" xsi:type="string">Create enabled term entity with text value</data>
       <data name="product" xsi:type="string">catalogProductSimple::default</data>
       <data name="agreement/data/name" xsi:type="string">name%isolation%</data>
@@ -51,11 +51,11 @@
       <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
       <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
       <data name="payment/method" xsi:type="string">checkmo</data>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" next="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid"/>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid" next="Magento\CheckoutAgreements\Test\Constraint\AssertTermOnCheckout" prev="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage"/>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermOnCheckout" prev="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid"/>
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" />
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid" />
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermOnCheckout" />
     </variation>
-    <variation name="CreateTermEntityTestVariation4" firstConstraint="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" method="test">
+    <variation name="CreateTermEntityTestVariation4">
       <data name="description" xsi:type="string">Create disabled term entity</data>
       <data name="product" xsi:type="string">catalogProductSimple::default</data>
       <data name="agreement/data/name" xsi:type="string">name%isolation%</data>
@@ -67,11 +67,11 @@
       <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
       <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
       <data name="payment/method" xsi:type="string">checkmo</data>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" next="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid"/>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid" next="Magento\CheckoutAgreements\Test\Constraint\AssertTermAbsentOnCheckout" prev="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage"/>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermAbsentOnCheckout" prev="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid"/>
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" />
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid" />
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermAbsentOnCheckout" />
     </variation>
-    <variation name="CreateTermEntityTestVariation5" firstConstraint="Magento\CheckoutAgreements\Test\Constraint\AssertTermRequireMessageOnMultishippingCheckout" method="test">
+    <variation name="CreateTermEntityTestVariation5">
       <data name="description" xsi:type="string">Create enabled term, check with multishipping</data>
       <data name="product" xsi:type="string">catalogProductSimple::default, catalogProductSimple::default</data>
       <data name="agreement/data/name" xsi:type="string">name%isolation%</data>
@@ -83,8 +83,8 @@
       <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
       <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
       <data name="payment/method" xsi:type="string">checkmo</data>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermRequireMessageOnMultishippingCheckout" next="Magento\Multishipping\Test\Constraint\AssertMultishippingOrderSuccessPlacedMessage"/>
-      <constraint name="Magento\Multishipping\Test\Constraint\AssertMultishippingOrderSuccessPlacedMessage" prev="Magento\CheckoutAgreements\Test\Constraint\AssertTermRequireMessageOnMultishippingCheckout"/>
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermRequireMessageOnMultishippingCheckout" />
+      <constraint name="Magento\Multishipping\Test\Constraint\AssertMultishippingOrderSuccessPlacedMessage" />
     </variation>
   </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/DeleteTermEntityTest.xml
@@ -7,15 +7,15 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
   <testCase name="Magento\CheckoutAgreements\Test\TestCase\DeleteTermEntityTest">
-    <variation name="DeleteTermEntityTestVariation1" firstConstraint="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessDeleteMessage" method="test">
+    <variation name="DeleteTermEntityTestVariation1">
       <data name="product" xsi:type="string">catalogProductSimple::default</data>
       <data name="agreement/dataSet" xsi:type="string">term_enabled_text</data>
       <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
       <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
       <data name="payment/method" xsi:type="string">checkmo</data>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessDeleteMessage" next="Magento\CheckoutAgreements\Test\Constraint\AssertTermAbsentInGrid"/>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermAbsentInGrid" next="Magento\CheckoutAgreements\Test\Constraint\AssertTermAbsentOnCheckout" prev="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessDeleteMessage"/>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermAbsentOnCheckout" prev="Magento\CheckoutAgreements\Test\Constraint\AssertTermAbsentInGrid"/>
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessDeleteMessage" />
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermAbsentInGrid" />
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermAbsentOnCheckout" />
     </variation>
   </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest.xml b/dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/TestCase/UpdateTermEntityTest.xml
@@ -7,7 +7,7 @@
  -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
   <testCase name="Magento\CheckoutAgreements\Test\TestCase\UpdateTermEntityTest">
-    <variation name="UpdateTermEntityTestVariation1" firstConstraint="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" method="test">
+    <variation name="UpdateTermEntityTestVariation1">
       <data name="product" xsi:type="string">catalogProductSimple::default</data>
       <data name="agreementOrigin/dataSet" xsi:type="string">term_disabled_text</data>
       <data name="agreement/data/name" xsi:type="string">name%isolation%</data>
@@ -19,11 +19,11 @@
       <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
       <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
       <data name="payment/method" xsi:type="string">checkmo</data>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" next="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid"/>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid" next="Magento\CheckoutAgreements\Test\Constraint\AssertTermOnCheckout" prev="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage"/>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermOnCheckout" prev="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid"/>
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" />
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid" />
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermOnCheckout" />
     </variation>
-    <variation name="UpdateTermEntityTestVariation2" firstConstraint="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" method="test">
+    <variation name="UpdateTermEntityTestVariation2">
       <data name="product" xsi:type="string">catalogProductSimple::default</data>
       <data name="agreementOrigin/dataSet" xsi:type="string">term_disabled_html</data>
       <data name="agreement/data/name" xsi:type="string">name%isolation%</data>
@@ -35,11 +35,11 @@
       <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
       <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
       <data name="payment/method" xsi:type="string">checkmo</data>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" next="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid"/>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid" next="Magento\CheckoutAgreements\Test\Constraint\AssertTermOnCheckout" prev="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage"/>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermOnCheckout" prev="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid"/>
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" />
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid" />
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermOnCheckout" />
     </variation>
-    <variation name="UpdateTermEntityTestVariation3" firstConstraint="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" method="test">
+    <variation name="UpdateTermEntityTestVariation3">
       <data name="product" xsi:type="string">catalogProductSimple::default</data>
       <data name="agreementOrigin/dataSet" xsi:type="string">term_enabled_text</data>
       <data name="agreement/data/name" xsi:type="string">name%isolation%</data>
@@ -51,9 +51,9 @@
       <data name="shipping/shipping_service" xsi:type="string">Flat Rate</data>
       <data name="shipping/shipping_method" xsi:type="string">Fixed</data>
       <data name="payment/method" xsi:type="string">checkmo</data>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" next="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid"/>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid" next="Magento\CheckoutAgreements\Test\Constraint\AssertTermAbsentOnCheckout" prev="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage"/>
-      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermAbsentOnCheckout" prev="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid"/>
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermSuccessSaveMessage" />
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermInGrid" />
+      <constraint name="Magento\CheckoutAgreements\Test\Constraint\AssertTermAbsentOnCheckout" />
     </variation>
   </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php b/dev/tests/functional/tests/app/Magento/GroupedProduct/Test/Block/Adminhtml/Product/Grouped/AssociatedProducts.php
@@ -104,6 +104,8 @@ public function fillFormTab(array $fields, SimpleElement $element = null)
      * @param array|null $fields
      * @param SimpleElement|null $element
      * @return array
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function getDataFormTab($fields = null, SimpleElement $element = null)
     {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class AgreementGrid extends Grid`
`26`	`26`	`*`
`27`	`27`	`* @var string`
`28`	`28`	`*/`
`29`		`- protected $firstRowSelector = '//tr[./td[contains(@class, "col-name")]][1]';`
	`29`	`+ protected $firstRowSelector = '//tbody/tr[./td[contains(@class, "col-name")]][1]';`
`30`	`30`
`31`	`31`	`/**`
`32`	`32`	`* Filters array mapping`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class AgreementReview extends Review`
`35`	`35`	`*`
`36`	`36`	`* @var string`
`37`	`37`	`*/`
`38`		`- protected $agreementCheckbox = './/input[contains(@id, "agreement")]';`
	`38`	`+ protected $agreementCheckbox = 'input[name^=checkoutAgreements]';`
`39`	`39`
`40`	`40`	`/**`
`41`	`41`	`* Get notification massage`
`@@ -55,7 +55,7 @@ public function getNotificationMassage()`
`55`	`55`	`*/`
`56`	`56`	`public function setAgreement($value)`
`57`	`57`	`{`
`58`		`- $this->_rootElement->find($this->agreementCheckbox, Locator::SELECTOR_XPATH, 'checkbox')->setValue($value);`
	`58`	`+ $this->_rootElement->find($this->agreementCheckbox, Locator::SELECTOR_CSS, 'checkbox')->setValue($value);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,8 @@ public function fillFormTab(array $fields, SimpleElement $element = null)`
`104`	`104`	`* @param array\|null $fields`
`105`	`105`	`* @param SimpleElement\|null $element`
`106`	`106`	`* @return array`
	`107`	`+ *`
	`108`	`+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)`
`107`	`109`	`*/`
`108`	`110`	`public function getDataFormTab($fields = null, SimpleElement $element = null)`
`109`	`111`	`{`