X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/07b889547d28e68e5fc8f923c166bd607da17ad7..refs/pull/1881/head:/tests/Auth/AuthTest.php

diff --git a/tests/Auth/AuthTest.php b/tests/Auth/AuthTest.php
index c39ef68e5..eb83faded 100644
--- a/tests/Auth/AuthTest.php
+++ b/tests/Auth/AuthTest.php
@@ -1,7 +1,8 @@
 <?php namespace Tests;
 
-use BookStack\Notifications\ConfirmEmail;
 use BookStack\Auth\User;
+use BookStack\Entities\Page;
+use BookStack\Notifications\ConfirmEmail;
 use BookStack\Settings\SettingService;
 use Illuminate\Support\Facades\Notification;
 
@@ -80,7 +81,7 @@ class AuthTest extends BrowserKitTest
             ->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.')
+            ->see('The password must be at least 8 characters.')
             ->seePageIs('/register');
     }
 
@@ -275,6 +276,15 @@ class AuthTest extends BrowserKitTest
     public function test_user_cannot_be_deleted_if_last_admin()
     {
         $adminRole = \BookStack\Auth\Role::getRole('admin');
+
+        // Delete all but one admin user if there are more than one
+        $adminUsers = $adminRole->users;
+        if (count($adminUsers) > 1) {
+            foreach ($adminUsers->splice(1) as $user) {
+                $user->delete();
+            }
+        }
+
         // Ensure we currently only have 1 admin user
         $this->assertEquals(1, $adminRole->users()->count());
         $user = $adminRole->users->first();
@@ -334,6 +344,17 @@ class AuthTest extends BrowserKitTest
             ->seeLink('Sign up');
     }
 
+    public function test_login_redirects_to_initially_requested_url_correctly()
+    {
+        config()->set('app.url', 'http://localhost');
+        $page = Page::query()->first();
+
+        $this->visit($page->getUrl())
+            ->seePageUrlIs(url('/login'));
+        $this->login('admin@admin.com', 'password')
+            ->seePageUrlIs($page->getUrl());
+    }
+
     /**
      * Perform a login
      * @param string $email