From 90a1406e3e887dce3493b246b53e76c4b72ae1f1 Mon Sep 17 00:00:00 2001
From: weeklies <80141759+weeklies@users.noreply.github.com>
Date: Sun, 21 Apr 2024 22:45:13 +0200
Subject: [PATCH] AO3-6491 Change default comment setting to registered users
 only (#4556)

* AO3-6491 Set default comment permissions to users only

* AO3-6491 Fix tests, make sure correct notice is shown to admins

* AO3-6491 Display non-Archive users error to admins on admin posts

* AO3-6491 Don't edit when error notice is shown in commentable

* AO3-6491 Correct feature step to ensure correct error notice

* AO3-6491 Feedback

* AO3-6491 Correct test to not assume guest comments enabled by default

* AO3-6491 Fix CommentsController spec

* AO3-6491 Fix the comments controller spec...

* AO3-6491 A happier Hound

* AO3-6491 Try to fix failing tests

* Tidy and try to fix tests

* AO3-6491 Fix features first

* AO3-6491 Fix and tidy specs

* AO3-6491 Remove wrong trait

* AO3-6491 Step consistency

* AO3-6491 Fix some tests..............

* AO3-6491 hello darkness my old friend

* AO3-6491 plz work?
---
 app/models/work.rb                            |   2 +-
 app/views/works/new_import.html.erb           |   4 +-
 factories/comments.rb                         |   4 +
 factories/works.rb                            |   4 +
 features/admins/admin_settings.feature        |  10 +-
 .../guest_comment_replies.feature             |   6 +-
 .../comments_and_kudos/guest_comments.feature |   2 +-
 .../comments_and_kudos/hidden_works.feature   |   4 +-
 .../comments_and_kudos/spam_comments.feature  |   4 +-
 features/importing/work_import.feature        |   1 +
 features/step_definitions/comment_steps.rb    |  14 +-
 features/step_definitions/work_steps.rb       |  18 ++
 public/help/who-can-comment-on-this-work.html |   4 +-
 spec/controllers/comments_controller_spec.rb  | 193 ++++++++++--------
 14 files changed, 163 insertions(+), 107 deletions(-)

diff --git a/app/models/work.rb b/app/models/work.rb
index da0501e4f98..06fe678cc48 100755
--- a/app/models/work.rb
+++ b/app/models/work.rb
@@ -218,7 +218,7 @@ def new_recipients_have_not_blocked_gift_giver
     enable_all: 0,
     disable_anon: 1,
     disable_all: 2
-  }, _suffix: :comments
+  }, _suffix: :comments, _default: 1
 
   ########################################################################
   # HOOKS
diff --git a/app/views/works/new_import.html.erb b/app/views/works/new_import.html.erb
index 67cc8654a7f..e81a8263b27 100644
--- a/app/views/works/new_import.html.erb
+++ b/app/views/works/new_import.html.erb
@@ -150,11 +150,11 @@
         <fieldset>
           <ul>
             <li>
-              <%= radio_button_tag "comment_permissions", "enable_all", true %>
+              <%= radio_button_tag "comment_permissions", "enable_all" %>
               <%= label_tag "comment_permissions_enable_all", t("comments.commentable.permissions.options.enable_all") %>
             </li>
             <li>
-              <%= radio_button_tag "comment_permissions", "disable_anon" %>
+              <%= radio_button_tag "comment_permissions", "disable_anon", true %>
               <%= label_tag "comment_permissions_disable_anon", t("comments.commentable.permissions.options.disable_anon") %>
             </li>
             <li>
diff --git a/factories/comments.rb b/factories/comments.rb
index 90099f5e89b..ee4145dbf64 100644
--- a/factories/comments.rb
+++ b/factories/comments.rb
@@ -20,6 +20,10 @@
       commentable { create(:fandom) }
     end
 
+    trait :on_work_with_guest_comments_on do
+      commentable { create(:work, :guest_comments_on).first_chapter }
+    end
+
     trait :unreviewed do
       commentable { create(:work, moderated_commenting_enabled: true).last_posted_chapter }
       unreviewed { true }
