ExportFormatter: Add book description and check for empty book and chapter descriptio...

[bookstack] / tests / Settings / TestEmailTest.php

diff --git a/tests/Settings/TestEmailTest.php b/tests/Settings/TestEmailTest.php
index 31c51158f8b87645f8be30c2e6328f65048b5cce..e96024e7b74fb1e4f13038336ee6864986001bf1 100644 (file)
--- a/tests/Settings/TestEmailTest.php
+++ b/tests/Settings/TestEmailTest.php
@@ -2,7 +2,7 @@
 
 namespace Tests\Settings;
 
 
 namespace Tests\Settings;
 

-use BookStack\Notifications\TestEmail;
+use BookStack\Settings\TestEmailNotification;

 use Illuminate\Contracts\Notifications\Dispatcher;
 use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;
 use Illuminate\Contracts\Notifications\Dispatcher;
 use Illuminate\Support\Facades\Notification;
 use Tests\TestCase;


@@ -20,13 +20,13 @@ class TestEmailTest extends TestCase
     public function test_send_test_email_endpoint_sends_email_and_redirects_user_and_shows_notification()
     {
         Notification::fake();
     public function test_send_test_email_endpoint_sends_email_and_redirects_user_and_shows_notification()
     {
         Notification::fake();

-        $admin = $this->getAdmin();
+        $admin = $this->users->admin();

 
         $sendReq = $this->actingAs($admin)->post('/settings/maintenance/send-test-email');
         $sendReq->assertRedirect('/settings/maintenance#image-cleanup');
         $this->assertSessionHas('success', 'Email sent to ' . $admin->email);
 
 
         $sendReq = $this->actingAs($admin)->post('/settings/maintenance/send-test-email');
         $sendReq->assertRedirect('/settings/maintenance#image-cleanup');
         $this->assertSessionHas('success', 'Email sent to ' . $admin->email);
 

-        Notification::assertSentTo($admin, TestEmail::class);
+        Notification::assertSentTo($admin, TestEmailNotification::class);

     }
 
     public function test_send_test_email_failure_displays_error_notification()
     }
 
     public function test_send_test_email_failure_displays_error_notification()


@@ -37,7 +37,7 @@ class TestEmailTest extends TestCase
         $exception = new \Exception('A random error occurred when testing an email');
         $mockDispatcher->shouldReceive('sendNow')->andThrow($exception);
 
         $exception = new \Exception('A random error occurred when testing an email');
         $mockDispatcher->shouldReceive('sendNow')->andThrow($exception);
 

-        $admin = $this->getAdmin();
+        $admin = $this->users->admin();

         $sendReq = $this->actingAs($admin)->post('/settings/maintenance/send-test-email');
         $sendReq->assertRedirect('/settings/maintenance#image-cleanup');
         $this->assertSessionHas('error');
         $sendReq = $this->actingAs($admin)->post('/settings/maintenance/send-test-email');
         $sendReq->assertRedirect('/settings/maintenance#image-cleanup');
         $this->assertSessionHas('error');


@@ -50,13 +50,13 @@ class TestEmailTest extends TestCase
     public function test_send_test_email_requires_settings_manage_permission()
     {
         Notification::fake();
     public function test_send_test_email_requires_settings_manage_permission()
     {
         Notification::fake();

-        $user = $this->getViewer();
+        $user = $this->users->viewer();

 
         $sendReq = $this->actingAs($user)->post('/settings/maintenance/send-test-email');
         Notification::assertNothingSent();
 
 
         $sendReq = $this->actingAs($user)->post('/settings/maintenance/send-test-email');
         Notification::assertNothingSent();
 

-        $this->giveUserPermissions($user, ['settings-manage']);
+        $this->permissions->grantUserRolePermissions($user, ['settings-manage']);

         $sendReq = $this->actingAs($user)->post('/settings/maintenance/send-test-email');
         $sendReq = $this->actingAs($user)->post('/settings/maintenance/send-test-email');

-        Notification::assertSentTo($user, TestEmail::class);
+        Notification::assertSentTo($user, TestEmailNotification::class);

     }
 }
     }
 }