[6.x] Add support for Mac ARM64 architecture

.github/workflows/tests.yml

@@ -9,20 +9,28 @@ on:
 jobs:
   tests:
     runs-on: ubuntu-latest
-    
+
     strategy:
       fail-fast: true
       matrix:
         php: [7.2, 7.3, 7.4, 8.0]
         laravel: [^6.0, ^7.0, ^8.0]
-        phpunit: [^7.5, ^8.4, ^9.0]
+        phpunit: [^8.4, ^9.0]
+        include:
+          - php: 7.2
+            laravel: ^6.0
+            phpunit: ^7.5
+          - php: 7.3
+            laravel: ^6.0
+            phpunit: ^7.5
+          - php: 7.4
+            laravel: ^6.0
+            phpunit: ^7.5
         exclude:
           - php: 7.2
             phpunit: ^9.0
           - php: 7.2
             laravel: ^8.0
-          - php: 8.0
-            phpunit: ^7.5
           - php: 8.0
             phpunit: ^8.4
 

bin/.gitignore

@@ -0,0 +1 @@
+chromedriver-*

composer.json

@@ -24,7 +24,8 @@
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "phpunit/phpunit": "^7.5.15|^8.4|^9.0"
+        "phpunit/phpunit": "^7.5.15|^8.4|^9.0",
+        "orchestra/testbench": "^4.16|^5.17.1|^6.12.1"
     },
     "suggest": {
         "ext-pcntl": "Used to gracefully terminate Dusk when tests are running."

src/Chrome/ChromeProcess.php

@@ -44,13 +44,15 @@ public function toProcess(array $arguments = [])
             return $this->process($arguments);
         }
 
-        if ($this->onWindows()) {
-            $this->driver = realpath(__DIR__.'/../../bin/chromedriver-win.exe');
-        } elseif ($this->onMac()) {
-            $this->driver = realpath(__DIR__.'/../../bin/chromedriver-mac');
-        } else {
-            $this->driver = realpath(__DIR__.'/../../bin/chromedriver-linux');
-        }
+        $filenames = [
+            'linux' => 'chromedriver-linux',
+            'mac' => 'chromedriver-mac',
+            'mac-intel' => 'chromedriver-mac-intel',
+            'mac-arm' => 'chromedriver-mac-arm',
+            'win' => 'chromedriver-win.exe',
+        ];
+
+        $this->driver = realpath(__DIR__.'/../../bin').DIRECTORY_SEPARATOR.$filenames[$this->operatingSystemId()];
 
         return $this->process($arguments);
     }
@@ -64,7 +66,7 @@ public function toProcess(array $arguments = [])
     protected function process(array $arguments = [])
     {
         return new Process(
-            array_merge([realpath($this->driver)], $arguments), null, $this->chromeEnvironment()
+            array_merge([$this->driver], $arguments), null, $this->chromeEnvironment()
         );
     }
 
@@ -101,4 +103,14 @@ protected function onMac()
     {
         return OperatingSystem::onMac();
     }
+
+    /**
+     * Determine OS ID.
+     *
+     * @return string
+     */
+    protected function operatingSystemId()
+    {
+        return OperatingSystem::id();
+    }
 }

src/Console/ChromeDriverCommand.php

@@ -59,6 +59,8 @@ class ChromeDriverCommand extends Command
     protected $slugs = [
         'linux' => 'linux64',
         'mac' => 'mac64',
+        'mac-intel' => 'mac64',
+        'mac-arm' => 'mac64_m1',
         'win' => 'win32',
     ];
 
@@ -119,6 +121,12 @@ class ChromeDriverCommand extends Command
         'mac' => [
             '/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome --version',
         ],
+        'mac-intel' => [
+            '/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome --version',
+        ],
+        'mac-arm' => [
+            '/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome --version',
+        ],
         'win' => [
             'reg query "HKEY_CURRENT_USER\Software\Google\Chrome\BLBeacon" /v version',
         ],

src/OperatingSystem.php

@@ -13,7 +13,13 @@ class OperatingSystem
      */
     public static function id()
     {
-        return static::onWindows() ? 'win' : (static::onMac() ? 'mac' : 'linux');
+        if (static::onWindows()) {
+            return 'win';
+        } elseif (static::onMac()) {
+            return static::macArchitectureId();
+        }
+
+        return 'linux';
     }
 
     /**
@@ -35,4 +41,21 @@ public static function onMac()
     {
         return PHP_OS === 'Darwin';
     }
+
+    /**
+     * Mac platform architecture.
+     *
+     * @return string
+     */
+    public static function macArchitectureId()
+    {
+        switch (php_uname('m')) {
+            case 'arm64':
+                return 'mac-arm';
+            case 'x86_64':
+                return 'mac-intel';
+            default:
+                return 'mac';
+        }
+    }
 }

tests/ChromeProcessTest.php

