Merge branch 'develop' into 8.x

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Aug 23, 2023 · c5d1b21 · c5d1b21
2 parents 990abe4 + f2f581e
commit c5d1b21
Show file tree

Hide file tree

Showing 9 changed files with 143 additions and 22 deletions.
diff --git a/CHANGELOG-7.x.md b/CHANGELOG-7.x.md
@@ -2,6 +2,27 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/testbench-dusk`.
 
+## 7.30.1
+
+Released: 2023-08-23
+
+### Fixes
+
+* Fixes usage with `Orchestra\Testbench\Concerns\WithWorkbench`.
+
+## 7.30.0
+
+Released: 2023-08-22
+
+### Added
+
+* Added `Orchestra\Testbench\Dusk\Concerns\InteractsWithWebDriverOptions`.
+
+### Changes
+
+* Update minimum support for Testbench v7.29.1+. ([v7.29.0...v7.29.1](https://github.com/orchestral/testbench/compare/v7.29.0...v7.29.1))
+* Utilise `setUpTheTestEnvironmentTraitToBeIgnored()` method.
+
 ## 7.29.0
 
 Released: 2023-08-15

diff --git a/CHANGELOG-8.x.md b/CHANGELOG-8.x.md
@@ -2,6 +2,27 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/testbench-dusk`.
 