diff --git a/factories/works.rb b/factories/works.rb
index 0b42a9482b5..65304995143 100644
--- a/factories/works.rb
+++ b/factories/works.rb
@@ -32,6 +32,10 @@
     factory :draft do
       posted { false }
     end
+
+    trait :guest_comments_on do
+      comment_permissions { :enable_all }
+    end
   end
 
   factory :external_work do
diff --git a/features/admins/admin_settings.feature b/features/admins/admin_settings.feature
index 320f003be3a..693daf83afe 100644
--- a/features/admins/admin_settings.feature
+++ b/features/admins/admin_settings.feature
@@ -24,7 +24,7 @@ Feature: Admin Settings Page
       And I edit the tag "Ianto Jones"
     Then I should see "Wrangling is disabled at the moment. Please check back later."
       And I should not see "Synonym of"
-    
+
   Scenario: Turn off Support form
     Given the support form is disabled and its text field set to "Please don't contact us"
     When I am logged in as a random user
@@ -41,12 +41,13 @@ Feature: Admin Settings Page
     Given guest comments are on
       And I am logged out
       And <commentable>
+      And <commentable> with guest comments enabled
       And I view <commentable> with comments
     When I post a guest comment
     Then I should see a link "Reply"
 
     Examples:
-        | commentable | 
+        | commentable |
         | the work "Generic Work" |
         | the admin post "Generic Post" |
 
@@ -54,6 +55,7 @@ Feature: Admin Settings Page
     Given guest comments are off
       And I am logged out
       And <commentable>
+      And <commentable> with guest comments enabled
       And a guest comment on <commentable>
     When I view <commentable> with comments
     Then I should see "Sorry, the Archive doesn't allow guests to comment right now."
@@ -64,12 +66,12 @@ Feature: Admin Settings Page
     When I am logged in as a super admin
       And I view <commentable> with comments
     Then I should not see "Sorry, the Archive doesn't allow guests to comment right now."
-    
+
     Examples:
         | commentable |
         | the work "Generic Work"  |
         | the admin post "Generic Post" |
-    
+
   Scenario: Turn off guest comments (when the work itself does not allow guest comments)
     Given guest comments are off
       And I am logged in as "author"
diff --git a/features/comments_and_kudos/guest_comment_replies.feature b/features/comments_and_kudos/guest_comment_replies.feature
index 8beec416916..48fae1dbe18 100644
--- a/features/comments_and_kudos/guest_comment_replies.feature
+++ b/features/comments_and_kudos/guest_comment_replies.feature
@@ -2,6 +2,7 @@ Feature: Disallowing guest comment replies
 
   Scenario Outline: Guests cannot reply to a user who has guest comments off on news posts and other users' works
     Given <commentable>
+      And <commentable> with guest comments enabled
       And the user "commenter" turns off guest comment replies
       And a comment "OMG!" by "commenter" on <commentable>
     When I view <commentable> with comments
@@ -18,7 +19,7 @@ Feature: Disallowing guest comment replies
       | the admin post "Change Log" |
 
   Scenario: Guests can reply to a user who has guest comments off on their own work
-    Given the work "Aftermath" by "creator"
+    Given the work "Aftermath" by "creator" with guest comments enabled
       And the user "creator" turns off guest comment replies
       And a comment "OMG!" by "creator" on the work "Aftermath"
     When I view the work "Aftermath" with comments
@@ -31,7 +32,7 @@ Feature: Disallowing guest comment replies
 
   Scenario: Guests can reply to a user who has guest comments off on works co-created by the user
     Given the user "nemesis" turns off guest comment replies
-      And the work "Aftermath" by "creator" and "nemesis"
+      And the work "Aftermath" by "creator" and "nemesis" with guest comments enabled
       And a comment "OMG!" by "nemesis" on the work "Aftermath"
     When I view the work "Aftermath" with comments
     Then I should see a "Comment" button
@@ -58,6 +59,7 @@ Feature: Disallowing guest comment replies
 
   Scenario: Guests can reply to guests
     Given the work "Aftermath"
+      And the work "Aftermath" with guest comments enabled
       And a guest comment on the work "Aftermath"
     When I view the work "Aftermath" with comments
     Then I should see a "Comment" button
