Notifications: Switched testing from string to reference levels

diff --git a/app/Activity/Controllers/WatchController.php b/app/Activity/Controllers/WatchController.php
index 43908812b60fb3874bb56b03f5fb4f0584518172..3d7e18116bec0b404bd8dd804480c23ab150376d 100644 (file)
--- a/app/Activity/Controllers/WatchController.php
+++ b/app/Activity/Controllers/WatchController.php
@@ -23,7 +23,7 @@ class WatchController extends Controller
 
         $watchable = $this->getValidatedModelFromRequest($request);
         $watchOptions = new UserEntityWatchOptions(user(), $watchable);
 
         $watchable = $this->getValidatedModelFromRequest($request);
         $watchOptions = new UserEntityWatchOptions(user(), $watchable);

-        $watchOptions->updateWatchLevel($requestData['level']);
+        $watchOptions->updateLevelByName($requestData['level']);

 
         $this->showSuccessNotification(trans('activities.watch_update_level_notification'));
 
 
         $this->showSuccessNotification(trans('activities.watch_update_level_notification'));
 

diff --git a/app/Activity/Tools/UserEntityWatchOptions.php b/app/Activity/Tools/UserEntityWatchOptions.php
index 08fbe2e8d94dab240186d2fc2c54c819bfa337c4..231204fdf67b1f9f54fcbb90636fbea5de15ff24 100644 (file)
--- a/app/Activity/Tools/UserEntityWatchOptions.php
+++ b/app/Activity/Tools/UserEntityWatchOptions.php
@@ -51,15 +51,20 @@ class UserEntityWatchOptions
         return null;
     }
 
         return null;
     }
 

-    public function updateWatchLevel(string $level): void
+    public function updateLevelByName(string $level): void

     {
         $levelValue = WatchLevels::levelNameToValue($level);
     {
         $levelValue = WatchLevels::levelNameToValue($level);

-        if ($levelValue < 0) {
+        $this->updateLevelByValue($levelValue);
+    }
+
+    public function updateLevelByValue(int $level): void
+    {
+        if ($level < 0) {

             $this->remove();
             return;
         }
 
             $this->remove();
             return;
         }
 

-        $this->updateLevel($levelValue);
+        $this->updateLevel($level);

     }
 
     public function getWatchMap(): array
     }
 
     public function getWatchMap(): array

diff --git a/tests/Activity/WatchTest.php b/tests/Activity/WatchTest.php
index 00f3f5e4db51b9fa90b598fd2d6df3d730edb43f..fd86029d32c740f07d1ffac5298f681c3bba7e92 100644 (file)
--- a/tests/Activity/WatchTest.php
+++ b/tests/Activity/WatchTest.php
@@ -26,7 +26,7 @@ class WatchTest extends TestCase
             $this->withHtml($resp)->assertElementContains('form[action$="/watching/update"] button.icon-list-item', 'Watch');
 
             $watchOptions = new UserEntityWatchOptions($editor, $entity);
             $this->withHtml($resp)->assertElementContains('form[action$="/watching/update"] button.icon-list-item', 'Watch');
 
             $watchOptions = new UserEntityWatchOptions($editor, $entity);

-            $watchOptions->updateWatchLevel('comments');
+            $watchOptions->updateLevelByValue(WatchLevels::COMMENTS);

 
             $resp = $this->get($entity->getUrl());
             $this->withHtml($resp)->assertElementNotExists('form[action$="/watching/update"] button.icon-list-item');
 
             $resp = $this->get($entity->getUrl());
             $this->withHtml($resp)->assertElementNotExists('form[action$="/watching/update"] button.icon-list-item');


@@ -112,17 +112,17 @@ class WatchTest extends TestCase
         $chapter = $book->chapters()->first();
         $page = $chapter->pages()->first();
 
         $chapter = $book->chapters()->first();
         $page = $chapter->pages()->first();
 

-        (new UserEntityWatchOptions($editor, $book))->updateWatchLevel('updates');
+        (new UserEntityWatchOptions($editor, $book))->updateLevelByValue(WatchLevels::UPDATES);

 
         $this->actingAs($editor)->get($book->getUrl())->assertSee('Watching new pages and updates');
         $this->get($chapter->getUrl())->assertSee('Watching via parent book');
         $this->get($page->getUrl())->assertSee('Watching via parent book');
 
 
         $this->actingAs($editor)->get($book->getUrl())->assertSee('Watching new pages and updates');
         $this->get($chapter->getUrl())->assertSee('Watching via parent book');
         $this->get($page->getUrl())->assertSee('Watching via parent book');
 

-        (new UserEntityWatchOptions($editor, $chapter))->updateWatchLevel('comments');
+        (new UserEntityWatchOptions($editor, $chapter))->updateLevelByValue(WatchLevels::COMMENTS);

         $this->get($chapter->getUrl())->assertSee('Watching new pages, updates & comments');
         $this->get($page->getUrl())->assertSee('Watching via parent chapter');
 
         $this->get($chapter->getUrl())->assertSee('Watching new pages, updates & comments');
         $this->get($page->getUrl())->assertSee('Watching via parent chapter');
 

