Merge branch 'develop' into ACQE-5843

Author: manjusha729

CHANGELOG.md

@@ -1,5 +1,14 @@
 Magento Functional Testing Framework Changelog
 ================================================
+4.5.0
+---------
+### Enhancements
+* Increase browser resolution to 1920x1080.
+* Add metadata to ACQE Repositories.
+* Add magento admin password to credentials example.
+
+### Fixes
+* Fixed test failure while running any test suite with an argument.
 
 4.4.2
 ---------

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "4.4.2",
+    "version": "4.5.0",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {

composer.lock

@@ -46,18 +46,16 @@
                 $idleTimeout = true;
             }
 
-            if (checkForFilePath($output)) {
-                $output = "CLI output suppressed, filepath detected in output.";
-            }
-
             $exitCode = $process->getExitCode();
 
             if ($process->isSuccessful() || $idleTimeout) {
                 http_response_code(202);
             } else {
                 http_response_code(500);
             }
-            echo $output;
+
+            // Suppress file paths from output
+            echo suppressFilePaths($output);
         } else {
             http_response_code(403);
             echo "Given command not found valid in Magento CLI Command list.";
@@ -115,11 +113,21 @@ function trimAfterWhitespace($string)
 }
 
 /**
- * Detects file path in string.
+ * Suppress file paths in string.
  * @param string $string
- * @return boolean
+ * @return string
  */
-function checkForFilePath($string)
+function suppressFilePaths(string $string): string
 {
-    return preg_match('/\/[\S]+\//', $string);
+    // Match file paths on both *nix and Windows system
+    $filePathPattern = '~(?:[A-Za-z]:[\\\/]|\\\\|\/)\S+~';
+    $replacement = '[suppressed_path]';
+
+    preg_match_all($filePathPattern, $string, $matches);
+    if (!empty($matches)) {
+        foreach ($matches[0] as $match) {
+            $string = str_replace($match, $replacement, $string);
+        }
+    }
+    return $string;
 }