Merge pull request #2212 from magento-pangolin/2.2-develop-pangolin

[Pangolin] Deliver changes related to MFTF 2.1.1 release

Author: okolesnyk

dev/tests/acceptance/RoboFile.php

@@ -43,7 +43,7 @@ function buildProject()
      * @param array $opts
      * @return void
      */
-    function generateTests($opts = ['config' => null, 'force' => false])
+    function generateTests($opts = ['config' => null, 'force' => false, 'nodes' => null])
     {
         $GLOBALS['GENERATE_TESTS'] = true;
 
@@ -53,7 +53,7 @@ function generateTests($opts = ['config' => null, 'force' => false])
         }
 
         require 'tests'. DIRECTORY_SEPARATOR . 'functional' . DIRECTORY_SEPARATOR . '_bootstrap.php';
-        \Magento\FunctionalTestingFramework\Util\TestGenerator::getInstance()->createAllTestFiles($opts['config']);
+        \Magento\FunctionalTestingFramework\Util\TestGenerator::getInstance()->createAllTestFiles($opts['config'], $opts['nodes']);
         $this->say("Generate Tests Command Run");
     }
 

dev/tests/acceptance/composer.json

@@ -17,12 +17,12 @@
         }
     ],
     "require": {
-        "allure-framework/allure-codeception": "dev-master#af40af5ae2b717618a42fe3e137d75878508c75d",
+        "allure-framework/allure-codeception": "~1.2.6",
         "codeception/codeception": "~2.3.4",
         "consolidation/robo": "^1.0.0",
         "symfony/process": ">=2.7 <3.4",
         "henrikbjorn/lurker": "^1.2",
-        "magento/magento2-functional-testing-framework": "~2.1.0",
+        "magento/magento2-functional-testing-framework": "~2.1.1",
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
         "vlucas/phpdotenv": "~2.4"
     },

dev/tests/acceptance/composer.lock

@@ -40,6 +40,7 @@
         <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct1">
             <argument name="product" value="$$product$$"/>
         </actionGroup>
+        <scrollToTopOfPage stepKey="scrollToTop1"/>
         <click stepKey="clickSwitchStoreMenuForProduct1" selector="{{AdminProductFormActionSection.changeStoreButton}}"/>
         <click stepKey="clickOnStoreNameItemForProduct1" selector="{{AdminProductFormChangeStoreSection.storeSelector(customStore.name)}}"/>
         <click stepKey="acceptStoreSwitchingForProduct1" selector="{{AdminProductFormChangeStoreSection.acceptButton}}"/>
@@ -52,6 +53,7 @@
         <actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="openEditProduct2">
             <argument name="product" value="$$secondProduct$$"/>
         </actionGroup>
+        <scrollToTopOfPage stepKey="scrollToTop2"/>
         <click stepKey="clickSwitchStoreMenuForProduct2" selector="{{AdminProductFormActionSection.changeStoreButton}}"/>
         <click stepKey="clickOnStoreNameItemForProduct2" selector="{{AdminProductFormChangeStoreSection.storeSelector('Default Store View')}}"/>
         <click stepKey="acceptStoreSwitchingForProduct2" selector="{{AdminProductFormChangeStoreSection.acceptButton}}"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Wishlist/Test/StorefrontAddMultipleStoreProductsToWishlistTest.xml

@@ -84,6 +84,7 @@
             <constraint name="Magento\Bundle\Test\Constraint\AssertBundleProductPage" />
         </variation>
         <variation name="UpdateBundleProductEntityTestVariation6" summary="Verify data overrirding on Store View level" ticketId="MAGETWO-50642">
+            <data name="tag" xsi:type="string">stable:no</data>
             <data name="originalProduct/dataset" xsi:type="string">bundle_fixed_product</data>
             <data name="store/dataset" xsi:type="string">custom</data>
             <data name="product/data/bundle_selections/dataset" xsi:type="string">fixed_with_custom_title</data>

dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/UpdateBundleProductEntityTest.xml

@@ -161,14 +161,15 @@
         </variation>
         <variation name="UpdateSimpleProductEntityTestVariation12" summary="Verify data overriding on Store View level" ticketId="MAGETWO-50640">
             <data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
+            <data name="tag" xsi:type="string">stable:no</data>
             <data name="store/dataset" xsi:type="string">custom</data>
             <data name="product/data/use_default_name" xsi:type="string">No</data>
             <data name="product/data/name" xsi:type="string">Test simple product %isolation%</data>
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
             <constraint name="Magento\Catalog\Test\Constraint\AssertProductNameOnDifferentStoreViews" />
         </variation>
         <variation name="UpdateSimpleProductEntityTestVariation13" summary="Price overriding on Store View level" ticketId="MAGETWO-58861">
-            <data name="tag" xsi:type="string">test_type:acceptance_test, test_type:extended_acceptance_test</data>
+            <data name="tag" xsi:type="string">stable:no, test_type:acceptance_test, test_type:extended_acceptance_test</data>
             <data name="configData" xsi:type="string">price_scope_website</data>
             <data name="initialProduct/dataset" xsi:type="string">product_with_category</data>
             <data name="store/dataset" xsi:type="string">custom</data>

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/UpdateSimpleProductEntityTest.xml

@@ -71,6 +71,7 @@
         </variation>
         <variation name="VerifyConfigurableProductEntityPriceTestVariation6" summary="Change price on scope level for child product" ticketId="MAGETWO-60325">
             <data name="product" xsi:type="string">configurableProduct::product_with_color</data>
+            <data name="tag" xsi:type="string">stable:no</data>
             <data name="productUpdate/childProductUpdate" xsi:type="array">
                 <item name="data" xsi:type="array">
                     <item name="price" xsi:type="string">0.07</item>