Fixed OIDC Logout

[bookstack] / tests / Auth / SocialAuthTest.php

diff --git a/tests/Auth/SocialAuthTest.php b/tests/Auth/SocialAuthTest.php
index f70263dd278ae1a8bf93efe26c896bda300d97e3..5b7071a0779e2c60dd4d99d839e0c00c45d21da8 100644 (file)
--- a/tests/Auth/SocialAuthTest.php
+++ b/tests/Auth/SocialAuthTest.php
@@ -2,9 +2,9 @@
 
 namespace Tests\Auth;
 
 
 namespace Tests\Auth;
 

-use BookStack\Actions\ActivityType;
-use BookStack\Auth\SocialAccount;
-use BookStack\Auth\User;
+use BookStack\Access\SocialAccount;
+use BookStack\Activity\ActivityType;
+use BookStack\Users\Models\User;

 use Illuminate\Support\Facades\DB;
 use Laravel\Socialite\Contracts\Factory;
 use Laravel\Socialite\Contracts\Provider;
 use Illuminate\Support\Facades\DB;
 use Laravel\Socialite\Contracts\Factory;
 use Laravel\Socialite\Contracts\Provider;


@@ -15,7 +15,7 @@ class SocialAuthTest extends TestCase
 {
     public function test_social_registration()
     {
 {
     public function test_social_registration()
     {

-        $user = factory(User::class)->make();
+        $user = User::factory()->make();

 
         $this->setSettings(['registration-enabled' => 'true']);
         config(['GOOGLE_APP_ID' => 'abc123', 'GOOGLE_APP_SECRET' => '123abc', 'APP_URL' => 'http://localhost']);
 
         $this->setSettings(['registration-enabled' => 'true']);
         config(['GOOGLE_APP_ID' => 'abc123', 'GOOGLE_APP_SECRET' => '123abc', 'APP_URL' => 'http://localhost']);


@@ -61,7 +61,7 @@ class SocialAuthTest extends TestCase
 
         // Test login routes
         $resp = $this->get('/login');
 
         // Test login routes
         $resp = $this->get('/login');

-        $resp->assertElementExists('a#social-login-google[href$="/login/service/google"]');
+        $this->withHtml($resp)->assertElementExists('a#social-login-google[href$="/login/service/google"]');

         $resp = $this->followingRedirects()->get('/login/service/google');
         $resp->assertSee('login-form');
 
         $resp = $this->followingRedirects()->get('/login/service/google');
         $resp->assertSee('login-form');
 


@@ -71,24 +71,24 @@ class SocialAuthTest extends TestCase
         $resp->assertSee(trans('errors.social_account_not_used', ['socialAccount' => 'Google']));
 
         $resp = $this->get('/login');
         $resp->assertSee(trans('errors.social_account_not_used', ['socialAccount' => 'Google']));
 
         $resp = $this->get('/login');

-        $resp->assertElementExists('a#social-login-github[href$="/login/service/github"]');
+        $this->withHtml($resp)->assertElementExists('a#social-login-github[href$="/login/service/github"]');

         $resp = $this->followingRedirects()->get('/login/service/github');
         $resp->assertSee('login-form');
 
         // Test social callback with matching social account
         DB::table('social_accounts')->insert([
         $resp = $this->followingRedirects()->get('/login/service/github');
         $resp->assertSee('login-form');
 
         // Test social callback with matching social account
         DB::table('social_accounts')->insert([

-            'user_id'   => $this->getAdmin()->id,
+            'user_id'   => $this->users->admin()->id,

             'driver'    => 'github',
             'driver_id' => 'logintest123',
         ]);
         $resp = $this->followingRedirects()->get('/login/service/github/callback');
         $resp->assertDontSee('login-form');
             'driver'    => 'github',
             'driver_id' => 'logintest123',
         ]);
         $resp = $this->followingRedirects()->get('/login/service/github/callback');
         $resp->assertDontSee('login-form');

-        $this->assertActivityExists(ActivityType::AUTH_LOGIN, null, 'github; (' . $this->getAdmin()->id . ') ' . $this->getAdmin()->name);
+        $this->assertActivityExists(ActivityType::AUTH_LOGIN, null, 'github; (' . $this->users->admin()->id . ') ' . $this->users->admin()->name);

     }
 
     public function test_social_account_detach()
     {
     }
 
     public function test_social_account_detach()
     {

-        $editor = $this->getEditor();
+        $editor = $this->users->editor();

         config([
             'GITHUB_APP_ID' => 'abc123', 'GITHUB_APP_SECRET' => '123abc',
             'APP_URL'       => 'http://localhost',
         config([
             'GITHUB_APP_ID' => 'abc123', 'GITHUB_APP_SECRET' => '123abc',
             'APP_URL'       => 'http://localhost',


@@ -101,7 +101,7 @@ class SocialAuthTest extends TestCase
         ]);
 
         $resp = $this->actingAs($editor)->get($editor->getEditUrl());
         ]);
 
         $resp = $this->actingAs($editor)->get($editor->getEditUrl());

-        $resp->assertElementContains('form[action$="/login/service/github/detach"]', 'Disconnect Account');
+        $this->withHtml($resp)->assertElementContains('form[action$="/login/service/github/detach"]', 'Disconnect Account');

 
         $resp = $this->post('/login/service/github/detach');
         $resp->assertRedirect($editor->getEditUrl());
 
         $resp = $this->post('/login/service/github/detach');
         $resp->assertRedirect($editor->getEditUrl());


@@ -118,7 +118,7 @@ class SocialAuthTest extends TestCase
             'APP_URL'                   => 'http://localhost',
         ]);
 
             'APP_URL'                   => 'http://localhost',
         ]);
 

