Merge branch 'MTA-1284' of https://github.corp.ebay.com/magento-qmt/magento2ce into develop

Author: Dmytro Aponasenko

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityFromProductPageTest.php

@@ -6,10 +6,7 @@
 
 namespace Magento\Catalog\Test\TestCase\ProductAttribute;
 
-use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 use Magento\Mtf\Fixture\FixtureFactory;
-use Magento\Mtf\ObjectManager;
 use Magento\Mtf\TestCase\Scenario;
 
 /**
@@ -40,13 +37,6 @@ class CreateProductAttributeEntityFromProductPageTest extends Scenario
     const TO_MAINTAIN = 'yes';
     /* end tags */
 
-    /**
-     * CatalogProductAttribute fixture.
-     *
-     * @var CatalogProductAttribute
-     */
-    protected $attribute;
-
     /**
      * Prepare data for test.
      *
@@ -66,25 +56,10 @@ public function __prepare(FixtureFactory $fixtureFactory)
     /**
      * Run CreateProductAttributeEntity from product page test.
      *
-     * @param CatalogProductAttribute $attribute
      * @return void
      */
-    public function test(CatalogProductAttribute $attribute)
+    public function test()
     {
-        $this->attribute = $attribute;
         $this->executeScenario();
     }
-
-    /**
-     * Delete attribute after test.
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        ObjectManager::getInstance()->create(
-            'Magento\Catalog\Test\TestStep\DeleteAttributeStep',
-            ['attribute' => $this->attribute]
-        )->run();
-    }
 }

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/ProductAttribute/CreateProductAttributeEntityTest.php

@@ -6,8 +6,6 @@
 
 namespace Magento\Catalog\Test\TestCase\ProductAttribute;
 
-use Magento\Catalog\Test\Fixture\CatalogProductAttribute;
-use Magento\Mtf\ObjectManager;
 use Magento\Mtf\TestCase\Scenario;
 
 /**
@@ -29,35 +27,13 @@ class CreateProductAttributeEntityTest extends Scenario
     const DOMAIN = 'MX';
     /* end tags */
 
-    /**
-     * CatalogProductAttribute object.
-     *
-     * @var CatalogProductAttribute
-     */
-    protected $attribute;
-
     /**
      * Run CreateProductAttributeEntity test.
      *
-     * @param CatalogProductAttribute $productAttribute
      * @return array
      */
-    public function testCreateProductAttribute(CatalogProductAttribute $productAttribute)
+    public function testCreateProductAttribute()
     {
-        $this->attribute = $productAttribute;
         $this->executeScenario();
     }
-
-    /**
-     * Delete attribute after test.
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        ObjectManager::getInstance()->create(
-            'Magento\Catalog\Test\TestStep\DeleteAttributeStep',
-            ['attribute' => $this->attribute]
-        )->run();
-    }
 }

dev/tests/functional/tests/app/Magento/Catalog/Test/TestStep/SaveAttributeStep.php

@@ -21,13 +21,22 @@ class SaveAttributeStep implements TestStepInterface
      */
     protected $attributeNew;
 
+    /**
+     * Delete attribute step.
+     *
+     * @var DeleteAttributeStep
+     */
+    protected $deleteAttribute;
+
     /**
      * @constructor
      * @param CatalogProductAttributeNew $attributeNew
+     * @param DeleteAttributeStep $deleteAttribute
      */
-    public function __construct(CatalogProductAttributeNew $attributeNew)
+    public function __construct(CatalogProductAttributeNew $attributeNew, DeleteAttributeStep $deleteAttribute)
     {
         $this->attributeNew = $attributeNew;
+        $this->deleteAttribute = $deleteAttribute;
     }
 
     /**
@@ -39,4 +48,14 @@ public function run()
     {
         $this->attributeNew->getPageActions()->save();
     }
+
+    /**
+     * Delete attribute after test.
+     *
+     * @return void
+     */
+    public function cleanup()
+    {
+        $this->deleteAttribute->run();
+    }
 }

dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php

@@ -28,17 +28,26 @@ class CreateCatalogRuleStep implements TestStepInterface
      */
     protected $fixtureFactory;
 
+    /**
+     * Delete all catalog rules step.
+     *
+     * @var $deleteAllCatalogRule
+     */
+    protected $deleteAllCatalogRule;
+
     /**
      * Preparing step properties
      *
      * @constructor
      * @param FixtureFactory $fixtureFactory
      * @param string $catalogRule
+     * @param DeleteAllCatalogRulesStep $deleteRule
      */
-    public function __construct(FixtureFactory $fixtureFactory, $catalogRule)
+    public function __construct(FixtureFactory $fixtureFactory, DeleteAllCatalogRulesStep $deleteRule, $catalogRule)
     {
         $this->fixtureFactory = $fixtureFactory;
         $this->catalogRule = $catalogRule;
+        $this->deleteAllCatalogRule = $deleteRule;
     }
 
     /**
@@ -59,4 +68,14 @@ public function run()
         }
         return $result;
     }
+
+    /**
+     * Delete all catalog rule.
+     *
+     * @return void
+     */
+    public function cleanup()
+    {
+        $this->deleteAllCatalogRule->run();
+    }
 }