diff --git a/features/comments_and_kudos/guest_comments.feature b/features/comments_and_kudos/guest_comments.feature
index 73cfb31f8d4..5459168b174 100644
--- a/features/comments_and_kudos/guest_comments.feature
+++ b/features/comments_and_kudos/guest_comments.feature
@@ -6,7 +6,7 @@ Feature: Read guest comments
 
 Scenario: View guest comments in homepage, inbox and works
   Given I am logged in as "normal_user"
-    And I post the work "My very meta work about AO3"
+    And I post the work "My very meta work about AO3" with guest comments enabled
     And I am logged out
   When I post a guest comment
   Then I should see "(Guest)"
diff --git a/features/comments_and_kudos/hidden_works.feature b/features/comments_and_kudos/hidden_works.feature
index 9becf4207f0..e5e2ea5f197 100644
--- a/features/comments_and_kudos/hidden_works.feature
+++ b/features/comments_and_kudos/hidden_works.feature
@@ -2,7 +2,7 @@ Feature: Comments on Hidden Works
 
   Scenario: When a work is hidden, admins and the creator can see (but not edit or add) comments, while everyone else is redirected.
     Given I am logged in as "creator"
-      And I post the work "To Be Hidden"
+      And I post the work "To Be Hidden" with guest comments enabled
       And I post the comment "Can I change this?" on the work "To Be Hidden"
       And I am logged in as "commenter"
       And I post the comment "Do you see?" on the work "To Be Hidden"
@@ -40,7 +40,7 @@ Feature: Comments on Hidden Works
 
   Scenario: When a work is unrevealed, admins and the creator can see (but not edit or add) comments, while everyone else is redirected.
     Given I am logged in as "creator"
-      And I post the work "Murder, She Wrote"
+      And I post the work "Murder, She Wrote" with guest comments enabled
       And I post the comment "Can I change this?" on the work "Murder, She Wrote"
       And I am logged in as "commenter"
       And I post the comment "Do you see?" on the work "Murder, She Wrote"
diff --git a/features/comments_and_kudos/spam_comments.feature b/features/comments_and_kudos/spam_comments.feature
index ef87225955a..2023b0e7363 100644
--- a/features/comments_and_kudos/spam_comments.feature
+++ b/features/comments_and_kudos/spam_comments.feature
@@ -3,7 +3,7 @@ Feature: Marking comments as spam
 
   Scenario: Spam comments are not included in a work's comment count
     Given I am logged in as "author"
-      And I post the work "Popular Fic"
+      And I post the work "Popular Fic" with guest comments enabled
       And I log out
       And I view the work "Popular Fic" with comments
       And I post a guest comment
@@ -49,7 +49,7 @@ Feature: Marking comments as spam
 
   Scenario: Author can mark comments as spam
     Given I am logged in as "author"
-      And I post the work "Popular Fic"
+      And I post the work "Popular Fic" with guest comments enabled
       And I log out
     When I view the work "Popular Fic" with comments
       And I post a spam comment
diff --git a/features/importing/work_import.feature b/features/importing/work_import.feature
index b28e5b5f42d..a4325c6d809 100644
--- a/features/importing/work_import.feature
+++ b/features/importing/work_import.feature
@@ -195,6 +195,7 @@ Feature: Import Works
 
   Scenario: Imported works can have comment moderation on
     When I start importing "http://import-site-with-tags" with a mock website
+      And I choose "comment_permissions_enable_all"
       And I check "moderated_commenting_enabled"
       And I press "Import"
       And I press "Post"
diff --git a/features/step_definitions/comment_steps.rb b/features/step_definitions/comment_steps.rb
index 9167278d888..1af5dfd6190 100644
--- a/features/step_definitions/comment_steps.rb
+++ b/features/step_definitions/comment_steps.rb
@@ -30,6 +30,11 @@
   }
 )
 
+Given "{commentable} with guest comments enabled" do |commentable|
+  assert !commentable.is_a?(Tag)
+  commentable.update_attribute(:comment_permissions, :enable_all)
+end
+
 Given "a guest comment on {commentable}" do |commentable|
   commentable = Comment.commentable_object(commentable)
   FactoryBot.create(:comment, :by_guest, commentable: commentable)