-        (new UserEntityWatchOptions($editor, $page))->updateWatchLevel('updates');
+        (new UserEntityWatchOptions($editor, $page))->updateLevelByValue(WatchLevels::UPDATES);

         $this->get($page->getUrl())->assertSee('Watching new pages and updates');
     }
 
         $this->get($page->getUrl())->assertSee('Watching new pages and updates');
     }
 


@@ -130,7 +130,7 @@ class WatchTest extends TestCase
     {
         $editor = $this->users->editor();
         $book = $this->entities->bookHasChaptersAndPages();
     {
         $editor = $this->users->editor();
         $book = $this->entities->bookHasChaptersAndPages();

-        (new UserEntityWatchOptions($editor, $book))->updateWatchLevel('ignore');
+        (new UserEntityWatchOptions($editor, $book))->updateLevelByValue(WatchLevels::IGNORE);

 
         $this->actingAs($editor)->get($book->getUrl())->assertSee('Ignoring notifications');
         $this->get($book->chapters()->first()->getUrl())->assertSee('Ignoring via parent book');
 
         $this->actingAs($editor)->get($book->getUrl())->assertSee('Ignoring notifications');
         $this->get($book->chapters()->first()->getUrl())->assertSee('Ignoring via parent book');


@@ -146,11 +146,11 @@ class WatchTest extends TestCase
         $respHtml = $this->withHtml($this->actingAs($editor)->get($book->getUrl()));
         $respHtml->assertElementNotExists('form[action$="/watching/update"] svg[data-icon="check-circle"]');
 
         $respHtml = $this->withHtml($this->actingAs($editor)->get($book->getUrl()));
         $respHtml->assertElementNotExists('form[action$="/watching/update"] svg[data-icon="check-circle"]');
 

-        $options->updateWatchLevel('comments');
+        $options->updateLevelByValue(WatchLevels::COMMENTS);

         $respHtml = $this->withHtml($this->actingAs($editor)->get($book->getUrl()));
         $respHtml->assertElementExists('form[action$="/watching/update"] button[value="comments"] svg[data-icon="check-circle"]');
 
         $respHtml = $this->withHtml($this->actingAs($editor)->get($book->getUrl()));
         $respHtml->assertElementExists('form[action$="/watching/update"] button[value="comments"] svg[data-icon="check-circle"]');
 

-        $options->updateWatchLevel('ignore');
+        $options->updateLevelByValue(WatchLevels::IGNORE);

         $respHtml = $this->withHtml($this->actingAs($editor)->get($book->getUrl()));
         $respHtml->assertElementExists('form[action$="/watching/update"] button[value="ignore"] svg[data-icon="check-circle"]');
     }
         $respHtml = $this->withHtml($this->actingAs($editor)->get($book->getUrl()));
         $respHtml->assertElementExists('form[action$="/watching/update"] button[value="ignore"] svg[data-icon="check-circle"]');
     }