dev/tests/functional/tests/app/Magento/Config/Test/TestStep/SetupConfigurationStep.php

@@ -75,4 +75,15 @@ public function run()
 
         return ['config' => $result];
     }
+
+    /**
+     * Rollback configuration.
+     *
+     * @return void
+     */
+    public function cleanup()
+    {
+        $this->rollback = true;
+        $this->run();
+    }
 }

dev/tests/functional/tests/app/Magento/Customer/Test/TestStep/LoginCustomerOnFrontendStep.php

@@ -37,20 +37,30 @@ class LoginCustomerOnFrontendStep implements TestStepInterface
      */
     protected $customerAccountLogin;
 
+    /**
+     * Logout customer on frontend step.
+     *
+     * @var LogoutCustomerOnFrontendStep
+     */
+    protected $logoutCustomerOnFrontend;
+
     /**
      * @constructor
      * @param CmsIndex $cmsIndex
      * @param CustomerAccountLogin $customerAccountLogin
+     * @param LogoutCustomerOnFrontendStep $logoutCustomerOnFrontend
      * @param Customer $customer
      */
     public function __construct(
         CmsIndex $cmsIndex,
         CustomerAccountLogin $customerAccountLogin,
+        LogoutCustomerOnFrontendStep $logoutCustomerOnFrontend,
         Customer $customer
     ) {
         $this->cmsIndex = $cmsIndex;
         $this->customerAccountLogin = $customerAccountLogin;
         $this->customer = $customer;
+        $this->logoutCustomerOnFrontend = $logoutCustomerOnFrontend;
     }
 
     /**
@@ -71,4 +81,14 @@ public function run()
         $this->cmsIndex->getCmsPageBlock()->waitPageInit();
         $this->customerAccountLogin->getLoginBlock()->login($this->customer);
     }
+
+    /**
+     * Logout customer on fronted.
+     *
+     * @return void
+     */
+    public function cleanup()
+    {
+        $this->logoutCustomerOnFrontend->run();
+    }
 }

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

@@ -47,21 +47,4 @@ public function test()
     {
         $this->executeScenario();
     }
-
-    /**
-     * Disable enabled config after test.
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        if (isset($this->currentVariation['arguments']['configData'])) {
-            $this->objectManager->create(
-                'Magento\Config\Test\TestStep\SetupConfigurationStep',
-                ['configData' => $this->currentVariation['arguments']['configData'], 'rollback' => true]
-            )->run();
-        }
-        $this->objectManager->create('Magento\SalesRule\Test\TestStep\DeleteAllSalesRuleStep')->run();
-        $this->objectManager->create('Magento\Tax\Test\TestStep\DeleteAllTaxRulesStep')->run();
-    }
 }

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

@@ -70,7 +70,6 @@ public function test()
      */
     public function tearDown()
     {
-        $this->objectManager->create('Magento\SalesRule\Test\TestStep\DeleteAllSalesRuleStep')->run();
         $this->browser->closeWindow();
     }
 }

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

@@ -41,21 +41,4 @@ public function test()
     {
         $this->executeScenario();
     }
-
-    /**
-     * Disable enabled config after test.
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        if (isset($this->currentVariation['arguments']['configData'])) {
-            $setConfigStep = $this->objectManager->create(
-                'Magento\Config\Test\TestStep\SetupConfigurationStep',
-                ['configData' => $this->currentVariation['arguments']['configData'], 'rollback' => true]
-            );
-            $setConfigStep->run();
-        }
-        $this->objectManager->create('Magento\SalesRule\Test\TestStep\DeleteAllSalesRuleStep')->run();
-    }
 }

dev/tests/functional/tests/app/Magento/SalesRule/Test/TestStep/CreateSalesRuleStep.php

@@ -28,17 +28,26 @@ class CreateSalesRuleStep implements TestStepInterface
      */
     protected $fixtureFactory;
 
+    /**
+     * Delete all Sales Rule on backend.
+     *
+     * @var DeleteAllSalesRuleStep
+     */
+    protected $deleteAllSalesRule;
+
     /**
      * Preparing step properties.
      *
      * @constructor
      * @param FixtureFactory $fixtureFactory
+     * @param DeleteAllSalesRuleStep $deleteRule
      * @param string $salesRule
      */
-    public function __construct(FixtureFactory $fixtureFactory, $salesRule = null)
+    public function __construct(FixtureFactory $fixtureFactory, DeleteAllSalesRuleStep $deleteRule, $salesRule = null)
     {
         $this->fixtureFactory = $fixtureFactory;
         $this->salesRule = $salesRule;
+        $this->deleteAllSalesRule = $deleteRule;
     }
 
     /**
@@ -60,4 +69,14 @@ public function run()
 
         return $result;
     }
+
+    /**
+     * Delete all sales rule.
+     *
+     * @return void
+     */
+    public function cleanup()
+    {
+        $this->deleteAllSalesRule->run();
+    }
 }