@@ -35,6 +35,22 @@ public function test_build_process_for_darwin()
         $this->assertStringContainsString('chromedriver-mac', $process->getCommandLine());
     }
 
+    public function test_build_process_for_darwin_intel()
+    {
+        $process = (new ChromeProcessDarwinIntel)->toProcess();
+
+        $this->assertInstanceOf(Process::class, $process);
+        $this->assertStringContainsString('chromedriver-mac-intel', $process->getCommandLine());
+    }
+
+    public function test_build_process_for_darwin_arm()
+    {
+        $process = (new ChromeProcessDarwinArm)->toProcess();
+
+        $this->assertInstanceOf(Process::class, $process);
+        $this->assertStringContainsString('chromedriver-mac-arm', $process->getCommandLine());
+    }
+
     public function test_build_process_for_linux()
     {
         $process = (new ChromeProcessLinux)->toProcess();
@@ -53,10 +69,20 @@ public function test_invalid_path()
 
 class ChromeProcessWindows extends ChromeProcess
 {
+    protected function onMac()
+    {
+        return false;
+    }
+
     protected function onWindows()
     {
         return true;
     }
+
+    protected function operatingSystemId()
+    {
+        return 'win';
+    }
 }
 
 class ChromeProcessDarwin extends ChromeProcess
@@ -70,6 +96,47 @@ protected function onWindows()
     {
         return false;
     }
+
+    protected function operatingSystemId()
+    {
+        return 'mac';
+    }
+}
+
+class ChromeProcessDarwinIntel extends ChromeProcess
+{
+    protected function onMac()
+    {
+        return true;
+    }
+
+    protected function onWindows()
+    {
+        return false;
+    }
+
+    protected function operatingSystemId()
+    {
+        return 'mac-intel';
+    }
+}
+
+class ChromeProcessDarwinArm extends ChromeProcess
+{
+    protected function onMac()
+    {
+        return true;
+    }
+
+    protected function onWindows()
+    {
+        return false;
+    }
+
+    protected function operatingSystemId()
+    {
+        return 'mac-arm';
+    }
 }
 
 class ChromeProcessLinux extends ChromeProcess
@@ -83,4 +150,9 @@ protected function onWindows()
     {
         return false;
     }
+
+    protected function operatingSystemId()
+    {
+        return 'linux';
+    }
 }

tests/Concerns/SwapsUrlGenerator.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Laravel\Dusk\Tests\Concerns;
+
+use Illuminate\Container\Container;
+use Illuminate\Http\Request;
+use Illuminate\Routing\RouteCollection;
+use Illuminate\Routing\UrlGenerator;
+
+trait SwapsUrlGenerator
+{
+    protected function swapUrlGenerator()
+    {
+        Container::getInstance()->bind('url', function () {
+            return new class(new RouteCollection(), new Request()) extends UrlGenerator {
+                public function route($name, $parameters = [], $absolute = true)
+                {
+                    $route = '/'.$name.'/'.implode('/', $parameters);
+
+                    if ($absolute) {
+                        $route = 'http://www.google.com'.$route;
+                    }
+
+                    return $route;
+                }
+            };
+        });
+    }
+}

tests/ElementResolverTest.php

@@ -11,6 +11,11 @@
 
 class ElementResolverTest extends TestCase
 {
+    protected function tearDown(): void
+    {
+        m::close();
+    }
+
     /**
      * @throws \Exception
      */
@@ -65,10 +70,11 @@ public function test_resolve_for_radio_selection_falls_back_to_selectors_without
     public function test_resolve_for_radio_selection_throws_exception_without_id_and_without_value()
     {
         $driver = m::mock(stdClass::class);
-        $driver->shouldReceive('findElement')->once()->andReturn('foo');
         $resolver = new ElementResolver($driver);
+
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionMessage('No value was provided for radio button [foo].');
+
         $resolver->resolveForRadioSelection('foo');
     }
 

tests/MakesAssertionsTest.php

@@ -11,6 +11,11 @@
 
 class MakesAssertionsTest extends TestCase
 {
+    protected function tearDown(): void
+    {
+        m::close();
+    }
+
     public function test_assert_title()
     {
         $driver = m::mock(stdClass::class);
@@ -875,7 +880,7 @@ public function test_assert_vue()
                     '? JSON.parse(JSON.stringify(el.__vueParentComponent.ctx)).foo'.
                     ': el.__vue__.foo'
             )
-            ->once()
+            ->twice()
             ->andReturn('foo');
 
         $resolver = m::mock(stdClass::class);
@@ -928,7 +933,7 @@ public function test_assert_vue_is_not()
                     '? JSON.parse(JSON.stringify(el.__vueParentComponent.ctx)).foo'.
                     ': el.__vue__.foo'
             )
-            ->once()
+            ->twice()
             ->andReturn('foo');
 
         $resolver = m::mock(stdClass::class);