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

Author: Oleksandr Manchenko

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Composite/Configure.php

@@ -13,34 +13,40 @@
 use Magento\Catalog\Test\Block\AbstractConfigureBlock;
 
 /**
- * Class Configure
- * Adminhtml catalog product composite configure block
+ * Adminhtml catalog product composite configure block.
  */
 class Configure extends AbstractConfigureBlock
 {
     /**
-     * Custom options CSS selector
+     * Configure form selector.
+     *
+     * @var string
+     */
+    protected $configureForm = '#product_composite_configure_form';
+
+    /**
+     * Custom options CSS selector.
      *
      * @var string
      */
     protected $customOptionsSelector = '#product_composite_configure_fields_options';
 
     /**
-     * Selector for "Ok" button
+     * Selector for "Ok" button.
      *
      * @var string
      */
     protected $okButton = '.ui-button.action-primary';
 
     /**
-     * Backend abstract block
+     * Backend abstract block.
      *
      * @var string
      */
     protected $templateBlock = './ancestor::body';
 
     /**
-     * Set quantity
+     * Set quantity.
      *
      * @param int $qty
      * @return void
@@ -51,7 +57,7 @@ public function setQty($qty)
     }
 
     /**
-     * Fill in the option specified for the product
+     * Fill in the option specified for the product.
      *
      * @param FixtureInterface $product
      * @return void
@@ -61,15 +67,17 @@ public function configProduct(FixtureInterface $product)
         /** @var CatalogProductSimple $product */
         $checkoutData = $product->getCheckoutData();
 
+        $this->waitForFormVisible();
         $this->fillOptions($product);
         if (isset($checkoutData['qty'])) {
             $this->setQty($checkoutData['qty']);
         }
         $this->clickOk();
+        $this->waitForFormNotVisible();
     }
 
     /**
-     * Click "Ok" button
+     * Click "Ok" button.
      *
      * @return void
      */
@@ -80,7 +88,39 @@ public function clickOk()
     }
 
     /**
-     * Get backend abstract block
+     * Wait for form is visible.
+     *
+     * @return void
+     */
+    protected function waitForFormVisible()
+    {
+        $context = $this->_rootElement;
+        $selector = $this->configureForm;
+        return $this->browser->waitUntil(
+            function () use ($context, $selector) {
+                return $context->find($selector)->isVisible() ? true : null;
+            }
+        );
+    }
+
+    /**
+     * Wait for form is not visible.
+     *
+     * @return void
+     */
+    protected function waitForFormNotVisible()
+    {
+        $context = $this->_rootElement;
+        $selector = $this->configureForm;
+        return $this->browser->waitUntil(
+            function () use ($context, $selector) {
+                return $context->find($selector)->isVisible() ? null : true;
+            }
+        );
+    }
+
+    /**
+     * Get backend abstract block.
      *
      * @return \Magento\Backend\Test\Block\Template
      */

dev/tests/functional/tests/app/Magento/Customer/Test/Block/Adminhtml/Edit/CustomerForm.php

@@ -44,6 +44,13 @@ class CustomerForm extends FormTabs
      */
     protected $fieldWrapperControl = './/*[contains(@class, "admin__field")]/*[contains(@class,"control")]';
 
+    /**
+     * Selector for wainting tab content to load.
+     *
+     * @var string
+     */
+    protected $tabReadiness = '.admin__page-nav-item._active._loading';
+
     /**
      * Fill Customer forms on tabs by customer, addresses data.
      *
@@ -137,4 +144,18 @@ protected function waitFields()
         /* Wait for field's control block is visible in the form */
         $this->waitForElementVisible($this->fieldWrapperControl, Locator::SELECTOR_XPATH);
     }
+
+    /**
+     * Open tab.
+     *
+     * @param string $tabName
+     * @return CustomerForm
+     */
+    public function openTab($tabName)
+    {
+        parent::openTab($tabName);
+        $this->waitForElementNotVisible($this->tabReadiness);
+
+        return $this;
+    }
 }

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/Status/Assign/AssignForm.xml

@@ -9,10 +9,10 @@
     <fields>
         <label>
             <selector>[name="status"]</selector>
-            <input>select</input>
+            <input>strictselect</input>
         </label>
         <state>
-            <input>select</input>
+            <input>strictselect</input>
         </state>
         <is_default>
             <input>checkbox</input>

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/CreditMemos/Grid.php

@@ -17,7 +17,7 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
      *
      * @var string
      */
-    protected $editLink = 'td[data-column="increment_id"]';
+    protected $editLink = 'tbody td[data-column="increment_id"]';
 
     /**
      * Filters array mapping

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Invoices/Grid.php

@@ -24,7 +24,7 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
      *
      * @var string
      */
-    protected $invoiceId = 'td[data-column="increment_id"]';
+    protected $invoiceId = 'tbody td[data-column="increment_id"]';
 
     /**
      * Filters array mapping

dev/tests/functional/tests/app/Magento/Sales/Test/Block/Adminhtml/Order/View/Tab/Shipments/Grid.php

@@ -24,7 +24,7 @@ class Grid extends \Magento\Backend\Test\Block\Widget\Grid
      *
      * @var string
      */
-    protected $shipmentId = 'td[data-column="real_shipment_id"]';
+    protected $shipmentId = 'tbody td[data-column="real_shipment_id"]';
 
     /**
      * Filters array mapping

dev/tests/functional/tests/app/Magento/Sales/Test/Constraint/AssertOrderInOrdersGridOnFrontend.php

@@ -49,11 +49,11 @@ public function processAssert(
             'id' => $order->hasData('id') ? $order->getId() : $orderId,
             'status' => $statusToCheck === null ? $status : $statusToCheck,
         ];
-        $customerLogin = $objectManager->create(
+
+        $objectManager->create(
             'Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep',
             ['customer' => $customer]
-        );
-        $customerLogin->run();
+        )->run();
         $customerAccountIndex->getAccountMenuBlock()->openMenuItem('My Orders');
         $errorMessage = implode(', ', $filter);
         \PHPUnit_Framework_Assert::assertTrue(

dev/tests/functional/tests/app/Magento/Sales/Test/TestCase/AssignCustomOrderStatusTest.php

@@ -132,6 +132,7 @@ public function test(
             'orderStatus',
             ['data' => array_merge($orderStatus->getData(), $orderStatusState)]
         );
+        $this->orderStatus = $orderStatus;
 
         // Steps:
         $this->orderStatusIndex->open();
@@ -141,9 +142,6 @@ public function test(
         $assertion->processAssert($this->orderStatusIndex);
 
         $order->persist();
-
-        // Prepare data for tear down
-        $this->orderStatus = $orderStatus;
         $this->order = $order;
 
         return [
@@ -160,8 +158,12 @@ public function test(
      */
     public function tearDown()
     {
-        $this->orderIndex->open()->getSalesOrderGrid()->massaction([['id' => $this->order->getId()]], 'Cancel');
-        $filter = ['label' => $this->orderStatus->getLabel()];
-        $this->orderStatusIndex->open()->getOrderStatusGrid()->searchAndUnassign($filter);
+        if ($this->order) {
+            $this->orderIndex->open()->getSalesOrderGrid()->massaction([['id' => $this->order->getId()]], 'Cancel');
+        }
+        if ($this->orderStatus) {
+            $filter = ['label' => $this->orderStatus->getLabel()];
+            $this->orderStatusIndex->open()->getOrderStatusGrid()->searchAndUnassign($filter);
+        }
     }
 }