@@ -159,7 +159,7 @@ class WatchTest extends TestCase
     {
         $editor = $this->users->editor();
         $book = $this->entities->bookHasChaptersAndPages();
     {
         $editor = $this->users->editor();
         $book = $this->entities->bookHasChaptersAndPages();

-        (new UserEntityWatchOptions($editor, $book))->updateWatchLevel('ignore');
+        (new UserEntityWatchOptions($editor, $book))->updateLevelByValue(WatchLevels::IGNORE);

 
         $respHtml = $this->withHtml($this->actingAs($editor)->get($book->getUrl()));
         $respHtml->assertElementExists('form[action$="/watching/update"] button[name="level"][value="new"]');
 
         $respHtml = $this->withHtml($this->actingAs($editor)->get($book->getUrl()));
         $respHtml->assertElementExists('form[action$="/watching/update"] button[name="level"][value="new"]');


@@ -225,7 +225,7 @@ class WatchTest extends TestCase
         $entities = $this->entities->createChainBelongingToUser($editor);
         $watches = new UserEntityWatchOptions($editor, $entities['book']);
         $prefs = new UserNotificationPreferences($editor);
         $entities = $this->entities->createChainBelongingToUser($editor);
         $watches = new UserEntityWatchOptions($editor, $entities['book']);
         $prefs = new UserNotificationPreferences($editor);

-        $watches->updateWatchLevel('ignore');
+        $watches->updateLevelByValue(WatchLevels::IGNORE);

         $prefs->updateFromSettingsArray(['own-page-changes' => 'true', 'own-page-comments' => true]);
 
         $notifications = Notification::fake();
         $prefs->updateFromSettingsArray(['own-page-changes' => 'true', 'own-page-comments' => true]);
 
         $notifications = Notification::fake();


@@ -244,7 +244,7 @@ class WatchTest extends TestCase
         $admin = $this->users->admin();
         $entities = $this->entities->createChainBelongingToUser($editor);
         $watches = new UserEntityWatchOptions($editor, $entities['book']);
         $admin = $this->users->admin();
         $entities = $this->entities->createChainBelongingToUser($editor);
         $watches = new UserEntityWatchOptions($editor, $entities['book']);

-        $watches->updateWatchLevel('comments');
+        $watches->updateLevelByValue(WatchLevels::COMMENTS);

 
         // Comment post
         $this->actingAs($admin)->post("/comment/{$entities['page']->id}", [
 
         // Comment post
         $this->actingAs($admin)->post("/comment/{$entities['page']->id}", [


@@ -269,7 +269,7 @@ class WatchTest extends TestCase
         $admin = $this->users->admin();
         $entities = $this->entities->createChainBelongingToUser($editor);
         $watches = new UserEntityWatchOptions($editor, $entities['book']);
         $admin = $this->users->admin();
         $entities = $this->entities->createChainBelongingToUser($editor);
         $watches = new UserEntityWatchOptions($editor, $entities['book']);

-        $watches->updateWatchLevel('updates');
+        $watches->updateLevelByValue(WatchLevels::UPDATES);

 
         $this->actingAs($admin);
         $this->entities->updatePage($entities['page'], ['name' => 'Updated page', 'html' => 'new page content']);
 
         $this->actingAs($admin);
         $this->entities->updatePage($entities['page'], ['name' => 'Updated page', 'html' => 'new page content']);


@@ -297,7 +297,7 @@ class WatchTest extends TestCase
         $admin = $this->users->admin();
         $entities = $this->entities->createChainBelongingToUser($editor);
         $watches = new UserEntityWatchOptions($editor, $entities['book']);
         $admin = $this->users->admin();
         $entities = $this->entities->createChainBelongingToUser($editor);
         $watches = new UserEntityWatchOptions($editor, $entities['book']);

-        $watches->updateWatchLevel('new');
+        $watches->updateLevelByValue(WatchLevels::NEW);

 
         $this->actingAs($admin)->get($entities['chapter']->getUrl('/create-page'));
         $page = $entities['chapter']->pages()->where('draft', '=', true)->first();
 
         $this->actingAs($admin)->get($entities['chapter']->getUrl('/create-page'));
         $page = $entities['chapter']->pages()->where('draft', '=', true)->first();


@@ -320,7 +320,7 @@ class WatchTest extends TestCase
         $page = $this->entities->page();
 
         $watches = new UserEntityWatchOptions($editor, $page);
         $page = $this->entities->page();
 
         $watches = new UserEntityWatchOptions($editor, $page);

-        $watches->updateWatchLevel('comments');
+        $watches->updateLevelByValue(WatchLevels::COMMENTS);

         $this->permissions->disableEntityInheritedPermissions($page);
 
         $this->asAdmin()->post("/comment/{$page->id}", [
         $this->permissions->disableEntityInheritedPermissions($page);
 
         $this->asAdmin()->post("/comment/{$page->id}", [

diff --git a/tests/User/UserPreferencesTest.php b/tests/User/UserPreferencesTest.php
index 4ee04ea67a7090755c6e8dd6fe63a6f0b37ca60a..9d72f4e1496e0e9c7ca5a60c073859f2f6781b4a 100644 (file)
--- a/tests/User/UserPreferencesTest.php
+++ b/tests/User/UserPreferencesTest.php
@@ -3,6 +3,7 @@
 namespace Tests\User;
 
 use BookStack\Activity\Tools\UserEntityWatchOptions;
 namespace Tests\User;
 
 use BookStack\Activity\Tools\UserEntityWatchOptions;

+use BookStack\Activity\WatchLevels;

 use Tests\TestCase;
 
 class UserPreferencesTest extends TestCase
 use Tests\TestCase;
 
 class UserPreferencesTest extends TestCase


@@ -110,13 +111,13 @@ class UserPreferencesTest extends TestCase
         $book = $this->entities->book();
 
         $options = new UserEntityWatchOptions($editor, $book);
         $book = $this->entities->book();
 
         $options = new UserEntityWatchOptions($editor, $book);

-        $options->updateWatchLevel('comments');
+        $options->updateLevelByValue(WatchLevels::COMMENTS);

 
         $resp = $this->actingAs($editor)->get('/preferences/notifications');
         $resp->assertSee($book->name);
         $resp->assertSee('All Page Updates & Comments');
 
 
         $resp = $this->actingAs($editor)->get('/preferences/notifications');
         $resp->assertSee($book->name);
         $resp->assertSee('All Page Updates & Comments');
 

-        $options->updateWatchLevel('default');
+        $options->updateLevelByValue(WatchLevels::DEFAULT);

 
         $resp = $this->actingAs($editor)->get('/preferences/notifications');
         $resp->assertDontSee($book->name);
 
         $resp = $this->actingAs($editor)->get('/preferences/notifications');
         $resp->assertDontSee($book->name);