Merge branch '7.x' into develop

Signed-off-by: Mior Muhammad Zaki <[email protected]>

composer.json

@@ -43,7 +43,7 @@
         "laravel/dusk": "^7.11",
         "laravel/serializable-closure": "^1.0",
         "orchestra/dusk-updater": "^2.3",
-        "orchestra/testbench": ">=8.11.0 <8.12.0",
+        "orchestra/testbench": "^8.12",
         "php-webdriver/webdriver": "^1.9"
     },
     "require-dev": {
@@ -74,7 +74,11 @@
             "@php vendor/bin/pint",
             "@php vendor/bin/phpstan analyse"
         ],
-        "test": "@php vendor/bin/phpunit -c ./ --color",
+        "test": [
+            "@php drop-sqlite-db",
+            "@php create-sqlite-db",
+            "@php vendor/bin/phpunit -c ./ --color"
+        ],
         "ci": [
             "@prepare",
             "@dusk:install-chromedriver",

src/Concerns/CanServeSite.php

@@ -107,6 +107,10 @@ class_exists(SerializableClosureFactory::class)
                     : new SerializableClosure($closure)
             ),
         ]);
+
+        $this->beforeApplicationDestroyed(function () {
+            $this->removeApplicationTweaks();
+        });
     }
 
     /**
@@ -183,6 +187,9 @@ public function getServer()
      */
     protected function setUpDuskServer(): void
     {
+        static::cachedUsesForTestCase();
+        static::cachedConfigurationForWorkbench();
+
         if (! $this->app) {
             $this->refreshApplication();
         }

src/TestCase.php

@@ -118,9 +118,13 @@ protected function setUpTheTestEnvironmentTraitToBeIgnored(string $use): bool
      */
     protected function getApplicationProviders($app)
     {
-        return array_merge(parent::getApplicationProviders($app), [
-            DuskServiceProvider::class,
-        ]);
+        $providers = parent::getApplicationProviders($app);
+
+        if (! \in_array(DuskServiceProvider::class, $providers)) {
+            array_push($providers, DuskServiceProvider::class);
+        }
+
+        return $providers;
     }
 
     /**

testbench.yaml

@@ -1,5 +1,13 @@
+providers:
+  - Workbench\App\Providers\RouteServiceProvider
+
+migrations:
+  - workbench/database/migrations
+
 workbench:
   start: '/'
+  welcome: true
   build:
     - drop-sqlite-db
     - create-sqlite-db
+    - migrate:refresh

tests/Browser/AuthTest.php

@@ -2,21 +2,15 @@
 
 namespace Orchestra\Testbench\Dusk\Tests\Browser;
 
+use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Laravel\Dusk\Browser;
+use Orchestra\Testbench\Concerns\WithLaravelMigrations;
 use Orchestra\Testbench\Dusk\TestCase;
 use Orchestra\Testbench\Factories\UserFactory;
 
 class AuthTest extends TestCase
 {
-    /**
-     * Define database migrations.
-     *
-     * @return void
-     */
-    protected function defineDatabaseMigrations()
-    {
-        $this->loadLaravelMigrations(config('database.default'));
-    }
+    use DatabaseMigrations, WithLaravelMigrations;
 
     /** @test */
     public function can_authenticate_user()

tests/Browser/DatabaseMigrationsTest.php

@@ -2,13 +2,15 @@
 
 namespace Orchestra\Testbench\Dusk\Tests\Browser;
 
+use Illuminate\Foundation\Testing\DatabaseMigrations;
 use Illuminate\Support\Facades\Schema;
+use Orchestra\Testbench\Concerns\WithWorkbench;
 use Orchestra\Testbench\Dusk\TestCase;
 
-use function Orchestra\Testbench\workbench_path;
-
 class DatabaseMigrationsTest extends TestCase
 {
+    use DatabaseMigrations, WithWorkbench;
+
     protected function setUp(): void
     {
         $this->beforeApplicationDestroyed(function () {
@@ -18,16 +20,6 @@ protected function setUp(): void
         parent::setUp();
     }
 
-    /**
-     * Define database migrations.
-     *
-     * @return void
-     */
-    protected function defineDatabaseMigrations()
-    {
-        $this->loadMigrationsFrom(workbench_path('database/migrations'));
-    }
-
     /** @test */
     public function it_can_migrate_and_reset_the_database()
     {

tests/Browser/RouteTest.php

@@ -58,17 +58,19 @@ public function can_use_multiple_browsers()
     {
         $this->browse(function (Browser $browser, Browser $browserTwo) {
             $browser->visit('hello')
-                ->assertSee('hello world');
+                ->assertSee('hello world')
+                ->blank();
 
             $browserTwo->visit('hello')
-                ->assertSee('hello world');
+                ->assertSee('hello world')
+                ->blank();
         });
     }
 
     /** @test */
     public function can_tweak_the_application_within_a_test()
     {
-        $this->tweakApplication(function ($app, $config) {
+        $this->beforeServingApplication(function ($app, $config) {
             $config->set('new_config_item', 'Fantastic!');
         });
 
@@ -78,8 +80,12 @@ public function can_tweak_the_application_within_a_test()
             $browser->visit('config')
                 ->assertSee('Fantastic!');
         });
+    }
 
-        $this->removeApplicationTweaks();
+    /** @test */
+    public function application_tweak_doesnt_persist_between_test()
+    {
+        $this->assertNull($this->app['config']->get('new_config_item'));
     }
 
     /** @test */

tests/Browser/WorkbenchTest.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace Orchestra\Testbench\Dusk\Tests\Browser;
+
+use Illuminate\Contracts\Http\Kernel as HttpKernel;
+use Orchestra\Testbench\Concerns\WithWorkbench;
+use Orchestra\Testbench\Dusk\TestCase;
+use Orchestra\Workbench\Http\Middleware\CatchDefaultRoute;
+
+class WorkbenchTest extends TestCase
+{
+    use WithWorkbench;
+
+    /** @test */
+    public function it_can_browse_the_default_page()
+    {
+        $this->beforeServingApplication(function ($app) {
+            $app->make(HttpKernel::class)->pushMiddleware(CatchDefaultRoute::class);
+        });
+
+        $this->browse(function ($browser) {
+            $browser->visit('/')
+                ->assertSee('Laravel');
+        });
+    }
+
+    /** @test */
+    public function it_can_browse_the_welcome_page()
+    {
+        $this->browse(function ($browser) {
+            $browser->visit('/welcome')
+                ->assertSee('Laravel');
+        });
+    }
+}

workbench/app/Providers/RouteServiceProvider.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Workbench\App\Providers;
+
+use Illuminate\Support\Facades\Route;
+use Illuminate\Support\ServiceProvider;
+
+class RouteServiceProvider extends ServiceProvider
+{
+    /**
+     * Register services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        //
+    }
+
+    /**
+     * Bootstrap services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        Route::view('welcome', 'welcome');
+    }
+}