[3.x] Test Improvements (#465)

* Test Improvements

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

* wip

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

* wip

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

* Apply fixes from StyleCI

* wip

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

* wip

---------

Signed-off-by: Mior Muhammad Zaki <[email protected]>
Co-authored-by: StyleCI Bot <[email protected]>

Author: crynobone

.gitattributes

@@ -9,6 +9,7 @@
 /.github export-ignore
 /art export-ignore
 /tests export-ignore
+/workbench export-ignore
 .editorconfig export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore

composer.json

@@ -34,7 +34,9 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Laravel\\Sanctum\\Tests\\": "tests/"
+            "Laravel\\Sanctum\\Tests\\": "tests/",
+            "Workbench\\App\\": "workbench/app/",
+            "Workbench\\Database\\Factories\\": "workbench/database/factories/"
         }
     },
     "extra": {

tests/Feature/ActingAsTest.php

@@ -2,18 +2,16 @@
 
 namespace Laravel\Sanctum\Tests\Feature;
 
-use Illuminate\Foundation\Auth\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Route;
-use Laravel\Sanctum\Contracts\HasApiTokens as HasApiTokensContract;
-use Laravel\Sanctum\HasApiTokens;
 use Laravel\Sanctum\Http\Middleware\CheckAbilities;
 use Laravel\Sanctum\Http\Middleware\CheckForAnyAbility;
 use Laravel\Sanctum\Http\Middleware\CheckForAnyScope;
 use Laravel\Sanctum\Http\Middleware\CheckScopes;
 use Laravel\Sanctum\Sanctum;
 use Orchestra\Testbench\Concerns\WithWorkbench;
 use Orchestra\Testbench\TestCase;
+use Workbench\App\Models\User;
 
 class ActingAsTest extends TestCase
 {
@@ -32,7 +30,7 @@ public function testActingAsWhenTheRouteIsProtectedByAuthMiddlware()
             return 'bar';
         })->middleware('auth:sanctum');
 
-        Sanctum::actingAs($user = new SanctumUser);
+        Sanctum::actingAs($user = new User);
         $user->id = 1;
 
         $response = $this->get('/foo');
@@ -49,7 +47,7 @@ public function testActingAsWhenTheRouteIsProtectedByCheckScopesMiddleware()
             return 'bar';
         })->middleware(CheckScopes::class.':admin,footest');
 
-        Sanctum::actingAs(new SanctumUser(), ['admin', 'footest']);
+        Sanctum::actingAs(new User(), ['admin', 'footest']);
 
         $response = $this->get('/foo');
         $response->assertSuccessful();
@@ -64,7 +62,7 @@ public function testActingAsWhenTheRouteIsProtectedByCheckForAnyScopeMiddleware(
             return 'bar';
         })->middleware(CheckForAnyScope::class.':admin,footest');
 
-        Sanctum::actingAs(new SanctumUser(), ['footest']);
+        Sanctum::actingAs(new User(), ['footest']);
 
         $response = $this->get('/foo');
         $response->assertSuccessful();
@@ -79,7 +77,7 @@ public function testActingAsWhenTheRouteIsProtectedByCheckAbilitiesMiddleware()
             return 'bar';
         })->middleware(CheckAbilities::class.':admin,footest');
 
-        Sanctum::actingAs(new SanctumUser(), ['admin', 'footest']);
+        Sanctum::actingAs(new User(), ['admin', 'footest']);
 
         $response = $this->get('/foo');
         $response->assertSuccessful();
@@ -94,7 +92,7 @@ public function testActingAsWhenTheRouteIsProtectedByCheckForAnyAbilityMiddlewar
             return 'bar';
         })->middleware(CheckForAnyAbility::class.':admin,footest');
 
-        Sanctum::actingAs(new SanctumUser(), ['footest']);
+        Sanctum::actingAs(new User(), ['footest']);
 
         $response = $this->get('/foo');
         $response->assertSuccessful();
@@ -115,7 +113,7 @@ public function testActingAsWhenTheRouteIsProtectedUsingAbilities()
             return response(403);
         })->middleware('auth:sanctum');
 
-        $user = new SanctumUser;
+        $user = new User;
         $user->id = 1;
 
         Sanctum::actingAs($user, ['baz']);
@@ -140,7 +138,7 @@ public function testActingAsWhenKeyHasAnyAbility()
             return response(403);
         })->middleware('auth:sanctum');
 
-        $user = new SanctumUser;
+        $user = new User;
         $user->id = 1;
 
         Sanctum::actingAs($user, ['*']);
@@ -151,8 +149,3 @@ public function testActingAsWhenKeyHasAnyAbility()
         $response->assertSee('bar');
     }
 }
-
-class SanctumUser extends User implements HasApiTokensContract
-{
-    use HasApiTokens;
-}

tests/Feature/DefaultConfigContainsAppUrlTest.php

@@ -7,6 +7,8 @@
 use Orchestra\Testbench\Concerns\WithWorkbench;
 use Orchestra\Testbench\TestCase;
 
+use function Orchestra\Testbench\package_path;
+
 class DefaultConfigContainsAppUrlTest extends TestCase
 {
     use WithWorkbench;
@@ -16,14 +18,14 @@ protected function defineEnvironment($app)
         putenv('APP_URL=https://www.example.com');
         $app['config']->set('app.url', 'https://www.example.com');
 
-        $config = require __DIR__.'/../../config/sanctum.php';
+        $config = require package_path('config/sanctum.php');
 
         $app['config']->set('sanctum.stateful', $config['stateful']);
     }
 
     public function test_default_config_contains_app_url()
     {
-        $config = require __DIR__.'/../../config/sanctum.php';
+        $config = require package_path('config/sanctum.php');
 
         $app_host = parse_url(env('APP_URL'), PHP_URL_HOST);
 
@@ -35,7 +37,7 @@ public function test_app_url_is_not_parsed_when_missing_from_env()
         putenv('APP_URL');
         config(['app.url' => null]);
 
-        $config = require __DIR__.'/../../config/sanctum.php';
+        $config = require package_path('config/sanctum.php');
 
         $this->assertNull(env('APP_URL'));
         $this->assertNotContains('', $config['stateful']);