@@ -87,6 +92,13 @@
   fill_in("comment[comment_content]", with: comment_text)
 end
 
+When "I set up the comment {string} on the work {string} with guest comments enabled" do |comment_text, work|
+  work = Work.find_by(title: work)
+  work.update_attribute(:comment_permissions, :enable_all)
+  visit work_path(work)
+  fill_in("comment[comment_content]", with: comment_text)
+end
+
 When /^I attempt to comment on "([^"]*)" with a pseud that is not mine$/ do |work|
   step %{I am logged in as "commenter"}
   step %{I set up the comment "This is a test" on the work "#{work}"}
@@ -112,7 +124,7 @@
 
 When /^I post the comment "([^"]*)" on the work "([^"]*)" as a guest(?: with email "([^"]*)")?$/ do |comment_text, work, email|
   step "I start a new session"
-  step "I set up the comment \"#{comment_text}\" on the work \"#{work}\""
+  step %{I set up the comment "#{comment_text}" on the work "#{work}" with guest comments enabled}
   fill_in("Guest name", with: "guest")
   fill_in("Guest email", with: (email || "guest@foo.com"))
   click_button "Comment"
diff --git a/features/step_definitions/work_steps.rb b/features/step_definitions/work_steps.rb
index c02c7647e12..0086cbfe51f 100644
--- a/features/step_definitions/work_steps.rb
+++ b/features/step_definitions/work_steps.rb
@@ -214,12 +214,23 @@
   FactoryBot.create(:work, title: title, authors: [user.default_pseud])
 end
 
+Given "the work {string} by {string} with guest comments enabled" do |title, login|
+  user = ensure_user(login)
+  FactoryBot.create(:work, :guest_comments_on, title: title, authors: [user.default_pseud])
+end
+
 Given "the work {string} by {string} and {string}" do |title, login1, login2|
   user1 = ensure_user(login1)
   user2 = ensure_user(login2)
   FactoryBot.create(:work, title: title, authors: [user1.default_pseud, user2.default_pseud])
 end
 
+Given "the work {string} by {string} and {string} with guest comments enabled" do |title, login1, login2|
+  user1 = ensure_user(login1)
+  user2 = ensure_user(login2)
+  FactoryBot.create(:work, :guest_comments_on, title: title, authors: [user1.default_pseud, user2.default_pseud])
+end
+
 Given /^the work "([^\"]*)" by "([^\"]*)" with chapter two co-authored with "([^\"]*)"$/ do |work, author, coauthor|
   step %{I am logged in as "#{author}"}
   step %{I post the work "#{work}"}
@@ -315,6 +326,12 @@
   step %{I post the work "#{title}"}
 end
 
+When "I post the work {string} with guest comments enabled" do |title|
+  step %{I set up the draft "#{title}"}
+  choose("Registered users and guests can comment")
+  step "I post the work without preview"
+end
+
 When /^a chapter is added to "([^"]*)"$/ do |work_title|
   step %{a draft chapter is added to "#{work_title}"}
   click_button("Post")
@@ -419,6 +436,7 @@
 When /^I edit multiple works with different comment moderation settings$/ do
   step %{I set up the draft "Work with Comment Moderation Enabled"}
   check("work_moderated_commenting_enabled")
+  choose("Registered users and guests can comment")
   step %{I post the work without preview}
   step %{I post the work "Work with Comment Moderation Disabled"}
   step %{I go to my edit multiple works page}
diff --git a/public/help/who-can-comment-on-this-work.html b/public/help/who-can-comment-on-this-work.html
index 14eabf6d4de..7d3ee9c2ad7 100644
--- a/public/help/who-can-comment-on-this-work.html
+++ b/public/help/who-can-comment-on-this-work.html
@@ -1,9 +1,9 @@
 <h4>Who can comment on this work?</h4>
 <dl>
   <dt>Registered users and guests can comment</dt>
-  <dd>This is the default option. All users can comment on your work whether they are logged in or not.</dd>
+  <dd>All users can comment on your work whether they are logged in or not.</dd>
   <dt>Only registered users can comment</dt>