+## 8.9.2
+
+Released: 2023-08-23
+
+### Fixes
+
+* Fixes usage with `Orchestra\Testbench\Concerns\WithWorkbench`.
+
+## 8.9.1
+
+Released: 2023-08-22
+
+### Added
+
+* Added `Orchestra\Testbench\Dusk\Concerns\InteractsWithWebDriverOptions`.
+
+### Changes
+
+* Update minimum support for Testbench v8.9.1+. ([v8.9.0...v8.9.1](https://github.com/orchestral/testbench/compare/v8.9.0...v8.9.1))
+* Utilise `setUpTheTestEnvironmentTraitToBeIgnored()` method.
+
 ## 8.9.0
 
 Released: 2023-08-19

diff --git a/composer.json b/composer.json
@@ -29,7 +29,8 @@
         "psr-4": {
             "Orchestra\\Testbench\\Dusk\\Tests\\": "tests/",
             "Workbench\\App\\": "workbench/app/",
-            "Workbench\\Database\\": "workbench/database/"
+            "Workbench\\Database\\Factories\\": "workbench/database/factories/",
+            "Workbench\\Database\\Seeders\\": "workbench/database/seeders/"
         }
     },
     "bin": [
@@ -50,26 +51,35 @@
         "phpstan/phpstan": "^1.10.7",
         "phpunit/phpunit": "^10.1"
     },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "8.0-dev"
+        }
+    },
     "scripts": {
-        "post-autoload-dump": "@composer run prepare",
-        "prepare": [
-            "@php testbench-dusk package:discover --ansi",
-            "@php vendor/bin/dusk-updater detect --auto-update",
-            "@php testbench-dusk package:drop-sqlite-db",
-            "@php testbench-dusk package:create-sqlite-db"
+        "post-autoload-dump": [
+            "@clear",
+            "@prepare",
+            "@dusk:install-chromedriver"
         ],
-        "clear": "@php testbench-dusk package:purge-skeleton --ansi",
-        "build": [
-            "@php vendor/bin/dusk-updater detect --auto-update",
-            "@php testbench-dusk workbench:build --ansi"
+        "clear": "@php vendor/bin/testbench package:purge-skeleton --ansi",
+        "prepare": "@php vendor/bin/testbench package:discover --ansi",
+        "build": "@php vendor/bin/testbench workbench:build --ansi",
+        "dusk:install-chromedriver": "@php vendor/bin/dusk-updater detect --auto-update --ansi",
+        "serve": [
+            "@build",
+            "@php vendor/bin/testbench serve"
         ],
         "lint": [
-            "@php vendor/bin/phpstan analyse",
-            "@php vendor/bin/pint"
+            "@php vendor/bin/pint",
+            "@php vendor/bin/phpstan analyse"
         ],
-        "test": [
-            "@composer run build",
-            "@php vendor/bin/phpunit -c ./ --color"
+        "test": "@php vendor/bin/phpunit -c ./ --color",
+        "ci": [
+            "@prepare",
+            "@dusk:install-chromedriver",
+            "@lint",
+            "@test"
         ]
     },
     "config": {

diff --git a/laravel/config/mail.php b/laravel/config/mail.php
@@ -59,6 +59,7 @@
 
         'postmark' => [
             'transport' => 'postmark',
+            // 'message_stream_id' => null,
             // 'client' => [
             //     'timeout' => 5,
             // ],

diff --git a/src/Concerns/CanServeSite.php b/src/Concerns/CanServeSite.php
@@ -8,6 +8,8 @@
 use Orchestra\Testbench\Dusk\DuskServer;
 use Orchestra\Testbench\Dusk\Options;
 
+use function Orchestra\Testbench\after_resolving;
+
 trait CanServeSite
 {
     /**
@@ -89,7 +91,13 @@ public function beforeServingApplication(Closure $closure): void
         /** @var \Illuminate\Foundation\Application $app */
         $app = $this->app;
 
-        $closure($app, $app['config']);
+        after_resolving($app, 'config', static function ($config, $app) use ($closure) {
+            /**
+             * @var \Illuminate\Foundation\Application $app
+             * @var \Illuminate\Contracts\Config\Repository $config
+             */
+            $closure($app, $config);
+        });
 
         static::$server?->stash([
             'class' => static::class,
@@ -147,7 +155,10 @@ public function getFreshApplicationToServe(DuskServer $server)
 
         if ($serializedClosure) {
             $closure = unserialize($serializedClosure)->getClosure();
-            $closure($app, $app['config']);
+
+            after_resolving($app, 'config', static function ($config, $app) use ($closure) {
+                $closure($app, $config);
+            });
         }
 
         return $app;

diff --git a/src/Concerns/InteractsWithWebDriverOptions.php b/src/Concerns/InteractsWithWebDriverOptions.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Orchestra\Testbench\Dusk\Concerns;
+
+trait InteractsWithWebDriverOptions
+{
+    /**
+     * Prepare the testing environment web driver options.
+     *
+     * @return void
+     */
+    public static function defineWebDriverOptions()
+    {
+        //
+    }
+}
diff --git a/src/DuskServer.php b/src/DuskServer.php
@@ -7,6 +7,8 @@
 use Symfony\Component\Process\PhpExecutableFinder;
 use Symfony\Component\Process\Process;
 
+use function Orchestra\Testbench\package_path;
+
 class DuskServer
 {
     /**
@@ -150,10 +152,8 @@ protected function startServer(): void
 
         /** @var array<string, mixed> $environmentVariables */
         $environmentVariables = Collection::make($_ENV)
-            ->when(\defined('TESTBENCH_WORKING_PATH'), function ($collect) {
-                /** @phpstan-ignore-next-line */
-                return $collect->put('TESTBENCH_WORKING_PATH', TESTBENCH_WORKING_PATH);
-            })->all();
+            ->put('TESTBENCH_WORKING_PATH', package_path())
+            ->all();
 
         $this->process = Process::fromShellCommandline(
             $this->prepareCommand(), null, $environmentVariables

diff --git a/src/TestCase.php b/src/TestCase.php
@@ -16,6 +16,7 @@
 abstract class TestCase extends Testbench
 {
     use Concerns\CanServeSite,
+        Concerns\InteractsWithWebDriverOptions,
         Concerns\ProvidesBrowser;
 
     /**
@@ -102,6 +103,7 @@ protected function setUpTheTestEnvironmentTraitToBeIgnored(string $use): bool
     {
         return Str::startsWith($use, [
             Concerns\CanServeSite::class,
+            Concerns\InteractsWithWebDriverOptions::class,
             Concerns\ProvidesBrowser::class,
             \Laravel\Dusk\Concerns\ProvidesBrowser::class,
             \Laravel\Dusk\Chrome\SupportsChrome::class,
@@ -189,6 +191,8 @@ protected function resolveApplication()
      */
     protected function driver(): RemoteWebDriver
     {
+        static::defineWebDriverOptions();
+
         if (DuskOptions::shouldUsesWithoutUI()) {
             DuskOptions::withoutUI();
         } elseif ($this->hasHeadlessDisabled()) {

diff --git a/tests/Browser/RouteTest.php b/tests/Browser/RouteTest.php
@@ -2,9 +2,12 @@
 
 namespace Orchestra\Testbench\Dusk\Tests\Browser;
 
+use Illuminate\Support\Env;
 use Laravel\Dusk\Browser;
 use Orchestra\Testbench\Dusk\TestCase;
 
+use function Orchestra\Testbench\package_path;
+
 class RouteTest extends TestCase
 {
     /**
@@ -26,6 +29,10 @@ protected function defineRoutes($router)
         $router->get('environment', ['uses' => function () {
             return config('app.env');
         }]);
+
+        $router->get('testbench-environment-value', ['uses' => function () {
+            return Env::get('TESTBENCH_WORKING_PATH');
+        }]);
     }
 
     /** @test */
@@ -74,4 +81,34 @@ public function can_tweak_the_application_within_a_test()
 
         $this->removeApplicationTweaks();
     }
+
+    /** @test */
+    public function can_use_multiple_browsers_can_persist_testbench_working_path_environment_variables()
+    {
+        $this->browse(function (Browser $browser, Browser $browserTwo) {
+            $browser->visit('testbench-environment-value')
+                ->assertSee(package_path())
+                ->visit('testbench-environment-value')
+                ->assertSee(package_path());
+
+            $browserTwo->visit('testbench-environment-value')
+                ->assertSee(package_path())
+                ->visit('testbench-environment-value')
+                ->assertSee(package_path());
+        });
+
+        static::reloadServing();
+
+        $this->browse(function (Browser $browser, Browser $browserTwo) {
+            $browser->visit('testbench-environment-value')
+                ->assertSee(package_path())
+                ->visit('testbench-environment-value')
+                ->assertSee(package_path());
+
+            $browserTwo->visit('testbench-environment-value')
+                ->assertSee(package_path())
+                ->visit('testbench-environment-value')
+                ->assertSee(package_path());
+        });
+    }
 }