From 23b7f409c73ec2ec61825ad1293aca977c6dc2ad Mon Sep 17 00:00:00 2001
From: Ceithir <ceathramh@gmail.com>
Date: Thu, 10 Nov 2022 17:18:29 +0100
Subject: [PATCH 01/20] Hide comment actions same as with JS

https://otwarchive.atlassian.net/browse/AO3-6392
Reproduce the behavior of add_comment_reply.js
---
 app/views/comments/_comment_actions.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/comments/_comment_actions.html.erb b/app/views/comments/_comment_actions.html.erb
index 3a69b9f7f09..ad4b9a39b12 100644
--- a/app/views/comments/_comment_actions.html.erb
+++ b/app/views/comments/_comment_actions.html.erb
@@ -1,6 +1,6 @@
 <h5 class="landmark heading"><%= ts("Comment Actions") %></h5>
 
-<ul class="actions" id="navigation_for_comment_<%= comment.id %>">
+<ul class="actions" id="navigation_for_comment_<%= comment.id %>" <% if params[:add_comment_reply_id] && params[:add_comment_reply_id] == comment.id.to_s %>style="display:none;"<% end %>>
   <% # The effect is "Frozen" replaces "Reply." We can't do that in the helper
      # method for the reply link because that would prevent "Frozen" from
      # appearing on the Unreviewed Comments page for works with moderated

From 5b1d7ecbb6ee0bd2b3044fa166d77282702db48a Mon Sep 17 00:00:00 2001
From: Ceithir <ceathramh@gmail.com>
Date: Thu, 10 Nov 2022 18:18:03 +0100
Subject: [PATCH 02/20] Fix Cancel button on non-JS reply

By forcing a non-JS behavior
https://otwarchive.atlassian.net/browse/AO3-6392
---
 app/helpers/comments_helper.rb            | 4 ++--
 app/views/comments/_comment_form.html.erb | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/helpers/comments_helper.rb b/app/helpers/comments_helper.rb
index e51e7462b52..37b3a22cb91 100644
--- a/app/helpers/comments_helper.rb
+++ b/app/helpers/comments_helper.rb
@@ -206,7 +206,7 @@ def add_comment_reply_link(comment)
   end
 
   # return link to cancel new reply to a comment
-  def cancel_comment_reply_link(comment)
+  def cancel_comment_reply_link(comment, remote = true)
     commentable_id = comment.ultimate_parent.is_a?(Tag) ?
                         :tag_id :
                         comment.parent.class.name.foreign_key.to_sym
@@ -222,7 +222,7 @@ def cancel_comment_reply_link(comment)
               commentable_id => commentable_value,
               view_full_work: params[:view_full_work],
               page: params[:page]),
-      remote: true)
+      remote: remote)
   end
 
   # canceling an edit
diff --git a/app/views/comments/_comment_form.html.erb b/app/views/comments/_comment_form.html.erb
index c6b5e658bf9..1db3afede89 100644
--- a/app/views/comments/_comment_form.html.erb
+++ b/app/views/comments/_comment_form.html.erb
@@ -107,7 +107,7 @@
         <% elsif comment.persisted? %>
           <%= cancel_edit_comment_link(comment) %>
         <% elsif commentable.is_a?(Comment) || commentable.is_a?(CommentDecorator) %>
-          <%= cancel_comment_reply_link(commentable) %>
+          <%= cancel_comment_reply_link(commentable, remote = !(params[:add_comment_reply_id] && params[:add_comment_reply_id] == commentable.id.to_s)) %>
         <% end %>
       </p>
     </fieldset>

From eed929877a674b46680e79d5832d9ab6ae3c9a68 Mon Sep 17 00:00:00 2001
From: Ceithir <ceathramh@gmail.com>
Date: Thu, 10 Nov 2022 18:38:15 +0100
Subject: [PATCH 03/20] Hound

---
 app/helpers/comments_helper.rb | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/helpers/comments_helper.rb b/app/helpers/comments_helper.rb
index 37b3a22cb91..25bcceeb6f3 100644
--- a/app/helpers/comments_helper.rb
+++ b/app/helpers/comments_helper.rb
@@ -215,14 +215,17 @@ def cancel_comment_reply_link(comment, remote = true)
                           comment.parent.id
     link_to(
       ts("Cancel"),
-      url_for(controller: :comments,
-              action: :cancel_comment_reply,
-              id: comment.id,
-              comment_id: params[:comment_id],
-              commentable_id => commentable_value,
-              view_full_work: params[:view_full_work],
-              page: params[:page]),
-      remote: remote)
+      url_for(
+        controller: :comments,
+        action: :cancel_comment_reply,
+        id: comment.id,
+        comment_id: params[:comment_id],
+        commentable_id => commentable_value,
+        view_full_work: params[:view_full_work],
+        page: params[:page]
+      ),
+      remote: remote
+    )
   end
 
   # canceling an edit

From 0da28cb61d21d020bb18f406abd393b78c4a1bd7 Mon Sep 17 00:00:00 2001
From: Ceithir <ceathramh@gmail.com>
Date: Sat, 15 Jul 2023 20:07:34 +0200
Subject: [PATCH 04/20] Hound

