More cleanup

ministryofjustice · Oct 20, 2023 · 4d33c4b · 4d33c4b
1 parent e001e13
commit 4d33c4b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/app/webpack/javascripts/modules/selectAll.mjs b/app/webpack/javascripts/modules/selectAll.mjs
@@ -31,16 +31,14 @@ export class SelectAll {
    */
   init () {
     // Check that required elements are present
-    if (!this.$module) {
-      return
-    }
+    if (!this.$module) { return }
 
     const selector = this.$module.dataset.selectAllClass
     const collection = this.$module.dataset.collectionClass
 
-    this.selectAllBox = this.$module.getElementsByClassName(selector)[0]
+    this.selectAllBox = this.$module.querySelector(`.${selector}`)
     this.selectAllBox.addEventListener('change', () => this.toggleSelection())
-    this.checkBoxes = document.getElementsByClassName(collection)
+    this.checkBoxes = document.querySelectorAll(`.${collection}`)
   }
 
   toggleSelection = () => {

diff --git a/app/webpack/javascripts/modules/selectAll_spec.mjs b/app/webpack/javascripts/modules/selectAll_spec.mjs
@@ -28,19 +28,11 @@ describe('SelectAll', () => {
       testArea.appendChild(selectAllDiv)
 
       // <input class="pick-me" type="checkbox" name="box1" checked=true>
-      selectedBox = document.createElement('input')
-      selectedBox.type = 'checkbox'
-      selectedBox.classList.add('pick-me')
-      selectedBox.name = 'box1'
-      selectedBox.checked = true
+      selectedBox = createCheckbox('pick-me', true, 'box1')
       testArea.appendChild(selectedBox)
 
       // <input class="pick-me" type="checkbox" name="box2">
-      unselectedBox = document.createElement('input')
-      unselectedBox.type = 'checkbox'
-      unselectedBox.classList.add('pick-me')
-      unselectedBox.name = 'box2'
-      unselectedBox.checked = false
+      unselectedBox = createCheckbox('pick-me', true, 'box1')
       testArea.appendChild(unselectedBox)
 
       const selectAll = new SelectAll(selectAllDiv)
@@ -52,6 +44,15 @@ describe('SelectAll', () => {
       testArea.remove()
     })
 
+    const createCheckbox = (className, checked = false, name = '') => {
+      const checkbox = document.createElement('input')
+      checkbox.type = 'checkbox'
+      checkbox.classList.add(className)
+      checkbox.name = name
+      checkbox.checked = checked
+      return checkbox
+    }
+
     const toggleSelectAll = () => {
       const event = new Event('change')
       selectAllBox.checked = !selectAllBox.checked
@@ -74,10 +75,7 @@ describe('SelectAll', () => {
     })
 
     it('should select newly created boxes', () => {
-      const newBox = document.createElement('input')
-      newBox.type = 'checkbox'
-      newBox.classList.add('pick-me')
-      newBox.checked = false
+      const newBox = createCheckbox('pick-me', false, 'new-box')
       document.body.appendChild(newBox)
 
       toggleSelectAll()