MTA-1602: Sync qmt repository with mainline - Sprint 6

Author: Dmytro Aponasenko

dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableForm.php

@@ -70,13 +70,13 @@ public function processAssert(
         $systemVariableIndex->open();
         $systemVariableIndex->getSystemVariableGrid()->searchAndOpen(['code' => $data['code']]);
 
-        $formData = $systemVariableNew->getSystemVariableForm()->getData($customVariable);
+        $formData = $systemVariableNew->getSystemVariableForm()->getData();
         $errors = $this->verifyData($dataOrigin, $formData);
         \PHPUnit_Framework_Assert::assertEmpty($errors, $errors);
 
         if ($storeOrigin !== null) {
             $systemVariableNew->getFormPageActions()->selectStoreView($storeOrigin->getName());
-            $formData = $systemVariableNew->getSystemVariableForm()->getData($customVariable);
+            $formData = $systemVariableNew->getSystemVariableForm()->getData();
             $errors = $this->verifyData($data, $formData);
             \PHPUnit_Framework_Assert::assertEmpty($errors, $errors);
         }

dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/CreateTaxRuleEntityTest.php

@@ -9,12 +9,10 @@
 use Magento\Tax\Test\Fixture\TaxRule;
 use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
 use Magento\Tax\Test\Page\Adminhtml\TaxRuleNew;
-use Magento\Mtf\ObjectManager;
 use Magento\Mtf\TestCase\Injectable;
 
 /**
- * Test Flow:
- *
+ * Steps:
  * 1. Log in as default admin user.
  * 2. Go to Stores > Tax Rules.
  * 3. Click 'Add New Tax Rule' button.
@@ -83,8 +81,8 @@ public function testCreateTaxRule(TaxRule $taxRule)
      *
      * @return void
      */
-    public static function tearDownAfterClass()
+    public function tearDown()
     {
-        ObjectManager::getInstance()->create('Magento\Tax\Test\TestStep\DeleteAllTaxRulesStep', [])->run();
+        $this->objectManager->create('Magento\Tax\Test\TestStep\DeleteAllTaxRulesStep', [])->run();
     }
 }

dev/tests/functional/tests/app/Magento/Tax/Test/TestCase/UpdateTaxRuleEntityTest.php

@@ -10,12 +10,9 @@
 use Magento\Tax\Test\Page\Adminhtml\TaxRuleIndex;
 use Magento\Tax\Test\Page\Adminhtml\TaxRuleNew;
 use Magento\Mtf\Fixture\FixtureFactory;
-use Magento\Mtf\ObjectManager;
 use Magento\Mtf\TestCase\Injectable;
 
 /**
- * Test Flow:
- *
  * Preconditions:
  * 1. 1 simple product is created.
  * 2. Tax Rule is created.
@@ -105,8 +102,8 @@ public function testUpdateTaxRule(
      *
      * @return void
      */
-    public static function tearDownAfterClass()
+    public function tearDown()
     {
-        ObjectManager::getInstance()->create('Magento\Tax\Test\TestStep\DeleteAllTaxRulesStep', [])->run();
+        $this->objectManager->create('Magento\Tax\Test\TestStep\DeleteAllTaxRulesStep', [])->run();
     }
 }

dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ConfigureProductInCustomerWishlistOnFrontendTest.php

@@ -9,8 +9,6 @@
 use Magento\Customer\Test\Fixture\Customer;
 
 /**
- * Test Flow:
- *
  * Preconditions:
  * 1. Create customer
  * 2. Create composite products
@@ -56,7 +54,6 @@ public function __prepare(Customer $customer)
      */
     public function test(Customer $customer, $product)
     {
-        $this->markTestIncomplete('Bug: MAGETWO-32815');
         // Preconditions
         $product = $this->createProducts($product)[0];
         $this->loginCustomer($customer);