Merge pull request #2242 from magento-pangolin/2.2.4-develop-pangolin

[Pangolin] Deliver changes related to MFTF 2.1.1 release

Author: okolesnyk

dev/tests/acceptance/RoboFile.php

@@ -43,10 +43,17 @@ function buildProject()
      * @param array $opts
      * @return void
      */
-    function generateTests($opts = ['config' => null])
+    function generateTests($opts = ['config' => null, 'force' => false, 'nodes' => null])
     {
+        $GLOBALS['GENERATE_TESTS'] = true;
+
+        if ($opts['force'])
+        {
+            $GLOBALS['FORCE_PHP_GENERATE'] = true;
+        }
+
         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

@@ -16,12 +16,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.0.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

@@ -16,6 +16,7 @@
         <include>
             <module name="Catalog" />
             <group name="login" />
+            <test name="AdminCreateCustomerTest"/>
         </include>
         <exclude>
             <module name="Catalog" file="AdminCreateCategoryTest.xml" />

dev/tests/acceptance/tests/_suite/sampleSuite.xml

@@ -21,6 +21,7 @@ modules:
             depends: PhpBrowser
             part: Json
         - \Magento\FunctionalTestingFramework\Module\MagentoSequence
+        - \Magento\FunctionalTestingFramework\Module\MagentoAssert
         - Asserts
     config:
         \Magento\FunctionalTestingFramework\Module\MagentoWebDriver:

dev/tests/acceptance/tests/functional.suite.dist.yml

@@ -12,8 +12,8 @@
         <arguments>
             <argument name="product" defaultValue="product"/>
         </arguments>
-        <amOnPage stepKey="navigateProductPage-{{product.name}}" url="/{{product.name}}.html"/>
-        <click stepKey="addToCart-{{product.name}}" selector="{{StorefrontProductPageSection.AddToCartBtn}}"/>
+        <amOnPage stepKey="navigateProductPage" url="/{{product.name}}.html"/>
+        <click stepKey="addToCart" selector="{{StorefrontProductPageSection.AddToCartBtn}}"/>
         <waitForElementVisible selector="{{StorefrontProductPageSection.SuccessMsg}}" time="30" stepKey="waitForProductAdded"/>
     </actionGroup>
 </actionGroups>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/ActionGroup/AddProductToCartActionGroup.xml

@@ -9,7 +9,7 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCategorySidebarTreeSection">
-        <element name="Collapse All" type="button" selector=".tree-actions a:first-child"/>
-        <element name="Expand All" type="button" selector=".tree-actions a:last-child"/>
+        <element name="collapseAll" type="button" selector=".tree-actions a:first-child"/>
+        <element name="expandAll" type="button" selector=".tree-actions a:last-child"/>
     </section>
 </sections>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Section/AdminCategorySidebarTreeSection.xml

@@ -14,7 +14,7 @@
             <stories value="Create an Invoice via the Admin"/>
             <title value="Create Invoice"/>
             <description value="Should be able to create an invoice via the admin."/>
-            <severity value="NORMAL"/>
+            <severity value="MAJOR"/>
             <testCaseId value="MAGETWO-72096"/>
             <group value="sales"/>
         </annotations>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Sales/Test/AdminCreateInvoiceTest.xml

@@ -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}}"/>