MQE-1379: Fix MFTF custom actions to fully support Codeception dry-run functionality

Author: jilu1

src/Magento/FunctionalTestingFramework/Allure/Adapter/MagentoAllureAdapter.php

@@ -49,13 +49,6 @@ class MagentoAllureAdapter extends AllureCodeception
      */
     private $atInvisibleSteps = false;
 
-    /**
-     * Boolean array to store status of previous invisible steps
-     *
-     * @var array
-     */
-    private $invisibleStepStatus = [];
-
     /**
      * Array of group values passed to test runner command
      *
@@ -137,9 +130,6 @@ private function sanitizeGroupName($group)
      * @param StepEvent $stepEvent
      * @return void
      * @throws \Yandex\Allure\Adapter\AllureException
-     *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function stepBefore(StepEvent $stepEvent)
     {
@@ -198,27 +188,18 @@ public function stepBefore(StepEvent $stepEvent)
      */
     public function stepAfter(StepEvent $stepEvent = null)
     {
-        // Store invisible step status if step is in INVISIBLE_STEP_ACTIONS
-        if ($this->atInvisibleSteps && $stepEvent->getStep()->hasFailed()) {
-            $this->invisibleStepStatus[] = false;
-            return;
-        } elseif ($this->atInvisibleSteps) {
-            $this->invisibleStepStatus[] = true;
-            return;
-        } else {
-            // Check previous invisible steps status
-            $invisibleStepsPassed = true;
-            foreach ($this->invisibleStepStatus as $pass) {
-                if (!$pass) {
-                    $invisibleStepsPassed = false;
-                    break;
-                }
-            }
-            $this->invisibleStepStatus = [];
-            if ($stepEvent->getStep()->hasFailed() || !$invisibleStepsPassed) {
-                $this->getLifecycle()->fire(new StepFailedEvent());
+        // Simply return if step is INVISIBLE_STEP_ACTIONS
+        if ($this->atInvisibleSteps) {
+            if ($stepEvent->getStep()->hasFailed()) {
+                $this->atInvisibleSteps = false;
             }
+            return;
         }
+
+        if ($stepEvent->getStep()->hasFailed()) {
+            $this->getLifecycle()->fire(new StepFailedEvent());
+        }
+
         $this->getLifecycle()->fire(new StepFinishedEvent());
     }
 

src/Magento/FunctionalTestingFramework/Codeception/Subscriber/Console.php

@@ -39,13 +39,6 @@ class Console extends \Codeception\Subscriber\Console
      */
     private $atInvisibleSteps = false;
 
-    /**
-     * Boolean array to store status of previous invisible steps
-     *
-     * @var array
-     */
-    private $invisibleStepStatus = [];
-
     /**
      * Console constructor. Parent constructor requires codeception CLI options, and does not have its own configs.
      * Constructor is only different than parent due to the way Codeception instantiates Extensions.
@@ -65,8 +58,6 @@ public function __construct($extensionOptions = [], $options = [])
      *
      * @param StepEvent $e
      * @return void
-     *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function beforeStep(StepEvent $e)
     {
@@ -107,27 +98,14 @@ public function beforeStep(StepEvent $e)
      */
     public function afterStep(StepEvent $e)
     {
-        // Store invisible step status if step is in INVISIBLE_STEP_ACTIONS
-        if ($this->atInvisibleSteps && $e->getStep()->hasFailed()) {
-            $this->invisibleStepStatus[] = false;
-            return;
-        } elseif ($this->atInvisibleSteps) {
-            $this->invisibleStepStatus[] = true;
-            return;
-        } else {
-            // Check previous invisible steps status
-            $invisibleStepsPassed = true;
-            foreach ($this->invisibleStepStatus as $pass) {
-                if (!$pass) {
-                    $invisibleStepsPassed = false;
-                    break;
-                }
-            }
-            $this->invisibleStepStatus = [];
+        // Do usual after step if step is not INVISIBLE_STEP_ACTIONS
+        if (!$this->atInvisibleSteps) {
             parent::afterStep($e);
-            if ($e->getStep()->hasFailed() || !$invisibleStepsPassed) {
-                $this->actionGroupStepKey = null;
-            }
+        }
+
+        if ($e->getStep()->hasFailed()) {
+            $this->actionGroupStepKey = null;
+            $this->atInvisibleSteps = false;
         }
     }