MQE-2158: support using actions from multiple modules in Suites

Author: jilu1

dev/tests/verification/Resources/functionalSuiteUsingSecretData.txt renamed to dev/tests/verification/Resources/ActionsInDifferentModulesSuite.txt

@@ -21,14 +21,14 @@ use Codeception\Module;
  *
  * To use this group extension, include it to "extensions" option of global Codeception config.
  */
-class functionalSuiteUsingSecretData extends \Codeception\GroupObject
+class ActionsInDifferentModulesSuite extends \Codeception\GroupObject
 {
-    public static $group = 'functionalSuiteUsingSecretData';
+    public static $group = 'ActionsInDifferentModulesSuite';
     private $testCount = 1;
     private $preconditionFailure = null;
     private $currentTestRun = 0;
-    private static $HOOK_EXECUTION_INIT = "\n/******** Beginning execution of functionalSuiteUsingSecretData suite %s block ********/\n";
-    private static $HOOK_EXECUTION_END = "\n/******** Execution of functionalSuiteUsingSecretData suite %s block complete ********/\n";
+    private static $HOOK_EXECUTION_INIT = "\n/******** Beginning execution of ActionsInDifferentModulesSuite suite %s block ********/\n";
+    private static $HOOK_EXECUTION_END = "\n/******** Execution of ActionsInDifferentModulesSuite suite %s block complete ********/\n";
     /** @var MagentoWebDriver */
     private $webDriver;
     /** @var ModuleContainer */
@@ -83,6 +83,11 @@ class functionalSuiteUsingSecretData extends \Codeception\GroupObject
                 );
                 $this->getModuleForAction("fillSecretField")->fillSecretField("#fill", $this->getModuleForAction("getSecret")->getSecret("magento/some/secret") . "+" . $this->getModuleForAction("getSecret")->getSecret("magento/some/secret")); // stepKey: fillBefore
                 $this->getModuleForAction("click")->click(PersistedObjectHandler::getInstance()->retrieveEntityField('create2', 'key2', 'suite')); // stepKey: click
+                print("Entering Action Group [return1] ActionGroupReturningValueActionGroup");
+                $grabProducts1Return1 = $this->getModuleForAction("grabMultiple")->grabMultiple("selector"); // stepKey: grabProducts1Return1
+                $this->getModuleForAction("assertCount")->assertCount(1, $grabProducts1Return1); // stepKey: assertCountReturn1
+                $return1 = $this->getModuleForAction("return")->return($grabProducts1Return1); // stepKey: returnProducts1Return1
+                print("Exiting Action Group [return1] ActionGroupReturningValueActionGroup");
             } catch (\Exception $exception) {
                 $this->preconditionFailure = $exception->getMessage();
             }
@@ -133,6 +138,14 @@ class functionalSuiteUsingSecretData extends \Codeception\GroupObject
                 } else {
                     $this->webDriver->_initializeSession();
                 }
+                print("Entering Action Group [return2] ExtendedActionGroupReturningValueActionGroup");
+                $grabProducts1Return2 = $this->getModuleForAction("grabMultiple")->grabMultiple("selector"); // stepKey: grabProducts1Return2
+                $this->getModuleForAction("assertCount")->assertCount(1, $grabProducts1Return2); // stepKey: assertCountReturn2
+                $return2 = $this->getModuleForAction("return")->return($grabProducts1Return2); // stepKey: returnProducts1Return2
+                $grabProducts2Return2 = $this->getModuleForAction("grabMultiple")->grabMultiple("otherSelector"); // stepKey: grabProducts2Return2
+                $this->getModuleForAction("assertCount")->assertCount(2, $grabProducts2Return2); // stepKey: assertSecondCountReturn2
+                $return2 = $this->getModuleForAction("return")->return($grabProducts2Return2); // stepKey: returnProducts2Return2
+                print("Exiting Action Group [return2] ExtendedActionGroupReturningValueActionGroup");
                 PersistedObjectHandler::getInstance()->deleteEntity(
                 	"create1",
                     "suite"

dev/tests/verification/TestModule/Suite/functionalSuiteUsingSecretData.xml renamed to dev/tests/verification/TestModule/Suite/ActionsInDifferentModulesSuite.xml

@@ -7,9 +7,9 @@
 -->
 
 <suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
-    <suite name="functionalSuiteUsingSecretData">
+    <suite name="ActionsInDifferentModulesSuite">
         <include>
-            <test name="IncludeUsingSecretDataTest"/>
+            <test name="IncludeActionsInDifferentModulesTest"/>
         </include>
         <before>
             <magentoCLI command="{{SecretData.key2}}" stepKey="cli"/>
@@ -23,8 +23,15 @@
             </createData>
             <fillField selector="#fill" userInput="{{SecretData.key2}}+{{SecretData.key2}}" stepKey="fillBefore"/>
             <click userInput="$create2.key2$" stepKey="click"/>
+            <actionGroup ref="ActionGroupReturningValueActionGroup" stepKey="return1">
+                <argument name="count" value="1"/>
+            </actionGroup>
         </before>
         <after>
+            <actionGroup ref="ExtendedActionGroupReturningValueActionGroup" stepKey="return2">
+                <argument name="count" value="1"/>
+                <argument name="otherCount" value="2"/>
+            </actionGroup>
             <deleteData createDataKey="create1" stepKey="delete1"/>
             <deleteData createDataKey="create2" stepKey="delete2"/>
             <deleteData createDataKey="create3" stepKey="delete3"/>

dev/tests/verification/TestModule/Test/SampleSuiteTest/IncludeUsingSecretDataTest.xml renamed to dev/tests/verification/TestModule/Test/SampleSuiteTest/IncludeActionsInDifferentModulesTest.xml

@@ -7,11 +7,14 @@
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
-    <test name="IncludeUsingSecretDataTest">
+    <test name="IncludeActionsInDifferentModulesTest">
         <createData entity="SecretData" stepKey="create">
             <field key="someKey">dataHere</field>
         </createData>
         <fillField selector="#fill" userInput="{{SecretData.key2}}+$create.key2$" stepKey="fill"/>
         <magentoCLI command="create.key2$" stepKey="cli"/>
+        <actionGroup ref="ActionGroupReturningValueActionGroup" stepKey="return">
+            <argument name="count" value="3"/>
+        </actionGroup>
     </test>
 </tests>

dev/tests/verification/Tests/SuiteGenerationTest.php

@@ -389,14 +389,14 @@ public function testSuiteCommentsGeneration()
     }
 
     /**
-     * Test hook groups generated during suite generation
+     * Test suite generation with actions from different modules
      */
-    public function testSuiteGenerationCreds()
+    public function testSuiteGenerationActionsInDifferentModules()
     {
-        $groupName = 'functionalSuiteUsingSecretData';
+        $groupName = 'ActionsInDifferentModulesSuite';
 
         $expectedContents = [
-            'IncludeUsingSecretDataTestCest.php'
+            'IncludeActionsInDifferentModulesTestCest.php'
         ];
 
         // Generate the Suite