Adapt tests

Author: binaryk

phpunit.xml.dist

@@ -8,7 +8,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false">
+         stopOnFailure="true">
     <testsuites>
         <testsuite name="Test Suite">
             <directory>tests</directory>

src/Services/AuthService.php

@@ -315,7 +315,7 @@ public function logout()
         $user = Auth::user();
         if ($user instanceof Authenticatable) {
             if ($user instanceof Passportable) {
-                $user->tokens->each->revoke();
+                $user->tokens()->get()->each->revoke();
                 event(new UserLogout($user));
             }
 

tests/AuthServiceLoginTest.php

@@ -5,6 +5,7 @@
 use Binaryk\LaravelRestify\Contracts\Passportable;
 use Binaryk\LaravelRestify\Events\UserLoggedIn;
 use Binaryk\LaravelRestify\Events\UserLogout;
+use Binaryk\LaravelRestify\Exceptions\AirlockUserException;
 use Binaryk\LaravelRestify\Exceptions\AuthenticatableUserException;
 use Binaryk\LaravelRestify\Exceptions\CredentialsDoesntMatch;
 use Binaryk\LaravelRestify\Exceptions\PassportUserException;
@@ -75,6 +76,7 @@ public function test_user_did_not_verified_email()
 
     public function test_login_user_did_not_user_passport_trait_or_not_implement_pasportable()
     {
+        $this->app['config']->set('restify.auth.provider', 'passport');
         $this->expectException(PassportUserException::class);
         $userMustVerify = (new class extends User implements MustVerifyEmail {
             use \Illuminate\Auth\MustVerifyEmail;
@@ -94,6 +96,28 @@ public function test_login_user_did_not_user_passport_trait_or_not_implement_pas
         $this->authService->login();
     }
 
+    public function test_login_user_did_not_user_passport_trait_or_not_implement_airlockable()
+    {
+        $this->app['config']->set('restify.auth.provider', 'airlock');
+        $this->expectException(AirlockUserException::class);
+        $userMustVerify = (new class extends User implements MustVerifyEmail {
+            use \Illuminate\Auth\MustVerifyEmail;
+        });
+
+        $userMustVerify->fill([
+            'email' => '[email protected]',
+            'email_verified_at' => Carbon::now(),
+        ]);
+
+        Auth::shouldReceive('attempt')
+            ->andReturnTrue();
+
+        Auth::shouldReceive('user')
+            ->andReturn($userMustVerify);
+
+        $this->authService->login();
+    }
+
     public function test_login_with_success()
     {
         Event::fake([
@@ -127,6 +151,8 @@ public function test_login_with_success()
     public function test_logout_success()
     {
         Event::fake();
+        $this->app['config']->set('restify.auth.provider', 'passport');
+
         $user = (new class extends \Binaryk\LaravelRestify\Tests\Fixtures\User {
             public function tokens()
             {