5446 improve comments, use bootstrap modal to hide modal, specify id of audit to isolate audit more robustly in spec

Author: janeewheatley

app/javascript/controllers/audit_duplicates_controller.js

@@ -106,20 +106,18 @@ export default class extends Controller {
     duplicates.forEach(item => {
       const total = item.entries.reduce((sum, entry) => sum + entry.quantity, 0)
 
-      // Keep the first entry, remove the rest
+      // Separate the first entry from remaining entries
       const [firstEntry, ...remainingEntries] = item.entries
 
       // Update the first entry with the merged total
       firstEntry.section.querySelector('input[name*="[quantity]"]').value = total
 
-      // Remove all duplicate entries
+      // Remove all duplicate entries from the form submission
       remainingEntries.forEach(entry => entry.section.remove())
     })
 
-    document.getElementById('duplicateItemsModal')?.remove()
-    document.querySelector('.modal-backdrop')?.remove()
-    document.body.classList.remove('modal-open')
-    document.body.style.removeProperty('overflow')
+    const modal = new bootstrap.Modal(document.getElementById('duplicateItemsModal'))
+    modal.hide()
 
     this.submitForm(buttonName)
   }

spec/system/audit_system_spec.rb

@@ -231,14 +231,18 @@
         expect(page).to have_content("Make Changes")
 
         # Test merge functionality
-        click_button "Merge Items"
-
-        # Should merge duplicates and submit successfully
-        expect(page).to have_content("Audit's progress was successfully saved.")
+        audit_id = nil
+        expect {
+          click_button "Merge Items"
+          expect(page).to have_content("Audit's progress was successfully saved.")
+          audit_id = Audit.maximum(:id)
+        }.to change { Audit.count }.by(1)
 
         # Verify only one line item with merged quantity (10 + 15 = 25)
-        expect(Audit.last.line_items.count).to eq(1)
-        expect(Audit.last.line_items.first.quantity).to eq(25)
+        created_audit = Audit.find(audit_id)
+        line_item = created_audit.line_items.find_by(item_id: item.id)
+        expect(created_audit.line_items.count).to eq(1)
+        expect(line_item.quantity).to eq(25)
       end
     end