-  <dd>With this enabled, only logged in users will be able to comment on your work.</dd>
+  <dd><strong>This is the default option.</strong> With this enabled, only logged in users will be able to comment on your work.</dd>
   <dt>No one can comment</dt>
   <dd>This will disable all new comments on your work.</dd>
 </dl>
diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
index 86aad5df5b5..55750e4ca57 100644
--- a/spec/controllers/comments_controller_spec.rb
+++ b/spec/controllers/comments_controller_spec.rb
@@ -12,30 +12,38 @@
   end
 
   describe "GET #add_comment_reply" do
-    context "when comment is unreviewed" do
-      it "redirects logged out user to login path with an error" do
-        get :add_comment_reply, params: { comment_id: unreviewed_comment.id }
-        it_redirects_to_with_error(new_user_session_path, "Sorry, you cannot reply to an unapproved comment.")
-      end
+    context "when comment permissions are enable_all" do
+      let(:moderated_work) { create(:work, :guest_comments_on, moderated_commenting_enabled: true) }
+      let(:unmoderated_work) { create(:work, :guest_comments_on) }
 
-      it "redirects logged in user to root path with an error" do
-        fake_login
-        get :add_comment_reply, params: { comment_id: unreviewed_comment.id }
-        it_redirects_to_with_error(root_path, "Sorry, you cannot reply to an unapproved comment.")
-      end
-    end
+      let(:comment) { create(:comment, commentable: unmoderated_work.first_chapter) }
+      let(:unreviewed_comment) { create(:comment, :unreviewed, commentable: moderated_work.first_chapter) }
 
-    context "when comment is not unreviewed" do
-      it "redirects to the comment on the commentable without an error" do
-        get :add_comment_reply, params: { comment_id: comment.id }
-        expect(flash[:error]).to be_nil
-        expect(response).to redirect_to(chapter_path(comment.commentable, show_comments: true, anchor: "comment_#{comment.id}"))
+      context "when comment is unreviewed" do
+        it "redirects logged out user to login path with an error" do
+          get :add_comment_reply, params: { comment_id: unreviewed_comment.id }
+          it_redirects_to_with_error(new_user_session_path, "Sorry, you cannot reply to an unapproved comment.")
+        end
+
+        it "redirects logged in user to root path with an error" do
+          fake_login
+          get :add_comment_reply, params: { comment_id: unreviewed_comment.id }
+          it_redirects_to_with_error(root_path, "Sorry, you cannot reply to an unapproved comment.")
+        end
       end
 
-      it "redirects to the comment on the commentable with the reply form open and without an error" do
-        get :add_comment_reply, params: { comment_id: comment.id, id: comment.id }
-        expect(flash[:error]).to be_nil
-        expect(response).to redirect_to(chapter_path(comment.commentable, add_comment_reply_id: comment.id, show_comments: true, anchor: "comment_#{comment.id}"))
+      context "when comment is not unreviewed" do
+        it "redirects to the comment on the commentable without an error" do
+          get :add_comment_reply, params: { comment_id: comment.id }
+          expect(flash[:error]).to be_nil
+          expect(response).to redirect_to(chapter_path(comment.commentable, show_comments: true, anchor: "comment_#{comment.id}"))
+        end
+
+        it "redirects to the comment on the commentable with the reply form open and without an error" do
+          get :add_comment_reply, params: { comment_id: comment.id, id: comment.id }
+          expect(flash[:error]).to be_nil
+          expect(response).to redirect_to(chapter_path(comment.commentable, add_comment_reply_id: comment.id, show_comments: true, anchor: "comment_#{comment.id}"))
+        end
       end
     end
 
@@ -66,7 +74,7 @@
       end
 
       context "when commentable is a work" do
-        let(:comment) { create(:comment, iced: true) }
+        let(:comment) { create(:comment, :on_work_with_guest_comments_on, iced: true) }
 
         it_behaves_like "no one can add comment reply on a frozen comment"
       end
@@ -98,15 +106,15 @@
         it_behaves_like "no one can add comment reply on a hidden comment"
       end
 
