Merge pull request #533 from magento/MQE-1911

MQE-1911: --allow-skipped removing test hooks

Author: KevinBKozan

dev/tests/unit/Magento/FunctionalTestFramework/Util/TestGeneratorTest.php

@@ -9,6 +9,7 @@
 use AspectMock\Test as AspectMock;
 
 use Magento\FunctionalTestingFramework\Test\Objects\ActionObject;
+use Magento\FunctionalTestingFramework\Test\Objects\TestHookObject;
 use Magento\FunctionalTestingFramework\Test\Objects\TestObject;
 use Magento\FunctionalTestingFramework\Util\MagentoTestCase;
 use Magento\FunctionalTestingFramework\Util\TestGenerator;
@@ -76,14 +77,26 @@ public function testAllowSkipped()
         $actionObject = new ActionObject('fakeAction', 'comment', [
             'userInput' => $actionInput
         ]);
+        $beforeActionInput = 'beforeInput';
+        $beforeActionObject = new ActionObject('beforeAction', 'comment', [
+            'userInput' => $beforeActionInput
+        ]);
 
         $annotations = ['skip' => ['issue']];
-        $testObject = new TestObject("sampleTest", ["merge123" => $actionObject], $annotations, [], "filename");
+        $beforeHook = new TestHookObject("before", "sampleTest", ['beforeAction' => $beforeActionObject]);
+        $testObject = new TestObject(
+            "sampleTest",
+            ["fakeAction" => $actionObject],
+            $annotations,
+            ["before" => $beforeHook],
+            "filename"
+        );
 
         $testGeneratorObject = TestGenerator::getInstance("", ["sampleTest" => $testObject]);
         $output = $testGeneratorObject->assembleTestPhp($testObject);
 
         $this->assertNotContains('This test is skipped', $output);
         $this->assertContains($actionInput, $output);
+        $this->assertContains($beforeActionInput, $output);
     }
 }

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -242,7 +242,7 @@ public function assembleTestPhp($testObject)
 
         $className = $testObject->getCodeceptionName();
         try {
-            if (!$testObject->isSkipped() && !MftfApplicationConfig::getConfig()->allowSkipped()) {
+            if (!$testObject->isSkipped() || MftfApplicationConfig::getConfig()->allowSkipped()) {
                 $hookPhp = $this->generateHooksPhp($testObject->getHooks());
             } else {
                 $hookPhp = null;
@@ -1601,7 +1601,13 @@ private function generateTestPhp($test)
         $testName = str_replace(' ', '', $testName);
         $testAnnotations = $this->generateAnnotationsPhp($test->getAnnotations(), true);
         $dependencies = 'AcceptanceTester $I';
-        if ($test->isSkipped() && !MftfApplicationConfig::getConfig()->allowSkipped()) {
+        if (!$test->isSkipped() || MftfApplicationConfig::getConfig()->allowSkipped()) {
+            try {
+                $steps = $this->generateStepsPhp($test->getOrderedActions());
+            } catch (\Exception $e) {
+                throw new TestReferenceException($e->getMessage() . " in Test \"" . $test->getName() . "\"");
+            }
+        } else {
             $skipString = "This test is skipped due to the following issues:\\n";
             $issues = $test->getAnnotations()['skip'] ?? null;
             if (isset($issues)) {
@@ -1611,12 +1617,6 @@ private function generateTestPhp($test)
             }
             $steps = "\t\t" . '$scenario->skip("' . $skipString . '");' . "\n";
             $dependencies .= ', \Codeception\Scenario $scenario';
-        } else {
-            try {
-                $steps = $this->generateStepsPhp($test->getOrderedActions());
-            } catch (\Exception $e) {
-                throw new TestReferenceException($e->getMessage() . " in Test \"" . $test->getName() . "\"");
-            }
         }
 
         $testPhp .= $testAnnotations;