MQE-1151: Extending a skipped test fails to generate the parent before and after actions

- Removing paramater from getHooks
- Adding test for hooks generation on skipped test
- Moving skipped logic to testGenerator

Author: aljcalandra

dev/tests/verification/Resources/SkippedTestWithHooks.txt

@@ -0,0 +1,38 @@
+<?php
+namespace Magento\AcceptanceTest\_default\Backend;
+
+use Magento\FunctionalTestingFramework\AcceptanceTester;
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
+use \Codeception\Util\Locator;
+use Yandex\Allure\Adapter\Annotation\Features;
+use Yandex\Allure\Adapter\Annotation\Stories;
+use Yandex\Allure\Adapter\Annotation\Title;
+use Yandex\Allure\Adapter\Annotation\Description;
+use Yandex\Allure\Adapter\Annotation\Parameter;
+use Yandex\Allure\Adapter\Annotation\Severity;
+use Yandex\Allure\Adapter\Model\SeverityLevel;
+use Yandex\Allure\Adapter\Annotation\TestCaseId;
+
+/**
+ * @Title("skippedTestWithHooks")
+ * @Description("")
+ */
+class SkippedTestWithHooksCest
+{
+	/**
+	 * @Stories({"skippedWithHooks"})
+	 * @Severity(level = SeverityLevel::MINOR)
+	 * @Features({"TestModule"})
+	 * @Parameter(name = "AcceptanceTester", value="$I")
+	 * @param AcceptanceTester $I
+	 * @return void
+	 * @throws \Exception
+	 */
+	public function SkippedTestWithHooks(AcceptanceTester $I, \Codeception\Scenario $scenario)
+	{
+		$scenario->skip("This test is skipped due to the following issues:\nSkippedValue");
+	}
+}

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

@@ -19,6 +19,23 @@
             </skip>
         </annotations>
     </test>
+    <test name="SkippedTestWithHooks">
+        <annotations>
+            <stories value="skippedWithHooks"/>
+            <title value="skippedTestWithHooks"/>
+            <description value=""/>
+            <severity value="AVERAGE"/>
+            <skip>
+                <issueId value="SkippedValue"/>
+            </skip>
+        </annotations>
+        <before>
+            <comment userInput="skippedComment" stepKey="beforeComment"/>
+        </before>
+        <after>
+            <comment userInput="skippedComment" stepKey="afterComment"/>
+        </after>
+    </test>
     <test name="SkippedTestTwoIssues">
         <annotations>
             <stories value="skippedMultiple"/>

dev/tests/verification/Tests/SkippedGenerationTest.php

@@ -20,6 +20,17 @@ public function testSkippedGeneration()
         $this->generateAndCompareTest('SkippedTest');
     }
 
+    /**
+     * Tests skipped test generation does not generate hooks.
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
+     */
+    public function testSkippedWithHooksGeneration()
+    {
+        $this->generateAndCompareTest('SkippedTestWithHooks');
+    }
+
     /**
      * Tests skipped test with multiple issues generation.
      *

src/Magento/FunctionalTestingFramework/Test/Objects/TestObject.php

@@ -164,15 +164,10 @@ public function getAnnotations()
     /**
      * Returns hooks.
      *
-     * @param boolean $isExtended
      * @return TestHookObject[]
      */
-    public function getHooks($isExtended = false)
+    public function getHooks()
     {
-        // if this test is skipped we do not want any before/after actions to generate as the tests will not run
-        if ($this->isSkipped() && !$isExtended) {
-            return [];
-        }
         return $this->hooks;
     }
 

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

@@ -146,8 +146,7 @@ public function extendActionGroup($actionGroupObject)
     private function resolveExtendedHooks($testObject, $parentTestObject)
     {
         $testHooks = $testObject->getHooks();
-        // Send true to getHooks to return even if test is skipped
-        $parentHooks = $parentTestObject->getHooks(true);
+        $parentHooks = $parentTestObject->getHooks();
 
         // Get the hooks for each Test merge changes from the child hooks to the parent hooks into the child hooks
         foreach ($testHooks as $key => $hook) {

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -207,7 +207,11 @@ private function assembleTestPhp($testObject)
 
         $className = $testObject->getCodeceptionName();
         try {
-            $hookPhp = $this->generateHooksPhp($testObject->getHooks());
+            if (!$testObject->isSkipped()) {
+                $hookPhp = $this->generateHooksPhp($testObject->getHooks());
+            } else {
+                $hookPhp = null;
+            }
             $testsPhp = $this->generateTestPhp($testObject);
         } catch (TestReferenceException $e) {
             throw new TestReferenceException($e->getMessage() . "\n" . $testObject->getFilename());