-      context "when commentable is a work" do
-        let(:comment) { create(:comment, hidden_by_admin: true) }
+      context "when commentable is a work with guest comments enabled" do
+        let(:comment) { create(:comment, :on_work_with_guest_comments_on, hidden_by_admin: true) }
 
         it_behaves_like "no one can add comment reply on a hidden comment"
       end
     end
 
-    context "guest comments are turned on in admin settings" do
-      let(:comment) { create(:comment) }
+    context "guest comments are turned on in work and admin settings" do
+      let(:comment) { create(:comment, :on_work_with_guest_comments_on) }
       let(:admin_setting) { AdminSetting.first || AdminSetting.create }
 
       before do
@@ -213,21 +221,21 @@
         it_behaves_like "guest cannot reply to a user with guest replies disabled"
       end
 
-      context "when commentable is a work" do
-        let(:comment) { create(:comment, pseud: user.default_pseud) }
+      context "when commentable is a work with guest comments enabled" do
+        let(:comment) { create(:comment, :on_work_with_guest_comments_on, pseud: user.default_pseud) }
 
         it_behaves_like "guest cannot reply to a user with guest replies disabled"
       end
 
-      context "when commentable is user's work" do
-        let(:work) { create(:work, authors: [user.default_pseud]) }
+      context "when commentable is user's work with guest comments enabled" do
+        let(:work) { create(:work, :guest_comments_on, authors: [user.default_pseud]) }
         let(:comment) { create(:comment, pseud: user.default_pseud, commentable: work.first_chapter) }
 
         it_behaves_like "guest can reply to a user with guest replies disabled on user's work"
       end
 
-      context "when commentable is user's co-creation" do
-        let(:work) { create(:work, authors: [create(:user).default_pseud, user.default_pseud]) }
+      context "when commentable is user's co-creation with guest comments enabled" do
+        let(:work) { create(:work, :guest_comments_on, authors: [create(:user).default_pseud, user.default_pseud]) }
         let(:comment) { create(:comment, pseud: user.default_pseud, commentable: work.first_chapter) }
 
         it_behaves_like "guest can reply to a user with guest replies disabled on user's work"
@@ -235,7 +243,7 @@
     end
 
     context "when replying to guests" do
-      let(:comment) { create(:comment, :by_guest) }
+      let(:comment) { create(:comment, :by_guest, :on_work_with_guest_comments_on) }
 
       it "redirects guest user without an error" do
         get :add_comment_reply, params: { comment_id: comment.id }
@@ -344,24 +352,24 @@
 
     context "guest comments are turned on in admin settings" do
       let(:work) { create(:work) }
-      let(:work_with_guest_comment_off) { create(:work, comment_permissions: :disable_anon) }
+      let(:work_with_guest_comment_on) { create(:work, :guest_comments_on) }
       let(:admin_setting) { AdminSetting.first || AdminSetting.create }
 
       before do
         admin_setting.update_attribute(:guest_comments_off, false)
       end
 
-      it "allows guest comments" do
+      it "does not allow guest comments" do
         get :new, params: { work_id: work.id }
 
-        expect(response).to render_template(:new)
+        it_redirects_to_with_error(work_path(work),
+                                   "Sorry, this work doesn't allow non-Archive users to comment.")
       end
 
-      it "does not allow guest comments when work has guest comments disabled" do
-        get :new, params: { work_id: work_with_guest_comment_off.id }
+      it "allows guest comments when work has guest comments enabled" do
+        get :new, params: { work_id: work_with_guest_comment_on.id }
 
-        it_redirects_to_with_error(work_path(work_with_guest_comment_off), 
-                                   "Sorry, this work doesn't allow non-Archive users to comment.")
+        expect(response).to render_template(:new)
       end
     end
 
@@ -411,23 +419,27 @@
       end
     end
 
-    it "renders the :new template if commentable is a valid comment" do
-      comment = create(:comment)
-      get :new, params: { comment_id: comment.id }
-      expect(response).to render_template("new")
-      expect(assigns(:name)).to eq("Previous Comment")
-    end
+    context "when work comment permissions are enable_all" do
+      let(:work) { create(:work, :guest_comments_on) }
 
