Merge branch '1.x' into 8.x

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Nov 23, 2023 · f3b0f5e · f3b0f5e
2 parents e0c670c + 011ef76
commit f3b0f5e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
         "laravel/framework": "^10.26",
         "laravel/tinker": "^2.8.2",
         "orchestra/canvas": "^8.11",
-        "orchestra/testbench-core": "^8.14",
+        "orchestra/testbench-core": "^8.15",
         "spatie/laravel-ray": "^1.32.4",
         "symfony/yaml": "^6.2"
     },

diff --git a/tests/Http/Controllers/WorkbenchControllerTest.php b/tests/Http/Controllers/WorkbenchControllerTest.php
@@ -2,15 +2,20 @@
 
 namespace Orchestra\Workbench\Tests\Http\Controllers;
 
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Orchestra\Testbench\Attributes\WithMigration;
 use Orchestra\Testbench\Contracts\Config as ConfigContract;
 use Orchestra\Testbench\Factories\UserFactory;
 use Orchestra\Testbench\Foundation\Config;
 use Orchestra\Testbench\TestCase;
 use Orchestra\Workbench\WorkbenchServiceProvider;
 use PHPUnit\Framework\Attributes\Test;
 
+#[WithMigration]
 class WorkbenchControllerTest extends TestCase
 {
+    use RefreshDatabase;
+
     /**
      * Define environment setup.
      *
@@ -36,16 +41,6 @@ protected function defineRoutes($router)
         $router->get('/workbench', ['uses' => fn () => 'hello world']);
     }
 
-    /**
-     * Define database migrations.
-     *
-     * @return void
-     */
-    protected function defineDatabaseMigrations()
-    {
-        $this->loadLaravelMigrations(['--database' => 'testing']);
-    }
-
     /**
      * Get package providers.
      *

diff --git a/tests/Http/Middleware/CatchDefaultRouteTest.php b/tests/Http/Middleware/CatchDefaultRouteTest.php
@@ -2,15 +2,20 @@
 
 namespace Orchestra\Workbench\Tests\Http\Middleware;
 
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Orchestra\Testbench\Attributes\WithMigration;
 use Orchestra\Testbench\Contracts\Config as ConfigContract;
 use Orchestra\Testbench\Factories\UserFactory;
 use Orchestra\Testbench\Foundation\Config;
 use Orchestra\Testbench\TestCase;
 use Orchestra\Workbench\WorkbenchServiceProvider;
 use PHPUnit\Framework\Attributes\Test;
 
+#[WithMigration]
 class CatchDefaultRouteTest extends TestCase
 {
+    use RefreshDatabase;
+
     /**
      * Define environment setup.
      *
@@ -38,16 +43,6 @@ protected function defineRoutes($router)
         }]);
     }
 
-    /**
-     * Define database migrations.
-     *
-     * @return void
-     */
-    protected function defineDatabaseMigrations()
-    {
-        $this->loadLaravelMigrations(['--database' => 'testing']);
-    }
-
     /**
      * Get package providers.
      *