Removes some unused code.

[bookstack] / tests / Auth / AuthTest.php

diff --git a/tests/Auth/AuthTest.php b/tests/Auth/AuthTest.php
index 067840841c8938aed53cba08a2c7c30356ac27f8..4de35faff089c500aa6e0c58b475323d7ba37f94 100644 (file)
--- a/tests/Auth/AuthTest.php
+++ b/tests/Auth/AuthTest.php
@@ -1,8 +1,9 @@
-<?php
+<?php namespace Tests;

 
 

-use BookStack\EmailConfirmation;
+use BookStack\Notifications\ConfirmEmail;
+use Illuminate\Support\Facades\Notification;

 
 

-class AuthTest extends TestCase
+class AuthTest extends BrowserKitTest

 {
 
     public function test_auth_working()
 {
 
     public function test_auth_working()


@@ -23,7 +24,7 @@ class AuthTest extends TestCase
         $settings->put('app-public', 'true');
         $this->visit('/')
             ->seePageIs('/')
         $settings->put('app-public', 'true');
         $this->visit('/')
             ->seePageIs('/')

-            ->see('Sign In');
+            ->see('Log In');

     }
 
     public function test_registration_showing()
     }
 
     public function test_registration_showing()


@@ -57,15 +58,13 @@ class AuthTest extends TestCase
 
     public function test_confirmed_registration()
     {
 
     public function test_confirmed_registration()
     {

+        // Fake notifications
+        Notification::fake();
+

         // Set settings and get user instance
         $this->setSettings(['registration-enabled' => 'true', 'registration-confirmation' => 'true']);
         $user = factory(\BookStack\User::class)->make();
 
         // Set settings and get user instance
         $this->setSettings(['registration-enabled' => 'true', 'registration-confirmation' => 'true']);
         $user = factory(\BookStack\User::class)->make();
 

-        // Mock Mailer to ensure mail is being sent
-        $mockMailer = Mockery::mock('Illuminate\Contracts\Mail\Mailer');
-        $mockMailer->shouldReceive('send')->with('emails/email-confirmation', Mockery::type('array'), Mockery::type('callable'))->twice();
-        $this->app->instance('mailer', $mockMailer);
-

         // Go through registration process
         $this->visit('/register')
             ->see('Sign Up')
         // Go through registration process
         $this->visit('/register')
             ->see('Sign Up')


@@ -76,6 +75,10 @@ class AuthTest extends TestCase
             ->seePageIs('/register/confirm')
             ->seeInDatabase('users', ['name' => $user->name, 'email' => $user->email, 'email_confirmed' => false]);
 
             ->seePageIs('/register/confirm')
             ->seeInDatabase('users', ['name' => $user->name, 'email' => $user->email, 'email_confirmed' => false]);
 

+        // Ensure notification sent
+        $dbUser = \BookStack\User::where('email', '=', $user->email)->first();
+        Notification::assertSentTo($dbUser, ConfirmEmail::class);
+

         // Test access and resend confirmation email
         $this->login($user->email, $user->password)
             ->seePageIs('/register/confirm/awaiting')
         // Test access and resend confirmation email
         $this->login($user->email, $user->password)
             ->seePageIs('/register/confirm/awaiting')


@@ -84,19 +87,18 @@ class AuthTest extends TestCase
             ->seePageIs('/register/confirm/awaiting')
             ->press('Resend Confirmation Email');
 
             ->seePageIs('/register/confirm/awaiting')
             ->press('Resend Confirmation Email');
 

-        // Get confirmation
-        $user = $user->where('email', '=', $user->email)->first();
-        $emailConfirmation = EmailConfirmation::where('user_id', '=', $user->id)->first();
-
-
-        // Check confirmation email button and confirmation activation.
-        $this->visit('/register/confirm/' . $emailConfirmation->token . '/email')
-            ->see('Email Confirmation')
-            ->click('Confirm Email')
+        // Get confirmation and confirm notification matches
+        $emailConfirmation = \DB::table('email_confirmations')->where('user_id', '=', $dbUser->id)->first();
+        Notification::assertSentTo($dbUser, ConfirmEmail::class, function($notification, $channels) use ($emailConfirmation) {
+            return $notification->token === $emailConfirmation->token;
+        });
+        
+        // Check confirmation email confirmation activation.
+        $this->visit('/register/confirm/' . $emailConfirmation->token)

             ->seePageIs('/')
             ->see($user->name)
             ->notSeeInDatabase('email_confirmations', ['token' => $emailConfirmation->token])
             ->seePageIs('/')
             ->see($user->name)
             ->notSeeInDatabase('email_confirmations', ['token' => $emailConfirmation->token])

-            ->seeInDatabase('users', ['name' => $user->name, 'email' => $user->email, 'email_confirmed' => true]);
+            ->seeInDatabase('users', ['name' => $dbUser->name, 'email' => $dbUser->email, 'email_confirmed' => true]);

     }
 
     public function test_restricted_registration()
     }
 
     public function test_restricted_registration()


