Make building of search results work for multi-byte encoded characters

[bookstack] / tests / Auth / UserInviteTest.php

diff --git a/tests/Auth/UserInviteTest.php b/tests/Auth/UserInviteTest.php
index 3312626909541455a06ac65d8475a92ed6191484..1e1235f3361e34c9736fc0a4bf345b6420cad7e9 100644 (file)
--- a/tests/Auth/UserInviteTest.php
+++ b/tests/Auth/UserInviteTest.php
@@ -1,32 +1,36 @@
-<?php namespace Tests;
+<?php

 
 

+namespace Tests\Auth;

 
 use BookStack\Auth\Access\UserInviteService;
 use BookStack\Auth\User;
 use BookStack\Notifications\UserInvite;
 use Carbon\Carbon;
 
 use BookStack\Auth\Access\UserInviteService;
 use BookStack\Auth\User;
 use BookStack\Notifications\UserInvite;
 use Carbon\Carbon;

-use DB;
-use Notification;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Notification;
+use Illuminate\Support\Str;
+use Tests\TestCase;

 
 class UserInviteTest extends TestCase
 {
 
 class UserInviteTest extends TestCase
 {

-

     public function test_user_creation_creates_invite()
     {
         Notification::fake();
         $admin = $this->getAdmin();
 
     public function test_user_creation_creates_invite()
     {
         Notification::fake();
         $admin = $this->getAdmin();
 

-        $this->actingAs($admin)->post('/settings/users/create', [
-            'name' => 'Barry',
-            'email' => '[email protected]',
+        $email = Str::random(16) . '@example.com';
+        $resp = $this->actingAs($admin)->post('/settings/users/create', [
+            'name'        => 'Barry',
+            'email'       => $email,

             'send_invite' => 'true',
         ]);
             'send_invite' => 'true',
         ]);

+        $resp->assertRedirect('/settings/users');

 
 

-        $newUser = User::query()->where('email', '=', '[email protected]')->orderBy('id', 'desc')->first();
+        $newUser = User::query()->where('email', '=', $email)->orderBy('id', 'desc')->first();

 
         Notification::assertSentTo($newUser, UserInvite::class);
         $this->assertDatabaseHas('user_invites', [
 
         Notification::assertSentTo($newUser, UserInvite::class);
         $this->assertDatabaseHas('user_invites', [

-            'user_id' => $newUser->id
+            'user_id' => $newUser->id,

         ]);
     }
 
         ]);
     }
 


@@ -48,14 +52,14 @@ class UserInviteTest extends TestCase
         $setPasswordResp = $this->followingRedirects()->post('/register/invite/' . $token, [
             'password' => 'my test password',
         ]);
         $setPasswordResp = $this->followingRedirects()->post('/register/invite/' . $token, [
             'password' => 'my test password',
         ]);

-        $setPasswordResp->assertSee('Password set, you now have access to BookStack!');
+        $setPasswordResp->assertSee('Password set, you should now be able to login using your set password to access BookStack!');

         $newPasswordValid = auth()->validate([
         $newPasswordValid = auth()->validate([

-            'email' => $user->email,
-            'password' => 'my test password'
+            'email'    => $user->email,
+            'password' => 'my test password',

         ]);
         $this->assertTrue($newPasswordValid);
         $this->assertDatabaseMissing('user_invites', [
         ]);
         $this->assertTrue($newPasswordValid);
         $this->assertDatabaseMissing('user_invites', [

-            'user_id' => $user->id
+            'user_id' => $user->id,

         ]);
     }
 
         ]);
     }
 


@@ -68,27 +72,29 @@ class UserInviteTest extends TestCase
         $inviteService->sendInvitation($user);
         $token = DB::table('user_invites')->where('user_id', '=', $user->id)->first()->token;
 
         $inviteService->sendInvitation($user);
         $token = DB::table('user_invites')->where('user_id', '=', $user->id)->first()->token;
 

+        $this->get('/register/invite/' . $token);

         $shortPassword = $this->followingRedirects()->post('/register/invite/' . $token, [
         $shortPassword = $this->followingRedirects()->post('/register/invite/' . $token, [

-            'password' => 'mypas',
+            'password' => 'mypassw',

         ]);
         ]);

-        $shortPassword->assertSee('The password must be at least 6 characters.');
+        $shortPassword->assertSee('The password must be at least 8 characters.');

 
 

+        $this->get('/register/invite/' . $token);

         $noPassword = $this->followingRedirects()->post('/register/invite/' . $token, [
             'password' => '',
         ]);
         $noPassword->assertSee('The password field is required.');
 
         $this->assertDatabaseHas('user_invites', [
         $noPassword = $this->followingRedirects()->post('/register/invite/' . $token, [
             'password' => '',
         ]);
         $noPassword->assertSee('The password field is required.');
 
         $this->assertDatabaseHas('user_invites', [

-            'user_id' => $user->id
+            'user_id' => $user->id,

         ]);
     }
 
     public function test_non_existent_invite_token_redirects_to_home()
     {
         ]);
     }
 
     public function test_non_existent_invite_token_redirects_to_home()
     {

-        $setPasswordPageResp = $this->get('/register/invite/' . str_random(12));
+        $setPasswordPageResp = $this->get('/register/invite/' . Str::random(12));

         $setPasswordPageResp->assertRedirect('/');
 
         $setPasswordPageResp->assertRedirect('/');
 

-        $setPasswordResp = $this->post('/register/invite/' . str_random(12), ['password' => 'Password Test']);
+        $setPasswordResp = $this->post('/register/invite/' . Str::random(12), ['password' => 'Password Test']);

         $setPasswordResp->assertRedirect('/');
     }
 
         $setPasswordResp->assertRedirect('/');
     }
 


@@ -106,6 +112,4 @@ class UserInviteTest extends TestCase
         $setPasswordPageResp->assertRedirect('/password/email');
         $setPasswordPageResp->assertSessionHas('error', 'This invitation link has expired. You can instead try to reset your account password.');
     }
         $setPasswordPageResp->assertRedirect('/password/email');
         $setPasswordPageResp->assertSessionHas('error', 'This invitation link has expired. You can instead try to reset your account password.');
     }

-
-
-}
\ No newline at end of file
+}