Merge branch '1.x' into 2.x

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Jul 21, 2023 · 0354868 · 0354868
2 parents 75150f1 + e015d04
commit 0354868
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -19,6 +19,14 @@
     "autoload": {
         "psr-4": {
             "Orchestra\\DuskUpdater\\": "src/"
+        },
+        "files": [
+            "src/helpers.php"
+        ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Orchestra\\DuskUpdater\\Tests\\": "tests/"
         }
     },
     "require": {

diff --git a/src/DetectCommand.php b/src/DetectCommand.php
@@ -61,7 +61,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             }
 
             if ($autoUpdate || $io->confirm('Do you want to update ChromeDriver?')) {
-                $this->updateChromeDriver($output, $driverDirectory, $chromeVersions['major']);
+                $this->updateChromeDriver($input, $output, $driverDirectory, $chromeVersions['major']);
             }
         }
 
@@ -71,18 +71,21 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     /**
      * Update ChromeDriver.
      */
-    protected function updateChromeDriver(OutputInterface $output, string $directory, int $version): int
+    protected function updateChromeDriver(InputInterface $input, OutputInterface $output, string $directory, int $version): int
     {
         /** @var \Symfony\Component\Console\Application $console */
         $console = $this->getApplication();
 
         $command = $console->find('update');
 
-        $arguments = [
+        $arguments = array_merge([
             'command' => 'update',
             'version' => $version,
             '--install-dir' => $directory,
-        ];
+        ], array_filter([
+            '--proxy' => $input->getOption('proxy'),
+            '--ssl-no-verify' => $input->getOption('ssl-no-verify'),
+        ]));
 
         return $command->run(new ArrayInput($arguments), $output);
     }

diff --git a/src/UpdateCommand.php b/src/UpdateCommand.php
@@ -134,9 +134,7 @@ protected function rename(string $binary, string $os): void
             throw new RuntimeException("Unable to rename {$binary} without --install-dir");
         }
 
-        $newName = strpos($binary, DIRECTORY_SEPARATOR) >= 0
-            ? array_reverse(explode(DIRECTORY_SEPARATOR, str_replace('chromedriver', 'chromedriver-'.$os, $binary), 2))[0]
-            : str_replace('chromedriver', 'chromedriver-'.$os, $binary);
+        $newName = chromedriver_binary_filename($binary, $os);
 
         rename($this->directory.$binary, $this->directory.$newName);
 

diff --git a/src/helpers.php b/src/helpers.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Orchestra\DuskUpdater;
+
+function chromedriver_binary_filename(string $binary, string $os): string
+{
+    return strpos($binary, DIRECTORY_SEPARATOR) > 0
+        ? array_reverse(explode(DIRECTORY_SEPARATOR, str_replace('chromedriver', 'chromedriver-'.$os, $binary), 2))[0]
+        : str_replace('chromedriver', 'chromedriver-'.$os, $binary);
+}
diff --git a/tests/HelpersTest.php b/tests/HelpersTest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Orchestra\DuskUpdater\Tests;
+
+use function Orchestra\DuskUpdater\chromedriver_binary_filename;
+use PHPUnit\Framework\TestCase;
+
+class HelpersTest extends TestCase
+{
+    /**
+     * @dataProvider binaryFileDataProvider
+     */
+    public function test_it_can_resolve_correct_filename($os, $given, $expected)
+    {
+        $this->assertSame(chromedriver_binary_filename($given, $os), $expected);
+    }
+
+    public static function binaryFileDataProvider()
+    {
+        yield ['linux', 'chromedriver', 'chromedriver-linux'];
+        yield ['mac-intel', 'chromedriver', 'chromedriver-mac-intel'];
+        yield ['mac-arm', 'chromedriver', 'chromedriver-mac-arm'];
+        yield ['win32', 'chromedriver.exe', 'chromedriver-win32.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 ['win32', 'chromedriver-115'.DIRECTORY_SEPARATOR.'chromedriver.exe', 'chromedriver-win32.exe'];
+    }
+}