Merge pull request #9 from magento-pangolin/MQE-2311

MQE-2311: Changed files list for MFTF SVC to only include MFTF files

Author: soumyau

src/Console/Command/CompareSourceCommand.php

@@ -124,7 +124,7 @@ protected function execute(InputInterface $input, OutputInterface $cliOutput)
             $mftf
         );
         $fileChangeDetector = new FileChangeDetector($sourceBeforeDir, $sourceAfterDir);
-        $semanticVersionChecker = new SemanticVersionChecker($reportBuilder, $fileChangeDetector);
+        $semanticVersionChecker = new SemanticVersionChecker($reportBuilder, $fileChangeDetector, $mftf);
         $versionIncrease = $semanticVersionChecker->getVersionIncrease();
         $versionIncWord = strtoupper($this->changeLevels[$versionIncrease]);
         $versionReport = $semanticVersionChecker->loadVersionReport();

src/FileChangeDetector.php

@@ -40,9 +40,10 @@ public function __construct($sourceBeforeDir, $sourceAfterDir, $changedFileFilte
     /**
      * Get the set of files that were added, removed, or changed between before and after source
      *
+     * @param bool $mftf
      * @return string[]
      */
-    public function getChangedFiles()
+    public function getChangedFiles($mftf = false)
     {
         $beforeDir = $this->sourceBeforeDir;
         $afterDir = $this->sourceAfterDir;
@@ -66,7 +67,14 @@ public function getChangedFiles()
                 });
             }
         }
-        return array_merge($afterFiles, $beforeFiles);
+        $changedFiles = array_merge($afterFiles, $beforeFiles);
+        $mftfFiles = array_filter($changedFiles, function ($var) {
+            return (stripos($var, '/Test/Mftf/') !== false);
+        });
+        if ($mftf) {
+            return $mftfFiles;
+        }
+        return array_diff($changedFiles, $mftfFiles);
     }
 
     /**

src/Scanner/ModuleNamespaceResolver.php

@@ -49,7 +49,7 @@ public function resolveByViewDirFilePath(string $filePath): string
     public function resolveByTestMftfPath(string $filePath): string
     {
         $matches = [];
-        preg_match('/([\w-]*)\/([\w-]*)\/Test\/Mftf/', $filePath, $matches);
-        return sprintf('%s_%s', $matches[1], $matches[2]);
+        preg_match('/([\w-]*)\/Test\/Mftf/', $filePath, $matches);
+        return sprintf('%s', $matches[1]);
     }
 }

src/SemanticVersionChecker.php

@@ -36,19 +36,25 @@ class SemanticVersionChecker
     /** @var string[]|null */
     private $changedFiles;
 
+    /** @var boolean */
+    private $mftf;
+
     /**
      * Initialize dependencies.
      *
      * @param \Magento\SemanticVersionChecker\ReportBuilder $reportBuilder
      * @param FileChangeDetector $fileChangeDetector
+     * @param boolean $mftf
      */
     public function __construct(
         ReportBuilder $reportBuilder,
-        FileChangeDetector $fileChangeDetector
+        FileChangeDetector $fileChangeDetector,
+        $mftf = false
     ) {
         $this->reportBuilder = $reportBuilder;
         $this->fileChangeDetector = $fileChangeDetector;
         $this->changedFiles = null;
+        $this->mftf = $mftf;
     }
 
     /**
@@ -71,7 +77,7 @@ public function loadChangedFiles()
     {
         // Check null (unloaded) specifically as an empty array of changed files is valid
         if ($this->changedFiles === null) {
-            $this->changedFiles = $this->fileChangeDetector->getChangedFiles();
+            $this->changedFiles = $this->fileChangeDetector->getChangedFiles($this->mftf);
         }
         return $this->changedFiles;
     }