Notifications: Updated comment notif. prefs. test

Combined testcases, updated to use actual text strings, and set comments
setting via correct method.

Made during review of #4552

diff --git a/tests/User/UserPreferencesTest.php b/tests/User/UserPreferencesTest.php
index 30e7bb5405842feefcbeadf4e383b73e6d1c9301..4a6cba7b32c59ceee59a2f5e060ca7b9d3729a0b 100644 (file)
--- a/tests/User/UserPreferencesTest.php
+++ b/tests/User/UserPreferencesTest.php
@@ -156,6 +156,19 @@ class UserPreferencesTest extends TestCase
         $this->assertPermissionError($resp);
     }
 
+    public function test_notification_comment_options_only_exist_if_comments_active()
+    {
+        $resp = $this->asEditor()->get('/preferences/notifications');
+        $resp->assertSee('Notify upon comments');
+        $resp->assertSee('Notify upon replies');
+
+        setting()->put('app-disable-comments', true);
+
+        $resp = $this->get('/preferences/notifications');
+        $resp->assertDontSee('Notify upon comments');
+        $resp->assertDontSee('Notify upon replies');
+    }
+
     public function test_update_sort_preference()
     {
         $editor = $this->users->editor();
@@ -318,35 +331,4 @@ class UserPreferencesTest extends TestCase
         $resp = $this->get($page->getUrl('/edit'));
         $resp->assertSee('option:code-editor:favourites="javascript,ruby"', false);
     }
-
-    public function test_comment_notifications_hidden_when_comments_disabled()
-    {
-        $editor = $this->users->editor();
-
-
-        setting()->putUser($editor, 'app-disable-comments', true);
-
-        $settingLabel1 = trans('preferences.notifications_opt_own_page_comments');
-        $settingLabel2 = trans('preferences.notifications_opt_comment_replies');
-
-        $resp = $this->actingAs($editor)->get('/preferences/notifications');
-
-        $resp->assertDontSee($settingLabel1, true);
-        $resp->assertDontSee($settingLabel2, true);
-    }
-
-    public function test_comment_notifications_visible_when_comments_enabled()
-    {
-        $editor = $this->users->editor();
-
-        setting()->putUser($editor, 'app-disable-comments', false);
-
-        $settingLabel1 = trans('preferences.notifications_opt_own_page_comments');
-        $settingLabel2 = trans('preferences.notifications_opt_comment_replies');
-
-        $resp = $this->actingAs($editor)->get('/preferences/notifications');
-
-        $resp->assertSee($settingLabel1, true);
-        $resp->assertSee($settingLabel2, true);
-    }
 }