MQE-1068: Require Issue ID for Skipped Test

- Added Skip text for issue Ids
- Update and added test

Author: aljcalandra

dev/tests/verification/Resources/SkippedTest.txt

@@ -33,6 +33,6 @@ class SkippedTestCest
 	 */
 	public function SkippedTest(AcceptanceTester $I, \Codeception\Scenario $scenario)
 	{
-		$scenario->skip("This test is skipped");
+		$scenario->skip("This test is skipped due to the following issues:\nSkippedValue");
 	}
 }

dev/tests/verification/Resources/SkippedTestNoIssues.txt

@@ -0,0 +1,39 @@
+<?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("skippedNoIssuesTest")
+ * @Description("")
+ * @group skip
+ */
+class SkippedTestNoIssuesCest
+{
+	/**
+	 * @Stories({"skippedNo"})
+	 * @Severity(level = SeverityLevel::MINOR)
+	 * @Features({"TestModule"})
+	 * @Parameter(name = "AcceptanceTester", value="$I")
+	 * @param AcceptanceTester $I
+	 * @return void
+	 * @throws \Exception
+	 */
+	public function SkippedTestNoIssues(AcceptanceTester $I, \Codeception\Scenario $scenario)
+	{
+		$scenario->skip("This test is skipped due to the following issues:\nNo issues have been specified.");
+	}
+}

dev/tests/verification/Resources/SkippedTestTwoIssues.txt

@@ -33,6 +33,6 @@ class SkippedTestTwoIssuesCest
 	 */
 	public function SkippedTestTwoIssues(AcceptanceTester $I, \Codeception\Scenario $scenario)
 	{
-		$scenario->skip("This test is skipped");
+		$scenario->skip("This test is skipped due to the following issues:\nSkippedValue\nSecondSkippedValue");
 	}
 }

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

@@ -31,4 +31,13 @@
             </skip>
         </annotations>
     </test>
+    <test name="SkippedTestNoIssues">
+        <annotations>
+            <stories value="skippedNo"/>
+            <title value="skippedNoIssuesTest"/>
+            <description value=""/>
+            <severity value="AVERAGE"/>
+            <group value="skip"/>
+        </annotations>
+    </test>
 </tests>

dev/tests/verification/Tests/SkippedGenerationTest.php

@@ -30,4 +30,15 @@ public function testMultipleSkippedIssuesGeneration()
     {
         $this->generateAndCompareTest('SkippedTestTwoIssues');
     }
+
+    /**
+     * Tests skipped test generation with no specified issues. Will be deprecated after MFTF 3.0.0
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
+     */
+    public function testSkippedNoIssueGeneration()
+    {
+        $this->generateAndCompareTest('SkippedTestNoIssues');
+    }
 }

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -1529,7 +1529,14 @@ private function generateTestPhp($test)
         $testAnnotations = $this->generateAnnotationsPhp($test->getAnnotations(), true);
         $dependencies = 'AcceptanceTester $I';
         if ($test->isSkipped()) {
-            $steps = "\t\t" . '$scenario->skip("This test is skipped");' . "\n";
+            $skipString = "This test is skipped due to the following issues:\\n";
+            $issues = $test->getAnnotations()['skip'] ?? null;
+            if (isset($issues)) {
+                $skipString .= implode("\\n", $issues);
+            } else {
+                $skipString .= "No issues have been specified.";
+            }
+            $steps = "\t\t" . '$scenario->skip("' . $skipString . '");' . "\n";
             $dependencies .= ', \Codeception\Scenario $scenario';
         } else {
             try {