MQE-1582: Enable Testers To Run Skipped Tests

- Added new unit test for TestGenerator, also changed visibility of function for testing

Author: KevinBKozan

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

@@ -12,6 +12,9 @@
 use Magento\FunctionalTestingFramework\Test\Objects\TestObject;
 use Magento\FunctionalTestingFramework\Util\MagentoTestCase;
 use Magento\FunctionalTestingFramework\Util\TestGenerator;
+use Magento\FunctionalTestingFramework\Config\MftfApplicationConfig;
+use Magento\FunctionalTestingFramework\ObjectManager;
+use Magento\FunctionalTestingFramework\ObjectManagerFactory;
 
 class TestGeneratorTest extends MagentoTestCase
 {
@@ -38,4 +41,51 @@ public function testEntityException()
 
         $testGeneratorObject->createAllTestFiles(null, []);
     }
+
+    /**
+     * Tests that skipped tests do not have a fully generated body
+     *
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
+     */
+    public function testSkippedNoGeneration()
+    {
+        $actionInput = 'fakeInput';
+        $actionObject = new ActionObject('fakeAction', 'comment', [
+            'userInput' => $actionInput
+        ]);
+
+        $annotations = ['skip' => ['issue']];
+        $testObject = new TestObject("sampleTest", ["merge123" => $actionObject], $annotations, [], "filename");
+
+        $testGeneratorObject = TestGenerator::getInstance("", ["sampleTest" => $testObject]);
+        $output = $testGeneratorObject->assembleTestPhp($testObject);
+
+        $this->assertContains('This test is skipped', $output);
+        $this->assertNotContains( $actionInput, $output);
+    }
+
+    /**
+     * Tests that skipped tests have a fully generated body when --allowSkipped is passed in
+     *
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
+     */
+    public function testAllowSkipped()
+    {
+        // Mock allowSkipped for TestGenerator
+        AspectMock::double(MftfApplicationConfig::class, ['allowSkipped' => true]);
+
+        $actionInput = 'fakeInput';
+        $actionObject = new ActionObject('fakeAction', 'comment', [
+            'userInput' => $actionInput
+        ]);
+
+        $annotations = ['skip' => ['issue']];
+        $testObject = new TestObject("sampleTest", ["merge123" => $actionObject], $annotations, [], "filename");
+
+        $testGeneratorObject = TestGenerator::getInstance("", ["sampleTest" => $testObject]);
+        $output = $testGeneratorObject->assembleTestPhp($testObject);
+
+        $this->assertNotContains('This test is skipped', $output);
+        $this->assertContains($actionInput, $output);
+    }
 }

src/Magento/FunctionalTestingFramework/Console/BaseGenerateCommand.php

@@ -13,6 +13,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Magento\FunctionalTestingFramework\Util\Filesystem\DirSetupUtil;
 use Magento\FunctionalTestingFramework\Util\TestGenerator;
+use Magento\FunctionalTestingFramework\Config\MftfApplicationConfig;
 
 class BaseGenerateCommand extends Command
 {

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -228,14 +228,14 @@ public function createAllTestFiles($testManifest = null, $testsToIgnore = null)
      * @throws TestReferenceException
      * @throws \Exception
      */
-    private function assembleTestPhp($testObject)
+    public function assembleTestPhp($testObject)
     {
         $usePhp = $this->generateUseStatementsPhp();
         $classAnnotationsPhp = $this->generateAnnotationsPhp($testObject->getAnnotations());
 
         $className = $testObject->getCodeceptionName();
         try {
-            if (!$testObject->isSkipped()) {
+            if (!$testObject->isSkipped() && !MftfApplicationConfig::getConfig()->allowSkipped()) {
                 $hookPhp = $this->generateHooksPhp($testObject->getHooks());
             } else {
                 $hookPhp = null;