MQE-1157: Add readiness bypass to test actions

- Removed print statements, created action steps instead

Author: aljcalandra

src/Magento/FunctionalTestingFramework/Test/Util/ActionMergeUtil.php

@@ -23,6 +23,11 @@ class ActionMergeUtil
     const WAIT_ATTR = 'timeout';
     const WAIT_ACTION_NAME = 'waitForPageLoad';
     const WAIT_ACTION_SUFFIX = 'WaitForPageLoad';
+    const SKIP_READINESS_ACTION_NAME = 'skipReadinessCheck';
+    const SKIP_READINESS_OFF_SUFFIX = 'SkipReadinessOff';
+    const SKIP_READINESS_ON_SUFFIX = 'SkipReadinessOn';
+    const DEFAULT_SKIP_ON_ORDER = 'before';
+    const DEFAULT_SKIP_OFF_ORDER = 'after';
     const DEFAULT_WAIT_ORDER = 'after';
 
     /**
@@ -78,6 +83,7 @@ public function resolveActionSteps($parsedSteps, $skipActionGroupResolution = fa
     {
         $this->mergeActions($parsedSteps);
         $this->insertWaits();
+        $this->insertReadinessSkips();
 
         if ($skipActionGroupResolution) {
             return $this->orderedSteps;
@@ -217,6 +223,39 @@ private function insertWaits()
         }
     }
 
+    /**
+     * Runs through the prepared orderedSteps and calls insertWait if a step requires a wait after it.
+     *
+     * @return void
+     */
+    private function insertReadinessSkips()
+    {
+        foreach ($this->orderedSteps as $step) {
+            if (array_key_exists("skipReadiness", $step->getCustomActionAttributes())) {
+                if ($step->getCustomActionAttributes()['skipReadiness']) {
+                    $skipReadinessOn = new ActionObject(
+                        $step->getStepKey() . self::SKIP_READINESS_ON_SUFFIX,
+                        self::SKIP_READINESS_ACTION_NAME,
+                        ['state' => "true"],
+                        $step->getStepKey(),
+                        self::DEFAULT_SKIP_ON_ORDER
+                    );
+
+                    $skipReadinessOff = new ActionObject(
+                        $step->getStepKey() . self::SKIP_READINESS_OFF_SUFFIX,
+                        self::SKIP_READINESS_ACTION_NAME,
+                        ['state' => "false"],
+                        $step->getStepKey(),
+                        self::DEFAULT_SKIP_OFF_ORDER
+                    );
+
+                    $this->insertStep($skipReadinessOn);
+                    $this->insertStep($skipReadinessOff);
+                }
+            }
+        }
+    }
+
     /**
      * This method takes the steps from the parser and splits steps which need merge from steps that are ordered.
      *

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -513,14 +513,6 @@ public function generateStepsPhp($actionObjects, $hookObject = false, $actor = "
             if (isset($customActionAttributes['arguments'])) {
                 $arguments = $this->addUniquenessFunctionCall($customActionAttributes['arguments']);
             }
-            if (isset($customActionAttributes['skipReadiness'])) {
-                if ($customActionAttributes['skipReadiness'] == "true") {
-                    $testSteps .= sprintf(
-                        "\t\t$%s->skipReadinessCheck(true);\n",
-                        $actor
-                    );
-                }
-            }
 
             if (isset($customActionAttributes['attribute'])) {
                 $attribute = $customActionAttributes['attribute'];
@@ -1280,17 +1272,12 @@ public function generateStepsPhp($actionObjects, $hookObject = false, $actor = "
 
                     $testSteps .= $dateGenerateCode;
                     break;
+                case "skipReadinessCheck":
+                    $testSteps .= $this->wrapFunctionCall($actor, $actionObject, $customActionAttributes['state']);
+                    break;
                 default:
                     $testSteps .= $this->wrapFunctionCall($actor, $actionObject, $selector, $input, $parameter);
             }
-            if (isset($customActionAttributes['skipReadiness'])) {
-                if ($customActionAttributes['skipReadiness'] == "true") {
-                    $testSteps .= sprintf(
-                        "\t\t$%s->skipReadinessCheck(false);\n",
-                        $actor
-                    );
-                }
-            }
         }
 
         return $testSteps;