-        $user = factory(User::class)->make();
+        $user = User::factory()->make();

         $mockSocialite = $this->mock(Factory::class);
         $mockSocialDriver = Mockery::mock(Provider::class);
         $mockSocialUser = Mockery::mock(\Laravel\Socialite\Contracts\User::class);
         $mockSocialite = $this->mock(Factory::class);
         $mockSocialDriver = Mockery::mock(Provider::class);
         $mockSocialUser = Mockery::mock(\Laravel\Socialite\Contracts\User::class);


@@ -156,7 +156,7 @@ class SocialAuthTest extends TestCase
             'APP_URL'                   => 'http://localhost', 'services.google.auto_register' => true, 'services.google.auto_confirm' => true,
         ]);
 
             'APP_URL'                   => 'http://localhost', 'services.google.auto_register' => true, 'services.google.auto_confirm' => true,
         ]);
 

-        $user = factory(User::class)->make();
+        $user = User::factory()->make();

         $mockSocialite = $this->mock(Factory::class);
         $mockSocialDriver = Mockery::mock(Provider::class);
         $mockSocialUser = Mockery::mock(\Laravel\Socialite\Contracts\User::class);
         $mockSocialite = $this->mock(Factory::class);
         $mockSocialDriver = Mockery::mock(Provider::class);
         $mockSocialUser = Mockery::mock(\Laravel\Socialite\Contracts\User::class);


@@ -188,7 +188,7 @@ class SocialAuthTest extends TestCase
 
     public function test_social_registration_with_no_name_uses_email_as_name()
     {
 
     public function test_social_registration_with_no_name_uses_email_as_name()
     {

-        $user = factory(User::class)->make(['email' => '[email protected]']);
+        $user = User::factory()->make(['email' => '[email protected]']);

 
         $this->setSettings(['registration-enabled' => 'true']);
         config(['GITHUB_APP_ID' => 'abc123', 'GITHUB_APP_SECRET' => '123abc', 'APP_URL' => 'http://localhost']);
 
         $this->setSettings(['registration-enabled' => 'true']);
         config(['GITHUB_APP_ID' => 'abc123', 'GITHUB_APP_SECRET' => '123abc', 'APP_URL' => 'http://localhost']);