-    it "shows an error and redirects if commentable is a frozen comment" do
-      comment = create(:comment, iced: true)
-      get :new, params: { comment_id: comment.id }
-      it_redirects_to_with_error("/where_i_came_from", "Sorry, you cannot reply to a frozen comment.")
-    end
+      it "renders the :new template if commentable is a valid comment" do
+        comment = create(:comment, commentable: work)
+        get :new, params: { comment_id: comment.id }
+        expect(response).to render_template("new")
+        expect(assigns(:name)).to eq("Previous Comment")
+      end
+
+      it "shows an error and redirects if commentable is a frozen comment" do
+        comment = create(:comment, iced: true, commentable: work)
+        get :new, params: { comment_id: comment.id }
+        it_redirects_to_with_error("/where_i_came_from", "Sorry, you cannot reply to a frozen comment.")
+      end
 
-    it "shows an error and redirects if commentable is a hidden comment" do
-      comment = create(:comment, hidden_by_admin: true)
-      get :new, params: { comment_id: comment.id }
-      it_redirects_to_with_error("/where_i_came_from", "Sorry, you cannot reply to a hidden comment.")
+      it "shows an error and redirects if commentable is a hidden comment" do
+        comment = create(:comment, hidden_by_admin: true, commentable: work)
+        get :new, params: { comment_id: comment.id }
+        it_redirects_to_with_error("/where_i_came_from", "Sorry, you cannot reply to a hidden comment.")
+      end
     end
 
     shared_examples "guest cannot reply to a user with guest replies disabled" do
@@ -478,21 +490,21 @@
         it_behaves_like "guest cannot reply to a user with guest replies disabled"
       end
 
-      context "when commentable is a work" do
-        let(:comment) { create(:comment, pseud: user.default_pseud) }
+      context "when commentable is a work with guest comments enabled" do
+        let(:comment) { create(:comment, :on_work_with_guest_comments_on, pseud: user.default_pseud) }
 
         it_behaves_like "guest cannot reply to a user with guest replies disabled"
       end
 
-      context "when comment is on user's work" do
-        let(:work) { create(:work, authors: [user.default_pseud]) }
+      context "when comment is on user's work with guest comments enabled" do
+        let(:work) { create(:work, :guest_comments_on, authors: [user.default_pseud]) }
         let(:comment) { create(:comment, pseud: user.default_pseud, commentable: work.first_chapter) }
 
         it_behaves_like "guest can reply to a user with guest replies disabled on user's work"
       end
 
       context "when commentable is user's co-creation" do
-        let(:work) { create(:work, authors: [create(:user).default_pseud, user.default_pseud]) }
+        let(:work) { create(:work, :guest_comments_on, authors: [create(:user).default_pseud, user.default_pseud]) }
         let(:comment) { create(:comment, pseud: user.default_pseud, commentable: work.first_chapter) }
 
         it_behaves_like "guest can reply to a user with guest replies disabled on user's work"
@@ -697,49 +709,50 @@
         end
       end
 
-      context "when the commentable is frozen" do
-        let(:comment) { create(:comment, iced: true) }
+      context "with guest comments enabled" do
+        let(:work_with_guest_comment_on) { create(:work, :guest_comments_on) }
 
-        it "shows an error and redirects" do
-          post :create, params: { comment_id: comment.id, comment: anon_comment_attributes }
-          it_redirects_to_with_error("/where_i_came_from",
-                                     "Sorry, you cannot reply to a frozen comment.")
+        context "when the commentable is frozen" do
+          let(:comment) { create(:comment, iced: true, commentable: work_with_guest_comment_on) }
+
+          it "shows an error and redirects" do
+            post :create, params: { comment_id: comment.id, comment: anon_comment_attributes }
+            it_redirects_to_with_error("/where_i_came_from", "Sorry, you cannot reply to a frozen comment.")
+          end
         end
-      end
 
-      context "when the commentable is hidden" do
-        let(:comment) { create(:comment, hidden_by_admin: true) }
+        context "when the commentable is hidden" do
+          let(:comment) { create(:comment, hidden_by_admin: true, commentable: work_with_guest_comment_on) }
 
