Merge branch 'master' into patch-5

[bookstack] / tests / Auth / AuthTest.php

diff --git a/tests/Auth/AuthTest.php b/tests/Auth/AuthTest.php
index 87339344b9843ff317a2c03913ee2f77eb2563e6..c39ef68e56399740b3ace0965e2d3d29b67d61dc 100644 (file)
--- a/tests/Auth/AuthTest.php
+++ b/tests/Auth/AuthTest.php
@@ -1,6 +1,8 @@
 <?php namespace Tests;
 
 use BookStack\Notifications\ConfirmEmail;
+use BookStack\Auth\User;
+use BookStack\Settings\SettingService;
 use Illuminate\Support\Facades\Notification;
 
 class AuthTest extends BrowserKitTest
@@ -20,7 +22,7 @@ class AuthTest extends BrowserKitTest
 
     public function test_public_viewing()
     {
-        $settings = app('BookStack\Services\SettingService');
+        $settings = app(SettingService::class);
         $settings->put('app-public', 'true');
         $this->visit('/')
             ->seePageIs('/')
@@ -41,7 +43,7 @@ class AuthTest extends BrowserKitTest
     {
         // Set settings and get user instance
         $this->setSettings(['registration-enabled' => 'true']);
-        $user = factory(\BookStack\User::class)->make();
+        $user = factory(User::class)->make();
 
         // Test form and ensure user is created
         $this->visit('/register')
@@ -55,6 +57,43 @@ class AuthTest extends BrowserKitTest
             ->seeInDatabase('users', ['name' => $user->name, 'email' => $user->email]);
     }
 
+    public function test_empty_registration_redirects_back_with_errors()
+    {
+        // Set settings and get user instance
+        $this->setSettings(['registration-enabled' => 'true']);
+
+        // Test form and ensure user is created
+        $this->visit('/register')
+            ->press('Create Account')
+            ->see('The name field is required')
+            ->seePageIs('/register');
+    }
+
+    public function test_registration_validation()
+    {
+        $this->setSettings(['registration-enabled' => 'true']);
+
+        $this->visit('/register')
+            ->type('1', '#name')
+            ->type('1', '#email')
+            ->type('1', '#password')
+            ->press('Create Account')
+            ->see('The name must be at least 2 characters.')
+            ->see('The email must be a valid email address.')
+            ->see('The password must be at least 6 characters.')
+            ->seePageIs('/register');
+    }
+
+    public function test_sign_up_link_on_login()
+    {
+        $this->visit('/login')
+            ->dontSee('Sign up');
+
+        $this->setSettings(['registration-enabled' => 'true']);
+
+        $this->visit('/login')
+            ->see('Sign up');
+    }
 
     public function test_confirmed_registration()
     {
@@ -63,7 +102,7 @@ class AuthTest extends BrowserKitTest
 
         // Set settings and get user instance
         $this->setSettings(['registration-enabled' => 'true', 'registration-confirmation' => 'true']);
-        $user = factory(\BookStack\User::class)->make();
+        $user = factory(User::class)->make();
 
         // Go through registration process
         $this->visit('/register')
@@ -76,7 +115,7 @@ class AuthTest extends BrowserKitTest
             ->seeInDatabase('users', ['name' => $user->name, 'email' => $user->email, 'email_confirmed' => false]);
 
         // Ensure notification sent
-        $dbUser = \BookStack\User::where('email', '=', $user->email)->first();
+        $dbUser = User::where('email', '=', $user->email)->first();
         Notification::assertSentTo($dbUser, ConfirmEmail::class);
 
         // Test access and resend confirmation email
@@ -104,7 +143,7 @@ class AuthTest extends BrowserKitTest
     public function test_restricted_registration()
     {
         $this->setSettings(['registration-enabled' => 'true', 'registration-confirmation' => 'true', 'registration-restrict' => 'example.com']);
-        $user = factory(\BookStack\User::class)->make();
+        $user = factory(User::class)->make();
         // Go through registration process
         $this->visit('/register')
             ->type($user->name, '#name')
@@ -136,7 +175,7 @@ class AuthTest extends BrowserKitTest
     public function test_restricted_registration_with_confirmation_disabled()
     {
         $this->setSettings(['registration-enabled' => 'true', 'registration-confirmation' => 'false', 'registration-restrict' => 'example.com']);
-        $user = factory(\BookStack\User::class)->make();
+        $user = factory(User::class)->make();
         // Go through registration process
         $this->visit('/register')
             ->type($user->name, '#name')
@@ -167,7 +206,7 @@ class AuthTest extends BrowserKitTest
 
     public function test_user_creation()
     {
-        $user = factory(\BookStack\User::class)->make();
+        $user = factory(User::class)->make();
 
         $this->asAdmin()
             ->visit('/settings/users')
@@ -215,13 +254,13 @@ class AuthTest extends BrowserKitTest
             ->press('Save')
             ->seePageIs('/settings/users');
 
-            $userPassword = \BookStack\User::find($user->id)->password;
+            $userPassword = User::find($user->id)->password;
             $this->assertTrue(\Hash::check('newpassword', $userPassword));
     }
 
     public function test_user_deletion()
     {
-        $userDetails = factory(\BookStack\User::class)->make();
+        $userDetails = factory(User::class)->make();
         $user = $this->getEditor($userDetails->toArray());
 
         $this->asAdmin()
@@ -235,7 +274,7 @@ class AuthTest extends BrowserKitTest
 
     public function test_user_cannot_be_deleted_if_last_admin()
     {
-        $adminRole = \BookStack\Role::getRole('admin');
+        $adminRole = \BookStack\Auth\Role::getRole('admin');
         // Ensure we currently only have 1 admin user
         $this->assertEquals(1, $adminRole->users()->count());
         $user = $adminRole->users->first();
@@ -272,7 +311,7 @@ class AuthTest extends BrowserKitTest
             'email' => '[email protected]'
         ]);
 
-        $user = \BookStack\User::where('email', '=', '[email protected]')->first();
+        $user = User::where('email', '=', '[email protected]')->first();
 
         Notification::assertSentTo($user, \BookStack\Notifications\ResetPassword::class);
         $n = Notification::sent($user, \BookStack\Notifications\ResetPassword::class);