---
 app/helpers/comments_helper.rb            | 2 +-
 app/views/comments/_comment_form.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/comments_helper.rb b/app/helpers/comments_helper.rb
index 3c71a453b0b..8d63e3d7b72 100644
--- a/app/helpers/comments_helper.rb
+++ b/app/helpers/comments_helper.rb
@@ -209,7 +209,7 @@ def add_comment_reply_link(comment)
   end
 
   # return link to cancel new reply to a comment
-  def cancel_comment_reply_link(comment, remote = true)
+  def cancel_comment_reply_link(comment, remote: true)
     commentable_id = comment.ultimate_parent.is_a?(Tag) ?
                         :tag_id :
                         comment.parent.class.name.foreign_key.to_sym
diff --git a/app/views/comments/_comment_form.html.erb b/app/views/comments/_comment_form.html.erb
index 361ef35a383..cdbba00d553 100644
--- a/app/views/comments/_comment_form.html.erb
+++ b/app/views/comments/_comment_form.html.erb
@@ -107,7 +107,7 @@
         <% elsif comment.persisted? %>
           <%= cancel_edit_comment_link(comment) %>
         <% elsif commentable.is_a?(Comment) || commentable.is_a?(CommentDecorator) %>
-          <%= cancel_comment_reply_link(commentable, remote = !(params[:add_comment_reply_id] && params[:add_comment_reply_id] == commentable.id.to_s)) %>
+          <%= cancel_comment_reply_link(commentable, remote: !(params[:add_comment_reply_id] && params[:add_comment_reply_id] == commentable.id.to_s)) %>
         <% end %>
       </p>
     </fieldset>

From 5a3ea87c3087a95aa8210034ec4809ca6ccdac27 Mon Sep 17 00:00:00 2001
From: Ceithir <ceathramh@gmail.com>
Date: Sun, 16 Jul 2023 16:16:38 +0200
Subject: [PATCH 05/20] Add test for hiding feature

---
 features/comments_and_kudos/add_comment.feature | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/features/comments_and_kudos/add_comment.feature b/features/comments_and_kudos/add_comment.feature
