Merge remote-tracking branch 'origin/imported-magento-magento2-functional-testing-framework-830' into MQE-2683

Author: jilu1

dev/tests/verification/Resources/BasicFunctionalTest.txt

@@ -113,6 +113,7 @@ class BasicFunctionalTestCest
 		$generateDateKey2 = $date->format("H:i:s");
 
 		$getOtp = $I->getOTP(); // stepKey: getOtp
+		$getOtpWithInput = $I->getOTP("someInput"); // stepKey: getOtpWithInput
 		$grabAttributeFromKey1 = $I->grabAttributeFrom(".functionalTestSelector", "someInput"); // stepKey: grabAttributeFromKey1
 		$grabCookieKey1 = $I->grabCookie("grabCookieInput", ['domain' => 'www.google.com']); // stepKey: grabCookieKey1
 		$grabFromCurrentUrlKey1 = $I->grabFromCurrentUrl("/grabCurrentUrl"); // stepKey: grabFromCurrentUrlKey1

dev/tests/verification/TestModule/Test/BasicFunctionalTest/BasicFunctionalTest.xml

@@ -69,6 +69,7 @@
         <generateDate date="Now" format="H:i:s" stepKey="generateDateKey"/>
         <generateDate date="Now" format="H:i:s" stepKey="generateDateKey2" timezone="UTC"/>
         <getOTP stepKey="getOtp"/>
+        <getOTP stepKey="getOtpWithInput" userInput="someInput"/>
         <grabAttributeFrom selector=".functionalTestSelector" userInput="someInput" stepKey="grabAttributeFromKey1" />
         <grabCookie userInput="grabCookieInput" parameterArray="['domain' => 'www.google.com']" stepKey="grabCookieKey1" />
         <grabFromCurrentUrl regex="/grabCurrentUrl" stepKey="grabFromCurrentUrlKey1" />

src/Magento/FunctionalTestingFramework/DataTransport/Auth/Tfa/OTP.php

@@ -20,42 +20,47 @@ class OTP
     /**
      * TOTP object
      *
-     * @var TOTP
+     * @var TOTP[]
      */
-    private static $totp = null;
+    private static $totps = [];
 
     /**
      * Return OTP for custom secret stored in `magento/tfa/OTP_SHARED_SECRET`
      *
+     * @param string|null $path
      * @return string
      * @throws TestFrameworkException
      */
-    public static function getOTP()
+    public static function getOTP($path = null)
     {
-        return self::create()->now();
+        if ($path === null) {
+            $path = self::OTP_SHARED_SECRET_PATH;
+        }
+        return self::create($path)->now();
     }
 
     /**
      * Create TOTP object
      *
+     * @param string $path
      * @return TOTP
      * @throws TestFrameworkException
      */
-    private static function create()
+    private static function create($path)
     {
-        if (self::$totp === null) {
+        if (!isset(self::$totps[$path])) {
             try {
                 // Get shared secret from Credential storage
-                $encryptedSecret = CredentialStore::getInstance()->getSecret(self::OTP_SHARED_SECRET_PATH);
+                $encryptedSecret = CredentialStore::getInstance()->getSecret($path);
                 $secret = CredentialStore::getInstance()->decryptSecretValue($encryptedSecret);
             } catch (TestFrameworkException $e) {
                 throw new TestFrameworkException('Unable to get OTP' . PHP_EOL . $e->getMessage());
             }
 
-            self::$totp = TOTP::create($secret);
-            self::$totp->setIssuer('MFTF');
-            self::$totp->setLabel('MFTF Testing');
+            self::$totps[$path] = TOTP::create($secret);
+            self::$totps[$path]->setIssuer('MFTF');
+            self::$totps[$path]->setLabel('MFTF Testing');
         }
-        return self::$totp;
+        return self::$totps[$path];
     }
 }

src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php

@@ -970,12 +970,13 @@ public function makeScreenshot($name = null)
     /**
      * Return OTP based on a shared secret
      *
+     * @param string|null $secretsPath
      * @return string
      * @throws TestFrameworkException
      */
-    public function getOTP()
+    public function getOTP($secretsPath = null)
     {
-        return OTP::getOTP();
+        return OTP::getOTP($secretsPath);
     }
 
     /**

src/Magento/FunctionalTestingFramework/Test/etc/Actions/customActions.xsd

@@ -335,6 +335,7 @@
         </xs:annotation>
         <xs:simpleContent>
             <xs:extension base="xs:string">
+                <xs:attribute ref="userInput"/>
                 <xs:attributeGroup ref="commonActionAttributes"/>
             </xs:extension>
         </xs:simpleContent>

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -1262,7 +1262,8 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
                     $testSteps .= $this->wrapFunctionCallWithReturnValue(
                         $stepKey,
                         $actor,
-                        $actionObject
+                        $actionObject,
+                        $input
                     );
                     break;
                 case "resizeWindow":