-        it "shows an error and redirects" do
-          post :create, params: { comment_id: comment.id, comment: anon_comment_attributes }
-          it_redirects_to_with_error("/where_i_came_from",
-                                     "Sorry, you cannot reply to a hidden comment.")
+          it "shows an error and redirects" do
+            post :create, params: { comment_id: comment.id, comment: anon_comment_attributes }
+            it_redirects_to_with_error("/where_i_came_from", "Sorry, you cannot reply to a hidden comment.")
+          end
         end
-      end
 
-      context "when the commentable is spam" do
-        let(:spam_comment) { create(:comment) }
+        context "when the commentable is spam" do
+          let(:spam_comment) { create(:comment, commentable: work_with_guest_comment_on) }
 
-        before { spam_comment.update_attribute(:approved, false) }
+          before { spam_comment.update_attribute(:approved, false) }
 
-        it "shows an error and redirects if commentable is a comment marked as spam" do
-          post :create, params: { comment_id: spam_comment.id, comment: anon_comment_attributes }
+          it "shows an error and redirects if commentable is a comment marked as spam" do
+            post :create, params: { comment_id: spam_comment.id, comment: anon_comment_attributes }
 
-          it_redirects_to_with_error("/where_i_came_from",
-                                     "Sorry, you can't reply to a comment that has been marked as spam.")
+            it_redirects_to_with_error("/where_i_came_from", "Sorry, you can't reply to a comment that has been marked as spam.")
+          end
         end
       end
     end
 
     context "guest comments are turned on in admin settings" do
-      let(:work) { create(:work) }
+      let(:work) { create(:work, :guest_comments_on) }
       let(:admin_setting) { AdminSetting.first || AdminSetting.create }
 
       before do
         admin_setting.update_attribute(:guest_comments_off, false)
       end
 
-      it "allows guest comments" do
+      it "allows guest comments when work has guest comments enabled" do
         post :create, params: { work_id: work.id, comment: anon_comment_attributes }
 
         expect(flash[:error]).to be_nil
@@ -855,21 +868,21 @@
         it_behaves_like "guest cannot reply to a user with guest replies disabled"
       end
 
-      context "when commentable is a work" do
-        let(:comment) { create(:comment, pseud: user.default_pseud) }
+      context "when commentable is a work with guest comments enabled" do
+        let(:comment) { create(:comment, :on_work_with_guest_comments_on, pseud: user.default_pseud) }
 
         it_behaves_like "guest cannot reply to a user with guest replies disabled"
       end
 
-      context "when comment is on user's work" do
-        let(:work) { create(:work, authors: [user.default_pseud]) }
+      context "when comment is on user's work with guest comments enabled" do
+        let(:work) { create(:work, :guest_comments_on, authors: [user.default_pseud]) }
         let(:comment) { create(:comment, pseud: user.default_pseud, commentable: work.first_chapter) }
 
         it_behaves_like "guest can reply to a user with guest replies disabled on user's work"
       end
 
-      context "when commentable is user's co-creation" do
-        let(:work) { create(:work, authors: [create(:user).default_pseud, user.default_pseud]) }
+      context "when commentable is user's co-creation with guest comments enabled" do
+        let(:work) { create(:work, :guest_comments_on, authors: [create(:user).default_pseud, user.default_pseud]) }
         let(:comment) { create(:comment, pseud: user.default_pseud, commentable: work.first_chapter) }
 
         it_behaves_like "guest can reply to a user with guest replies disabled on user's work"
@@ -3179,7 +3192,7 @@
                 admin.update!(roles: [admin_role])
                 fake_login_admin(admin)
                 delete :destroy, params: { id: comment.id }
-  
+
                 it_redirects_to_with_error(root_path, "Sorry, only an authorized admin can access the page you were trying to reach.")
                 expect { comment.reload }.not_to raise_exception
               end
@@ -3297,7 +3310,7 @@
                 admin.update!(roles: [admin_role])
                 fake_login_admin(admin)
                 delete :destroy, params: { id: comment.id }
-  
+
                 it_redirects_to_with_error(root_path, "Sorry, only an authorized admin can access the page you were trying to reach.")
                 expect { comment.reload }.not_to raise_exception
               end