index 7d6bd91def6..37ba043ec5d 100644
--- a/features/comments_and_kudos/add_comment.feature
+++ b/features/comments_and_kudos/add_comment.feature
@@ -207,3 +207,12 @@ Scenario: Try to post a comment with a < angle bracket before a linebreak, with
       """
       And I press "Comment"
     Then I should see "Comment created!"
+
+Scenario: It hides comment actions when a reply form is open
+  When I am logged in as "author"
+    And I post the work "The One Where Neal is Awesome"
+  When I am logged in as "commenter"
+    And I post the comment "I loved this!" on the work "The One Where Neal is Awesome"
+  When I follow "Reply"
+    Then I should see "Comment as commenter"
+    Then I should not see "Thread"

From 349662d7b1e59931accd13037c9fd34a32a1f0d7 Mon Sep 17 00:00:00 2001
From: Ceithir <ceathramh@gmail.com>
Date: Sun, 16 Jul 2023 17:01:02 +0200
Subject: [PATCH 06/20] Work page test

---
 features/comments_and_kudos/add_comment.feature | 16 ++++++++++++++++
 features/step_definitions/comment_steps.rb      | 12 ++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/features/comments_and_kudos/add_comment.feature b/features/comments_and_kudos/add_comment.feature
index 37ba043ec5d..2ecf7172ca0 100644
--- a/features/comments_and_kudos/add_comment.feature
+++ b/features/comments_and_kudos/add_comment.feature
@@ -216,3 +216,19 @@ Scenario: It hides comment actions when a reply form is open
   When I follow "Reply"
     Then I should see "Comment as commenter"
     Then I should not see "Thread"
+
+@javascript
+Scenario: It shows and hides cancel buttons properly
+  Given the work "Aftermath" by "creator"
+    And a comment "Ugh." by "pest" on the work "Aftermath"
+  When I am logged in as "creator"
+    And I view the work "Aftermath"
+    And I display comments
+  Then I should see "Ugh."
+  When I open the reply box
+    Then I should see "Cancel"
+    Then I should not see "Reply"
+  When I cancel the reply box
+    Then I should not see "Cancel"
+    Then I should see "Reply"
+
diff --git a/features/step_definitions/comment_steps.rb b/features/step_definitions/comment_steps.rb
index c434b7ea7c3..79dbe2214ae 100644
--- a/features/step_definitions/comment_steps.rb
+++ b/features/step_definitions/comment_steps.rb
@@ -302,3 +302,15 @@
     click_link("Yes, delete!") # TODO: Fix along with comment deletion.
   end
 end
+
+When "I display comments" do
+  click_link("Comments")
+end
+
+When "I open the reply box" do
+  click_link("Reply")
+end
+
+When "I cancel the reply box" do
+  click_link("Cancel")
+end
\ No newline at end of file

From 053653e326d4a4a9294622767f445d2457b82709 Mon Sep 17 00:00:00 2001
From: Ceithir <ceathramh@gmail.com>
Date: Sun, 16 Jul 2023 20:01:36 +0200
Subject: [PATCH 07/20] Add test for the cancel button not being updated

---
 features/comments_and_kudos/add_comment.feature | 17 +++++++++++++++++
 features/step_definitions/comment_steps.rb      | 11 ++++++++++-
 features/step_definitions/web_steps.rb          |  6 ++++++
 3 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/features/comments_and_kudos/add_comment.feature b/features/comments_and_kudos/add_comment.feature
index 2ecf7172ca0..676db113ed6 100644
--- a/features/comments_and_kudos/add_comment.feature
+++ b/features/comments_and_kudos/add_comment.feature
@@ -232,3 +232,20 @@ Scenario: It shows and hides cancel buttons properly
     Then I should not see "Cancel"
     Then I should see "Reply"
 
+@javascript
+Scenario: It shows and hides cancel buttons properly even on a new page
+  Given the work "Aftermath" by "creator"
+    And a comment "Ugh." by "pest" on the work "Aftermath"
+  When I am logged in as "creator"
+    And I view the work "Aftermath"
+    And I display comments
+  Then I should see "Ugh."
+  When I reply to the work comment "Ugh." on a new page
+    Then I should see "Aftermath"
+    Then I should see "Cancel"
+    Then I should not see "Reply"
+  When I cancel the reply box
+    And I fix the domain name
+    Then I should see "Aftermath"
+    Then I should not see "Cancel"
+
diff --git a/features/step_definitions/comment_steps.rb b/features/step_definitions/comment_steps.rb
index 79dbe2214ae..c235ec084fe 100644
--- a/features/step_definitions/comment_steps.rb
+++ b/features/step_definitions/comment_steps.rb
@@ -313,4 +313,13 @@
 
 When "I cancel the reply box" do
   click_link("Cancel")
-end
\ No newline at end of file
+end
+
+When /^I reply to the work comment "([^"]*)" on a new page$/ do |comment_content|
+  comment = Comment.find_by_comment_content(comment_content)
+  visit work_path(
+    comment.commentable,
+    add_comment_reply_id: comment.id,
+    show_comments: true,
+  )
+end
diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb
index 5ce950c9525..9b105164724 100644
--- a/features/step_definitions/web_steps.rb
+++ b/features/step_definitions/web_steps.rb
@@ -319,3 +319,9 @@ def with_scope(locator)
   cookie_value = Capybara.current_session.driver.request.cookies.[](cookie)
   assert cookie_value.nil?
 end
+
+When "I fix the domain name" do
+  parsed = URI.parse(current_url)
+  dest = parsed.path + '?' + (parsed.query || '') + '#' + (parsed.fragment || '')
+  visit dest
+end

From 9d2fb962b5e4115fe79c4d8ec0b62e50c1f3811b Mon Sep 17 00:00:00 2001
From: Ceithir <ceathramh@gmail.com>
Date: Sun, 16 Jul 2023 20:07:55 +0200
Subject: [PATCH 08/20] Hound

---
 features/step_definitions/comment_steps.rb | 4 ++--
 features/step_definitions/web_steps.rb     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/features/step_definitions/comment_steps.rb b/features/step_definitions/comment_steps.rb
index c235ec084fe..a3d20c24d81 100644
--- a/features/step_definitions/comment_steps.rb
+++ b/features/step_definitions/comment_steps.rb
@@ -316,10 +316,10 @@
 end
 
 When /^I reply to the work comment "([^"]*)" on a new page$/ do |comment_content|
-  comment = Comment.find_by_comment_content(comment_content)
+  comment = Comment.find_by(comment_content: comment_content)
   visit work_path(
     comment.commentable,
     add_comment_reply_id: comment.id,
-    show_comments: true,
+    show_comments: true
   )
 end
diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb
index 9b105164724..23128b8a0b5 100644
--- a/features/step_definitions/web_steps.rb
+++ b/features/step_definitions/web_steps.rb
@@ -322,6 +322,6 @@ def with_scope(locator)
 
 When "I fix the domain name" do
   parsed = URI.parse(current_url)
-  dest = parsed.path + '?' + (parsed.query || '') + '#' + (parsed.fragment || '')
+  dest = "#{parsed.path}?#{(parsed.query || "")}##{(parsed.fragment || "")}"
   visit dest
 end

From 092ca2970b98666d69d91c01a7402793fade5596 Mon Sep 17 00:00:00 2001
From: Ceithir <ceathramh@gmail.com>
Date: Sun, 16 Jul 2023 20:08:45 +0200
Subject: [PATCH 09/20] Hound (bis)

---
 features/step_definitions/web_steps.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb
index 23128b8a0b5..db10b96956d 100644
--- a/features/step_definitions/web_steps.rb
+++ b/features/step_definitions/web_steps.rb
@@ -322,6 +322,6 @@ def with_scope(locator)
 
 When "I fix the domain name" do
   parsed = URI.parse(current_url)
-  dest = "#{parsed.path}?#{(parsed.query || "")}##{(parsed.fragment || "")}"
+  dest = "#{parsed.path}?#{parsed.query || ''}##{parsed.fragment || ''}"
   visit dest
 end

From 04647990d434acb9b6c8f239029caa1e6f11340e Mon Sep 17 00:00:00 2001
From: Ceithir <ceathramh@gmail.com>
Date: Tue, 22 Aug 2023 10:00:23 +0200
Subject: [PATCH 10/20] Reviewdog

---
 app/views/comments/_comment_actions.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/comments/_comment_actions.html.erb b/app/views/comments/_comment_actions.html.erb
index ad4b9a39b12..953b9ddcc14 100644
--- a/app/views/comments/_comment_actions.html.erb
+++ b/app/views/comments/_comment_actions.html.erb
@@ -1,6 +1,6 @@
 <h5 class="landmark heading"><%= ts("Comment Actions") %></h5>
 
-<ul class="actions" id="navigation_for_comment_<%= comment.id %>" <% if params[:add_comment_reply_id] && params[:add_comment_reply_id] == comment.id.to_s %>style="display:none;"<% end %>>
+<ul class="actions" id="navigation_for_comment_<%= comment.id %>" <% if params[:add_comment_reply_id] && params[:add_comment_reply_id] == comment.id.to_s %>style="display:none;"<% end %> >
   <% # The effect is "Frozen" replaces "Reply." We can't do that in the helper
      # method for the reply link because that would prevent "Frozen" from
      # appearing on the Unreviewed Comments page for works with moderated

From 6adb2b158143d88aca58508bd69846c19d381fcb Mon Sep 17 00:00:00 2001
From: Ceithir <ceathramh@gmail.com>
Date: Tue, 22 Aug 2023 10:12:21 +0200
Subject: [PATCH 11/20] Use function instead of copy paste

---
 app/helpers/comments_helper.rb               | 6 +++++-
 app/views/comments/_comment_actions.html.erb | 4 ++--
 app/views/comments/_comment_form.html.erb    | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/helpers/comments_helper.rb b/app/helpers/comments_helper.rb
index a73ca919cb8..294e4903ee7 100644
--- a/app/helpers/comments_helper.rb
+++ b/app/helpers/comments_helper.rb
@@ -181,7 +181,7 @@ def parent_disallows_comments?(comment)
   #### HELPERS FOR REPLYING TO COMMENTS #####
 
   def add_cancel_comment_reply_link(comment)
-    if params[:add_comment_reply_id] && params[:add_comment_reply_id] == comment.id.to_s
+    if on_js_less_comment_form(comment)
       cancel_comment_reply_link(comment)
     else
       add_comment_reply_link(comment)
@@ -364,4 +364,8 @@ def comments_are_moderated(commentable)
     parent = find_parent(commentable)
     parent.respond_to?(:moderated_commenting_enabled) && parent.moderated_commenting_enabled?
   end
+
+  def on_js_less_comment_form(commentable)
+    params[:add_comment_reply_id] && params[:add_comment_reply_id] == commentable.id.to_s
+  end
 end
diff --git a/app/views/comments/_comment_actions.html.erb b/app/views/comments/_comment_actions.html.erb
index 953b9ddcc14..2ef716ec871 100644
--- a/app/views/comments/_comment_actions.html.erb
+++ b/app/views/comments/_comment_actions.html.erb
@@ -1,6 +1,6 @@
 <h5 class="landmark heading"><%= ts("Comment Actions") %></h5>
 
-<ul class="actions" id="navigation_for_comment_<%= comment.id %>" <% if params[:add_comment_reply_id] && params[:add_comment_reply_id] == comment.id.to_s %>style="display:none;"<% end %> >
+<ul class="actions" id="navigation_for_comment_<%= comment.id %>" <% if on_js_less_comment_form(comment) %>style="display:none;"<% end %> >
   <% # The effect is "Frozen" replaces "Reply." We can't do that in the helper
      # method for the reply link because that would prevent "Frozen" from
      # appearing on the Unreviewed Comments page for works with moderated
@@ -65,7 +65,7 @@
 <% if can_reply_to_comment?(comment) %>
   <% # This is where the reply-to box will be added when "Reply" is hit, if the user has JavaScript. %>
   <% # If not, we will render the comment form if this is the comment we are replying to. %>
-  <% if params[:add_comment_reply_id] && params[:add_comment_reply_id] == comment.id.to_s %>
+  <% if on_js_less_comment_form(comment) %>
     <div id="add_comment_reply_placeholder_<%= comment.id %>" title="<%= ts("reply to this comment") %>">
       <%= render 'comments/comment_form',
         :comment => Comment.new,
diff --git a/app/views/comments/_comment_form.html.erb b/app/views/comments/_comment_form.html.erb
index cdbba00d553..a0b71e54cc9 100644
--- a/app/views/comments/_comment_form.html.erb
+++ b/app/views/comments/_comment_form.html.erb
@@ -107,7 +107,7 @@
         <% elsif comment.persisted? %>
           <%= cancel_edit_comment_link(comment) %>
         <% elsif commentable.is_a?(Comment) || commentable.is_a?(CommentDecorator) %>
-          <%= cancel_comment_reply_link(commentable, remote: !(params[:add_comment_reply_id] && params[:add_comment_reply_id] == commentable.id.to_s)) %>
+          <%= cancel_comment_reply_link(commentable, remote: !on_js_less_comment_form(commentable)) %>
         <% end %>
       </p>
     </fieldset>

From 0d943e4c041f3d27047d741f0906166c3f822f02 Mon Sep 17 00:00:00 2001
From: Ceithir <ceathramh@gmail.com>
Date: Tue, 22 Aug 2023 10:13:28 +0200
Subject: [PATCH 12/20] Reviewdog?

---
 app/views/comments/_comment_actions.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/comments/_comment_actions.html.erb b/app/views/comments/_comment_actions.html.erb
index 2ef716ec871..722ae647205 100644
--- a/app/views/comments/_comment_actions.html.erb
+++ b/app/views/comments/_comment_actions.html.erb
@@ -1,6 +1,6 @@
 <h5 class="landmark heading"><%= ts("Comment Actions") %></h5>
 
-<ul class="actions" id="navigation_for_comment_<%= comment.id %>" <% if on_js_less_comment_form(comment) %>style="display:none;"<% end %> >
+<ul class="actions" id="navigation_for_comment_<%= comment.id %>" <% if on_js_less_comment_form(comment) %>style="display:none;"<% end %>>
   <% # The effect is "Frozen" replaces "Reply." We can't do that in the helper
      # method for the reply link because that would prevent "Frozen" from
      # appearing on the Unreviewed Comments page for works with moderated

From 5def0119caa4888e60f6fde713498a33f329ccc4 Mon Sep 17 00:00:00 2001
From: Ceithir <ceathramh@gmail.com>
Date: Tue, 22 Aug 2023 10:28:17 +0200
Subject: [PATCH 13/20] Reviewdog, but right this time

At least works locally
---
 app/views/comments/_comment_actions.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/comments/_comment_actions.html.erb b/app/views/comments/_comment_actions.html.erb
index 722ae647205..6d86931e473 100644
--- a/app/views/comments/_comment_actions.html.erb
+++ b/app/views/comments/_comment_actions.html.erb
@@ -1,6 +1,6 @@
 <h5 class="landmark heading"><%= ts("Comment Actions") %></h5>
 
-<ul class="actions" id="navigation_for_comment_<%= comment.id %>" <% if on_js_less_comment_form(comment) %>style="display:none;"<% end %>>
+<ul class="actions" id="navigation_for_comment_<%= comment.id %>" <% if on_js_less_comment_form(comment) %> style="display:none;"<% end %>>
   <% # The effect is "Frozen" replaces "Reply." We can't do that in the helper
      # method for the reply link because that would prevent "Frozen" from
      # appearing on the Unreviewed Comments page for works with moderated

From f5381782cc0ba2819ad9598e6add125145fd8d23 Mon Sep 17 00:00:00 2001
From: Ceithir <ceathramh@gmail.com>
Date: Tue, 22 Aug 2023 17:12:20 +0200
Subject: [PATCH 14/20] Fix wrong domain issue in tests

---
 app/controllers/comments_controller.rb          |  3 ++-
 features/comments_and_kudos/add_comment.feature |  3 +--
 features/step_definitions/comment_steps.rb      | 12 +++++-------
 features/step_definitions/web_steps.rb          |  6 ------
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 507c99114c4..b6c8a817aa8 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -657,7 +657,8 @@ def redirect_to_all_comments(commentable, options = {})
                   delete_comment_id: options[:delete_comment_id],
                   view_full_work: options[:view_full_work],
                   anchor: options[:anchor],
-                  page: options[:page]
+                  page: options[:page],
+                  only_path: true
     end
   end
 
diff --git a/features/comments_and_kudos/add_comment.feature b/features/comments_and_kudos/add_comment.feature
index 676db113ed6..c6119bf13dc 100644
--- a/features/comments_and_kudos/add_comment.feature
+++ b/features/comments_and_kudos/add_comment.feature
@@ -240,12 +240,11 @@ Scenario: It shows and hides cancel buttons properly even on a new page
     And I view the work "Aftermath"
     And I display comments
   Then I should see "Ugh."
-  When I reply to the work comment "Ugh." on a new page
+  When I reply to the comment on a new page
     Then I should see "Aftermath"
     Then I should see "Cancel"
     Then I should not see "Reply"
   When I cancel the reply box
-    And I fix the domain name
     Then I should see "Aftermath"
     Then I should not see "Cancel"
 
diff --git a/features/step_definitions/comment_steps.rb b/features/step_definitions/comment_steps.rb
index 52e1e5d3ad8..9bdf650233a 100644
--- a/features/step_definitions/comment_steps.rb
+++ b/features/step_definitions/comment_steps.rb
@@ -323,11 +323,9 @@
   click_link("Cancel")
 end
 
-When /^I reply to the work comment "([^"]*)" on a new page$/ do |comment_content|
-  comment = Comment.find_by(comment_content: comment_content)
-  visit work_path(
-    comment.commentable,
-    add_comment_reply_id: comment.id,
-    show_comments: true
-  )
+When "I reply to the comment on a new page" do
+  new_window = window_opened_by do
+    find(:link, "Reply").click(:control)
+  end
+  switch_to_window(new_window)
 end
diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb
index 13d728f995f..3a3de0125ff 100644
--- a/features/step_definitions/web_steps.rb
+++ b/features/step_definitions/web_steps.rb
@@ -314,9 +314,3 @@ def with_scope(locator)
   cookie_value = Capybara.current_session.driver.request.cookies.[](cookie)
   assert cookie_value.nil?
 end
-
-When "I fix the domain name" do
-  parsed = URI.parse(current_url)
-  dest = "#{parsed.path}?#{parsed.query || ''}##{parsed.fragment || ''}"
-  visit dest
-end

From 6131a7bd6fab39bdf5b5fee3a908163e984636c7 Mon Sep 17 00:00:00 2001
From: Ceithir <ceathramh@gmail.com>
Date: Tue, 22 Aug 2023 17:53:10 +0200
Subject: [PATCH 15/20] Wording

Totally not a trick to trigger a new build
---
 features/comments_and_kudos/add_comment.feature | 2 +-
 features/step_definitions/comment_steps.rb      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/comments_and_kudos/add_comment.feature b/features/comments_and_kudos/add_comment.feature
index c6119bf13dc..da1ec2857b0 100644
--- a/features/comments_and_kudos/add_comment.feature
+++ b/features/comments_and_kudos/add_comment.feature
@@ -240,7 +240,7 @@ Scenario: It shows and hides cancel buttons properly even on a new page
     And I view the work "Aftermath"
     And I display comments
   Then I should see "Ugh."
-  When I reply to the comment on a new page
+  When I reply on a new page
     Then I should see "Aftermath"
     Then I should see "Cancel"
     Then I should not see "Reply"
diff --git a/features/step_definitions/comment_steps.rb b/features/step_definitions/comment_steps.rb
index 9bdf650233a..f4ff7c0c8f6 100644
--- a/features/step_definitions/comment_steps.rb
+++ b/features/step_definitions/comment_steps.rb
@@ -323,7 +323,7 @@
   click_link("Cancel")
 end
 
-When "I reply to the comment on a new page" do
+When "I reply on a new page" do
   new_window = window_opened_by do
     find(:link, "Reply").click(:control)
   end

From 1d2e189fe53f29367288350a2686597b5e94c9d8 Mon Sep 17 00:00:00 2001
From: Ceithir <ceathramh@gmail.com>
Date: Mon, 25 Sep 2023 18:17:15 +0200
Subject: [PATCH 16/20] Rename

---
 app/helpers/comments_helper.rb               | 4 ++--
 app/views/comments/_comment_actions.html.erb | 4 ++--
 app/views/comments/_comment_form.html.erb    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/helpers/comments_helper.rb b/app/helpers/comments_helper.rb
index e13c7ecd3e2..98fe5af8e26 100644
--- a/app/helpers/comments_helper.rb
+++ b/app/helpers/comments_helper.rb
@@ -184,7 +184,7 @@ def parent_disallows_comments?(comment)
   #### HELPERS FOR REPLYING TO COMMENTS #####
 
   def add_cancel_comment_reply_link(comment)
-    if on_js_less_comment_form(comment)
+    if focused_on_comment(comment)
       cancel_comment_reply_link(comment)
     else
       add_comment_reply_link(comment)
@@ -368,7 +368,7 @@ def comments_are_moderated(commentable)
     parent.respond_to?(:moderated_commenting_enabled) && parent.moderated_commenting_enabled?
   end
 
-  def on_js_less_comment_form(commentable)
+  def focused_on_comment(commentable)
     params[:add_comment_reply_id] && params[:add_comment_reply_id] == commentable.id.to_s
   end
 end
diff --git a/app/views/comments/_comment_actions.html.erb b/app/views/comments/_comment_actions.html.erb
index 6d86931e473..09d89c7e5dc 100644
--- a/app/views/comments/_comment_actions.html.erb
+++ b/app/views/comments/_comment_actions.html.erb
@@ -1,6 +1,6 @@
 <h5 class="landmark heading"><%= ts("Comment Actions") %></h5>
 
-<ul class="actions" id="navigation_for_comment_<%= comment.id %>" <% if on_js_less_comment_form(comment) %> style="display:none;"<% end %>>
+<ul class="actions" id="navigation_for_comment_<%= comment.id %>" <% if focused_on_comment(comment) %> style="display:none;"<% end %>>
   <% # The effect is "Frozen" replaces "Reply." We can't do that in the helper
      # method for the reply link because that would prevent "Frozen" from
      # appearing on the Unreviewed Comments page for works with moderated
@@ -65,7 +65,7 @@
 <% if can_reply_to_comment?(comment) %>
   <% # This is where the reply-to box will be added when "Reply" is hit, if the user has JavaScript. %>
   <% # If not, we will render the comment form if this is the comment we are replying to. %>
-  <% if on_js_less_comment_form(comment) %>
+  <% if focused_on_comment(comment) %>
     <div id="add_comment_reply_placeholder_<%= comment.id %>" title="<%= ts("reply to this comment") %>">
       <%= render 'comments/comment_form',
         :comment => Comment.new,
diff --git a/app/views/comments/_comment_form.html.erb b/app/views/comments/_comment_form.html.erb
index a0b71e54cc9..93c9dca8960 100644
--- a/app/views/comments/_comment_form.html.erb
+++ b/app/views/comments/_comment_form.html.erb
@@ -107,7 +107,7 @@
         <% elsif comment.persisted? %>
           <%= cancel_edit_comment_link(comment) %>
         <% elsif commentable.is_a?(Comment) || commentable.is_a?(CommentDecorator) %>
-          <%= cancel_comment_reply_link(commentable, remote: !on_js_less_comment_form(commentable)) %>
+          <%= cancel_comment_reply_link(commentable, remote: !focused_on_comment(commentable)) %>
         <% end %>
       </p>
     </fieldset>

From c3581e2f442541a064db01a0e0b949d6af72c220 Mon Sep 17 00:00:00 2001
From: Ceithir <ceathramh@gmail.com>
Date: Mon, 25 Sep 2023 19:29:30 +0200
Subject: [PATCH 17/20] Actually unused?

The first case of the if wasn't accessible anymore
As the form was hidden if the condition was true
---
 app/helpers/comments_helper.rb               | 8 --------
 app/views/comments/_comment_actions.html.erb | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/helpers/comments_helper.rb b/app/helpers/comments_helper.rb
index 98fe5af8e26..61517a9e5a5 100644
--- a/app/helpers/comments_helper.rb
+++ b/app/helpers/comments_helper.rb
@@ -183,14 +183,6 @@ def parent_disallows_comments?(comment)
 
   #### HELPERS FOR REPLYING TO COMMENTS #####
 
-  def add_cancel_comment_reply_link(comment)
-    if focused_on_comment(comment)
-      cancel_comment_reply_link(comment)
-    else
-      add_comment_reply_link(comment)
-    end
-  end
-
   # return link to add new reply to a comment
   def add_comment_reply_link(comment)
     commentable_id = comment.ultimate_parent.is_a?(Tag) ?
diff --git a/app/views/comments/_comment_actions.html.erb b/app/views/comments/_comment_actions.html.erb
index 09d89c7e5dc..8089c639b11 100644
--- a/app/views/comments/_comment_actions.html.erb
+++ b/app/views/comments/_comment_actions.html.erb
@@ -9,7 +9,7 @@
     <li><%= frozen_comment_indicator %></li>
   <% end %>
   <% if can_reply_to_comment?(comment) %>
-    <li id="add_comment_reply_link_<%= comment.id %>"><%= add_cancel_comment_reply_link comment %></li>
+    <li id="add_comment_reply_link_<%= comment.id %>"><%= add_comment_reply_link comment %></li>
   <% end %>
   <% unless comment.unreviewed? %>
     <li><%= link_to ts("Thread"), comment %></li>

From c84917025cefb64163fa6d2f1bf76422b390c88c Mon Sep 17 00:00:00 2001
From: Ceithir <ceathramh@gmail.com>
Date: Mon, 25 Sep 2023 19:36:28 +0200
Subject: [PATCH 18/20] No more need for forced reload

---
 app/helpers/comments_helper.rb                  | 4 ++--
 app/views/comments/_comment_form.html.erb       | 2 +-
 features/comments_and_kudos/add_comment.feature | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/helpers/comments_helper.rb b/app/helpers/comments_helper.rb
index 61517a9e5a5..39714032002 100644
--- a/app/helpers/comments_helper.rb
+++ b/app/helpers/comments_helper.rb
@@ -204,7 +204,7 @@ def add_comment_reply_link(comment)
   end
 
   # return link to cancel new reply to a comment
-  def cancel_comment_reply_link(comment, remote: true)
+  def cancel_comment_reply_link(comment)
     commentable_id = comment.ultimate_parent.is_a?(Tag) ?
                         :tag_id :
                         comment.parent.class.name.foreign_key.to_sym
@@ -222,7 +222,7 @@ def cancel_comment_reply_link(comment, remote: true)
         view_full_work: params[:view_full_work],
         page: params[:page]
       ),
-      remote: remote
+      remote: true
     )
   end
 
diff --git a/app/views/comments/_comment_form.html.erb b/app/views/comments/_comment_form.html.erb
index 93c9dca8960..e6af2d9d9d8 100644
--- a/app/views/comments/_comment_form.html.erb
+++ b/app/views/comments/_comment_form.html.erb
@@ -107,7 +107,7 @@
         <% elsif comment.persisted? %>
           <%= cancel_edit_comment_link(comment) %>
         <% elsif commentable.is_a?(Comment) || commentable.is_a?(CommentDecorator) %>
-          <%= cancel_comment_reply_link(commentable, remote: !focused_on_comment(commentable)) %>
+          <%= cancel_comment_reply_link(commentable) %>
         <% end %>
       </p>
     </fieldset>
diff --git a/features/comments_and_kudos/add_comment.feature b/features/comments_and_kudos/add_comment.feature
index da1ec2857b0..a9dfcb99481 100644
--- a/features/comments_and_kudos/add_comment.feature
+++ b/features/comments_and_kudos/add_comment.feature
@@ -247,4 +247,4 @@ Scenario: It shows and hides cancel buttons properly even on a new page
   When I cancel the reply box
     Then I should see "Aftermath"
     Then I should not see "Cancel"
-
+    Then I should see "Reply"

From 05b6e0b49ca4c4a5ddac5fc98888c992e78a4e7f Mon Sep 17 00:00:00 2001
From: Ceithir <ceathramh@gmail.com>
Date: Tue, 26 Sep 2023 16:36:05 +0200
Subject: [PATCH 19/20] Test cleanup

---
 .../comments_and_kudos/add_comment.feature    | 36 +++++++++----------
 features/step_definitions/comment_steps.rb    |  5 +--
 2 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/features/comments_and_kudos/add_comment.feature b/features/comments_and_kudos/add_comment.feature
index a9dfcb99481..61e25514b60 100644
--- a/features/comments_and_kudos/add_comment.feature
+++ b/features/comments_and_kudos/add_comment.feature
@@ -209,42 +209,38 @@ Scenario: Try to post a comment with a < angle bracket before a linebreak, with
     Then I should see "Comment created!"
 
 Scenario: It hides comment actions when a reply form is open
-  When I am logged in as "author"
-    And I post the work "The One Where Neal is Awesome"
-  When I am logged in as "commenter"
+  Given the work "The One Where Neal is Awesome"
+    And I am logged in as "commenter"
     And I post the comment "I loved this!" on the work "The One Where Neal is Awesome"
   When I follow "Reply"
-    Then I should see "Comment as commenter"
-    Then I should not see "Thread"
+  Then I should see "Comment as commenter"
+    And I should not see "Thread"
 
 @javascript
 Scenario: It shows and hides cancel buttons properly
   Given the work "Aftermath" by "creator"
     And a comment "Ugh." by "pest" on the work "Aftermath"
-  When I am logged in as "creator"
-    And I view the work "Aftermath"
+  When I view the work "Aftermath"
     And I display comments
   Then I should see "Ugh."
   When I open the reply box
-    Then I should see "Cancel"
-    Then I should not see "Reply"
+  Then I should see "Cancel"
+    But I should not see "Reply"
   When I cancel the reply box
-    Then I should not see "Cancel"
-    Then I should see "Reply"
+  Then I should not see "Cancel"
+    But I should see "Reply"
 
 @javascript
 Scenario: It shows and hides cancel buttons properly even on a new page
-  Given the work "Aftermath" by "creator"
+Given the work "Aftermath" by "creator"
     And a comment "Ugh." by "pest" on the work "Aftermath"
-  When I am logged in as "creator"
-    And I view the work "Aftermath"
+  When I view the work "Aftermath"
     And I display comments
   Then I should see "Ugh."
+  # Go to /chapters/XX?add_comment_reply_id=YY&show_comments=true#comment_YY"; akin to a Ctrl+Click on "Reply"
   When I reply on a new page
-    Then I should see "Aftermath"
-    Then I should see "Cancel"
-    Then I should not see "Reply"
+  Then I should see "Cancel"
+    But I should not see "Reply"
   When I cancel the reply box
-    Then I should see "Aftermath"
-    Then I should not see "Cancel"
-    Then I should see "Reply"
+  Then I should not see "Cancel"
+    But I should see "Reply"
diff --git a/features/step_definitions/comment_steps.rb b/features/step_definitions/comment_steps.rb
index f4ff7c0c8f6..4d00cd04e17 100644
--- a/features/step_definitions/comment_steps.rb
+++ b/features/step_definitions/comment_steps.rb
@@ -324,8 +324,5 @@
 end
 
 When "I reply on a new page" do
-  new_window = window_opened_by do
-    find(:link, "Reply").click(:control)
-  end
-  switch_to_window(new_window)
+  visit find(:link, "Reply")["href"]
 end

From bcb960fb60dd033f7205be978d7452fa5279285e Mon Sep 17 00:00:00 2001
From: Brian Austin <brianjaustin@gmail.com>
Date: Sat, 7 Sep 2024 21:36:39 -0400
Subject: [PATCH 20/20] Fix guest comments in tests

---
 features/comments_and_kudos/add_comment.feature | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/comments_and_kudos/add_comment.feature b/features/comments_and_kudos/add_comment.feature
index f12c07db923..e2eca58cec7 100644
--- a/features/comments_and_kudos/add_comment.feature
+++ b/features/comments_and_kudos/add_comment.feature
@@ -235,7 +235,7 @@ Scenario: It hides comment actions when a reply form is open
 
 @javascript
 Scenario: It shows and hides cancel buttons properly
-  Given the work "Aftermath" by "creator"
+  Given the work "Aftermath" by "creator" with guest comments enabled
     And a comment "Ugh." by "pest" on the work "Aftermath"
   When I view the work "Aftermath"
     And I display comments
@@ -249,7 +249,7 @@ Scenario: It shows and hides cancel buttons properly
 
 @javascript
 Scenario: It shows and hides cancel buttons properly even on a new page
-Given the work "Aftermath" by "creator"
+Given the work "Aftermath" by "creator" with guest comments enabled
     And a comment "Ugh." by "pest" on the work "Aftermath"
   When I view the work "Aftermath"
     And I display comments