@@ -130,7 +132,7 @@ class AuthTest extends TestCase
 
         $this->asAdmin()
             ->visit('/settings/users')
 
         $this->asAdmin()
             ->visit('/settings/users')

-            ->click('Add new user')
+            ->click('Add New User')

             ->type($user->name, '#name')
             ->type($user->email, '#email')
             ->check('roles[admin]')
             ->type($user->name, '#name')
             ->type($user->email, '#email')
             ->check('roles[admin]')


@@ -144,7 +146,7 @@ class AuthTest extends TestCase
 
     public function test_user_updating()
     {
 
     public function test_user_updating()
     {

-        $user = \BookStack\User::all()->last();
+        $user = $this->getNormalUser();

         $password = $user->password;
         $this->asAdmin()
             ->visit('/settings/users')
         $password = $user->password;
         $this->asAdmin()
             ->visit('/settings/users')


@@ -160,7 +162,7 @@ class AuthTest extends TestCase
 
     public function test_user_password_update()
     {
 
     public function test_user_password_update()
     {

-        $user = \BookStack\User::all()->last();
+        $user = $this->getNormalUser();

         $userProfilePage = '/settings/users/' . $user->id;
         $this->asAdmin()
             ->visit($userProfilePage)
         $userProfilePage = '/settings/users/' . $user->id;
         $this->asAdmin()
             ->visit($userProfilePage)


@@ -175,13 +177,13 @@ class AuthTest extends TestCase
             ->seePageIs('/settings/users');
 
             $userPassword = \BookStack\User::find($user->id)->password;
             ->seePageIs('/settings/users');
 
             $userPassword = \BookStack\User::find($user->id)->password;

-            $this->assertTrue(Hash::check('newpassword', $userPassword));
+            $this->assertTrue(\Hash::check('newpassword', $userPassword));

     }
 
     public function test_user_deletion()
     {
         $userDetails = factory(\BookStack\User::class)->make();
     }
 
     public function test_user_deletion()
     {
         $userDetails = factory(\BookStack\User::class)->make();

-        $user = $this->getNewUser($userDetails->toArray());
+        $user = $this->getEditor($userDetails->toArray());

 
         $this->asAdmin()
             ->visit('/settings/users/' . $user->id)
 
         $this->asAdmin()
             ->visit('/settings/users/' . $user->id)


@@ -216,6 +218,44 @@ class AuthTest extends TestCase
             ->seePageIs('/login');
     }
 
             ->seePageIs('/login');
     }
 

+    public function test_reset_password_flow()
+    {
+
+        Notification::fake();
+
+        $this->visit('/login')->click('Forgot Password?')
+            ->seePageIs('/password/email')
+            ->type('[email protected]', 'email')
+            ->press('Send Reset Link')
+            ->see('A password reset link has been sent to [email protected]');
+
+        $this->seeInDatabase('password_resets', [
+            'email' => '[email protected]'
+        ]);
+
+        $user = \BookStack\User::where('email', '=', '[email protected]')->first();
+
+        Notification::assertSentTo($user, \BookStack\Notifications\ResetPassword::class);
+        $n = Notification::sent($user, \BookStack\Notifications\ResetPassword::class);
+
+        $this->visit('/password/reset/' . $n->first()->token)
+            ->see('Reset Password')
+            ->submitForm('Reset Password', [
+                'email' => '[email protected]',
+                'password' => 'randompass',
+                'password_confirmation' => 'randompass'
+            ])->seePageIs('/')
+            ->see('Your password has been successfully reset');
+    }
+
+    public function test_reset_password_page_shows_sign_links()
+    {
+        $this->setSettings(['registration-enabled' => 'true']);
+        $this->visit('/password/email')
+            ->seeLink('Log in')
+            ->seeLink('Sign up');
+    }
+

     /**
      * Perform a login
      * @param string $email
     /**
      * Perform a login
      * @param string $email


@@ -227,6 +267,6 @@ class AuthTest extends TestCase
         return $this->visit('/login')
             ->type($email, '#email')
             ->type($password, '#password')
         return $this->visit('/login')
             ->type($email, '#email')
             ->type($password, '#password')

-            ->press('Sign In');
+            ->press('Log In');

     }
 }
     }
 }