Merge branch '1.x' into 2.x

Signed-off-by: Mior Muhammad Zaki <crynobone@gmail.com>
orchestral · Jul 27, 2023 · ab72e41 · ab72e41
2 parents 8b1dbb2 + 2363165
commit ab72e41
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/CHANGELOG-1.x.md b/CHANGELOG-1.x.md
@@ -2,6 +2,14 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/dusk-updater`.
 
+## 1.7.1
+
+Released: 2023-07-27
+
+### Fixes
+
+*  Normalize directory separator when renaming ChromeDriver binary.
+
 ## 1.7.0
 
 Released: 2023-07-22

diff --git a/src/Concerns/DetectsChromeVersion.php b/src/Concerns/DetectsChromeVersion.php
@@ -73,7 +73,7 @@ protected function findVersionUrl(?string $version): string
         $milestones = $this->resolveChromeVersionsPerMilestone();
 
         return $milestones['milestones'][$version]['version']
-            ?? throw new Exception('Could not get the ChromeDriver version.');
+            ?? throw new Exception('Could not determine the ChromeDriver version.');
     }
 
     /**

diff --git a/src/helpers.php b/src/helpers.php
@@ -11,9 +11,13 @@
  */
 function rename_chromedriver_binary(string $binary, string $operatingSystem): string
 {
-    return mb_strpos($binary, DIRECTORY_SEPARATOR) > 0
-        ? array_reverse(explode(DIRECTORY_SEPARATOR, str_replace('chromedriver', 'chromedriver-'.$operatingSystem, $binary), 2))[0]
-        : str_replace('chromedriver', 'chromedriver-'.$operatingSystem, $binary);
+    $binary = str_replace(DIRECTORY_SEPARATOR, '/', $binary);
+
+    if (mb_strpos($binary, '/') > 0) {
+        return array_reverse(explode('/', str_replace('chromedriver', 'chromedriver-'.$operatingSystem, $binary), 2))[0];
+    }
+
+    return str_replace('chromedriver', 'chromedriver-'.$operatingSystem, $binary);
 }
 
 /**

diff --git a/tests/HelpersTest.php b/tests/HelpersTest.php
@@ -22,9 +22,10 @@ public static function chromedriverBinaryFilenameDataProvider()
         yield ['mac-arm', 'chromedriver', 'chromedriver-mac-arm'];
         yield ['win', 'chromedriver.exe', 'chromedriver-win.exe'];
 
-        yield ['linux', 'chromedriver-115'.DIRECTORY_SEPARATOR.'chromedriver', 'chromedriver-linux'];
-        yield ['mac-intel', 'chromedriver-115'.DIRECTORY_SEPARATOR.'chromedriver', 'chromedriver-mac-intel'];
-        yield ['mac-arm', 'chromedriver-115'.DIRECTORY_SEPARATOR.'chromedriver', 'chromedriver-mac-arm'];
+        yield ['linux', 'chromedriver-115/chromedriver', 'chromedriver-linux'];
+        yield ['mac-intel', 'chromedriver-115/chromedriver', 'chromedriver-mac-intel'];
+        yield ['mac-arm', 'chromedriver-115/chromedriver', 'chromedriver-mac-arm'];
+        yield ['win', 'chromedriver-115/chromedriver.exe', 'chromedriver-win.exe'];
         yield ['win', 'chromedriver-115'.DIRECTORY_SEPARATOR.'chromedriver.exe', 'chromedriver-win.exe'];
     }
 }