Merge branch 'MQE-510' into sprint-develop

Author: tomreece

dev/tests/verification/Resources/testSuiteGeneration1.txt

@@ -1,4 +1,4 @@
-dev/tests/verification/_generated/functionalSuite1/sampleSuite3Cest.php:includeTest --env chrome
-dev/tests/verification/_generated/functionalSuite1/sampleSuite5Cest.php:additionalTest --env chrome
-dev/tests/verification/_generated/functionalSuite1/sampleSuiteCest.php:includeTest --env chrome
-dev/tests/verification/_generated/functionalSuite1/sampleSuite4Cest.php:includeTest --env chrome
+dev/tests/verification/_generated/functionalSuite1/sampleSuite3Cest.php:includeTest
+dev/tests/verification/_generated/functionalSuite1/sampleSuite5Cest.php:additionalTest
+dev/tests/verification/_generated/functionalSuite1/sampleSuiteCest.php:includeTest
+dev/tests/verification/_generated/functionalSuite1/sampleSuite4Cest.php:includeTest

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -121,15 +121,14 @@ private function createCestFile($cestPhp, $filename)
      * to the createCestFile function.
      *
      * @param string $runConfig
-     * @param string $env
      * @return void
      */
-    public function createAllCestFiles($runConfig = null, $env = null)
+    public function createAllCestFiles($runConfig = null)
     {
         DirSetupUtil::createGroupDir($this->exportDirectory);
 
         // create our manifest file here
-        $testManifest = new TestManifest($this->exportDirectory, $runConfig, $env);
+        $testManifest = new TestManifest($this->exportDirectory, $runConfig);
         $cestPhpArray = $this->assembleAllCestPhp($testManifest);
 
         foreach ($cestPhpArray as $cestPhpFile) {

src/Magento/FunctionalTestingFramework/Util/TestManifest.php

@@ -11,7 +11,6 @@
 class TestManifest
 {
     const SINGLE_RUN_CONFIG = 'singleRun';
-    const DEFAULT_BROWSER = 'chrome';
     const TEST_MANIFEST_FILENAME = 'testManifest.txt';
 
     /**
@@ -21,13 +20,6 @@ class TestManifest
      */
     private $filePath;
 
-    /**
-     * Test Manifest environment flag. This is added to each dir or file in order for tests to execute properly.
-     *
-     * @var string $environment
-     */
-    private $environment = self::DEFAULT_BROWSER;
-
     /**
      * Type of manifest to generate. (Currently describes whether to path to a dir or for each test).
      *
@@ -47,9 +39,8 @@ class TestManifest
      *
      * @param string $path
      * @param string $runConfig
-     * @param string $env
      */
-    public function __construct($path, $runConfig, $env)
+    public function __construct($path, $runConfig)
     {
         $this->relativeDirPath = substr($path, strlen(dirname(dirname(TESTS_BP))) + 1);
         $filePath = $path .  DIRECTORY_SEPARATOR . self::TEST_MANIFEST_FILENAME;
@@ -58,10 +49,6 @@ public function __construct($path, $runConfig, $env)
         fclose($fileResource);
 
         $this->runTypeConfig = $runConfig;
-
-        if ($env) {
-            $this->environment = $env;
-        }
     }
 
     /**
@@ -87,7 +74,7 @@ public function recordCest($cestName, $tests)
 
         foreach ($tests as $test) {
             $line = $this->relativeDirPath . DIRECTORY_SEPARATOR . $cestName . '.php:' . $test->getName();
-            fwrite($fileResource, $this->appendDefaultBrowser($line) ."\n");
+            fwrite($fileResource, $line . PHP_EOL);
         }
 
         fclose($fileResource);
@@ -102,21 +89,8 @@ public function recordCest($cestName, $tests)
     public function recordPathToExportDir()
     {
         $fileResource = fopen($this->filePath, 'a');
-
         $line = $this->relativeDirPath . DIRECTORY_SEPARATOR;
-        fwrite($fileResource, $this->appendDefaultBrowser($line) ."\n");
-
+        fwrite($fileResource, $line . PHP_EOL);
         fclose($fileResource);
     }
-
-    /**
-     * Function which appends the --env flag to the test. This is needed to properly execute all tests in codeception.
-     *
-     * @param string $line
-     * @return string
-     */
-    private function appendDefaultBrowser($line)
-    {
-        return "${line} --env " . $this->environment;
-    }
 }