Merge remote-tracking branch 'origin/MC-19044' into 2.3.3-develop-pr68

Author: ameysar

dev/tests/functional/tests/app/Magento/Downloadable/Test/TestCase/CreateDownloadableProductEntityTest.php

@@ -11,6 +11,7 @@
 use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
 use Magento\Downloadable\Test\Fixture\DownloadableProduct;
 use Magento\Mtf\TestCase\Injectable;
+use Magento\Mtf\Util\Command\Cli\EnvWhitelist;
 
 /**
  * Steps:
@@ -53,6 +54,13 @@ class CreateDownloadableProductEntityTest extends Injectable
      */
     protected $catalogProductNew;
 
+    /**
+     * DomainWhitelist CLI
+     *
+     * @var EnvWhitelist
+     */
+    private $envWhitelist;
+
     /**
      * Persist category
      *
@@ -73,16 +81,19 @@ public function __prepare(Category $category)
      * @param Category $category
      * @param CatalogProductIndex $catalogProductIndexNewPage
      * @param CatalogProductNew $catalogProductNewPage
+     * @param EnvWhitelist $envWhitelist
      * @return void
      */
     public function __inject(
         Category $category,
         CatalogProductIndex $catalogProductIndexNewPage,
-        CatalogProductNew $catalogProductNewPage
+        CatalogProductNew $catalogProductNewPage,
+        EnvWhitelist $envWhitelist
     ) {
         $this->category = $category;
         $this->catalogProductIndex = $catalogProductIndexNewPage;
         $this->catalogProductNew = $catalogProductNewPage;
+        $this->envWhitelist = $envWhitelist;
     }
 
     /**
@@ -95,10 +106,21 @@ public function __inject(
     public function test(DownloadableProduct $product, Category $category)
     {
         // Steps
+        $this->envWhitelist->addHost('example.com');
         $this->catalogProductIndex->open();
         $this->catalogProductIndex->getGridPageActionBlock()->addProduct('downloadable');
         $productBlockForm = $this->catalogProductNew->getProductForm();
         $productBlockForm->fill($product, null, $category);
         $this->catalogProductNew->getFormPageActions()->save();
     }
+
+    /**
+     * Clean data after running test.
+     *
+     * @return void
+     */
+    protected function tearDown()
+    {
+        $this->envWhitelist->removeHost('example.com');
+    }
 }

dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/acceptance.xml

@@ -13,6 +13,7 @@
         </allow>
         <deny>
             <tag group="stable" value="no" />
+            <tag group="mftf_migrated" value="yes" />
         </deny>
     </rule>
     <rule scope="variation">