Fix cancel button for feedback forms

Closes #4570
pulibrary · Dec 12, 2024 · 3b8db22 · 3b8db22
1 parent 313c8b4
commit 3b8db22
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/app/views/catalog/_ask_a_question_form.html.erb b/app/views/catalog/_ask_a_question_form.html.erb
@@ -18,8 +18,8 @@
     <%= f.input :title, as: :hidden %>
     <%= f.input :feedback_desc, as: :hidden %>
     <div class="modal-footer">
-      <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
-      <%= f.submit "Send", class: "btn btn-primary", data: {bs_dismiss: "modal"}, id: 'submit-question' %>
+      <button type="button" class="btn btn-secondary" data-bl-dismiss="modal">Cancel</button>
+      <%= f.submit "Send", class: "btn btn-primary", data: {bl_dismiss: "modal"}, id: 'submit-question' %>
     </div>
   <% end %>
 </div>
diff --git a/app/views/catalog/_report_biased_results_form.html.erb b/app/views/catalog/_report_biased_results_form.html.erb
@@ -35,7 +35,7 @@
     </div>
 
     <div class="modal-footer">
-      <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+      <button type="button" class="btn btn-secondary" data-bl-dismiss="modal">Cancel</button>
       <%= f.submit "Send", class: "btn btn-primary", id: 'submit-question' %>
     </div>
   <% end %>

diff --git a/app/views/catalog/_report_harmful_language_form.html.erb b/app/views/catalog/_report_harmful_language_form.html.erb
@@ -35,8 +35,8 @@
     <%= f.input_field :context, hidden: true %><br>
     <%= f.input :feedback_desc, as: :hidden %>
     <div class="modal-footer">
-      <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
-      <%= f.submit "Send", class: "btn btn-primary", data: {bs_dismiss: "modal"}, id: 'submit-question' %>
+      <button type="button" class="btn btn-secondary" data-bl-dismiss="modal">Cancel</button>
+      <%= f.submit "Send", class: "btn btn-primary", data: {bl_dismiss: "modal"}, id: 'submit-question' %>
     </div>
   <% end %>
 </div>
diff --git a/app/views/catalog/_suggest_correction_form.html.erb b/app/views/catalog/_suggest_correction_form.html.erb
@@ -19,8 +19,8 @@
     <%= f.input :title, as: :hidden %>
     <%= f.input :feedback_desc, as: :hidden %>
     <div class="modal-footer">
-    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
-    <%= f.submit "Send", class: "btn btn-primary", data: {bs_dismiss: "modal"}, id: 'submit-suggestion' %>
+    <button type="button" class="btn btn-secondary" data-bl-dismiss="modal">Cancel</button>
+    <%= f.submit "Send", class: "btn btn-primary", data: {bl_dismiss: "modal"}, id: 'submit-suggestion' %>
     </div>
   <% end %>
 </div>
diff --git a/spec/system/suggest_correction_form_spec.rb b/spec/system/suggest_correction_form_spec.rb
@@ -22,4 +22,17 @@
       expect(page).to have_text 'Your suggestion has been submitted'
     end
   end
+  describe 'pressing the cancel button' do
+    before do
+      stub_holding_locations
+      visit '/catalog/99105509673506421'
+      scroll_to(:bottom) # needed when js: true
+      click_link 'Suggest a Correction'
+    end
+    it 'closes the modal', js: true do
+      expect(page).to have_text('Please use this area to report errors or omissions')
+      click_button 'Cancel'
+      expect(page).not_to have_text('Please use this area to report errors or omissions')
+    end
+  end
 end