Merge pull request #2385 from alphagov/bug-fixes

Various bug fixes and code issues
alphagov · Feb 28, 2024 · e6eec53 · e6eec53
2 parents 75f9623 + 77b7943
commit e6eec53
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/lib/plugins/plugin-validator.js b/lib/plugins/plugin-validator.js
@@ -95,7 +95,7 @@ function validateMetaUrls (metaUrls) {
     return
   }
 
-  if (typeof metaUrls !== 'object') {
+  if (typeof metaUrls !== 'object' || Array.isArray(metaUrls)) {
     errors.push('The meta.urls must be an object if entered')
     return
   }
@@ -124,7 +124,7 @@ function validateMetaUrls (metaUrls) {
 function validateMeta (meta) {
   const metaKeys = ['urls', 'description']
 
-  if (typeof meta !== 'object') {
+  if (typeof meta !== 'object' || Array.isArray(meta)) {
     errors.push('The meta must be an object if entered')
     return
   }
@@ -143,7 +143,7 @@ function validateMeta (meta) {
 }
 
 function validatePluginDependency (key, configEntry) {
-  if (typeof configEntry === 'string') {
+  if (typeof configEntry !== 'object' || Array.isArray(configEntry)) {
     return
   }
   // Can be a string, but if an object, the packageName must be a string
@@ -238,7 +238,7 @@ async function validatePlugin (executionPath, argv) {
       errors.push('The plugin does not have a govuk-prototype-kit.config.json file, all plugins must have this file to be valid.')
     }
   })
-  if (!errors.length > 0) {
+  if (!errors.length) {
     console.log()
     console.log(ansiColors.green('The plugin config is valid.'))
     console.log()

diff --git a/lib/session.js b/lib/session.js
@@ -59,7 +59,7 @@ function storeData (input, data) {
     let val = input[i]
 
     // Delete values when users unselect checkboxes
-    if (val === '_unchecked' || val === ['_unchecked']) {
+    if (val === '_unchecked') {
       delete data[i]
       continue
     }

diff --git a/migrator/file-helpers.js b/migrator/file-helpers.js
@@ -111,7 +111,7 @@ async function deleteDirectoryIfEmpty (partialPath) {
   }
   const dirContents = await fsp.readdir(dirPath)
   if (dirContents.length === 0) {
-    return await deleteDirectory(dirPath, undefined)
+    return await deleteDirectory(dirPath)
   }
   return false
 }

diff --git a/migrator/migration-steps.js b/migrator/migration-steps.js
@@ -158,7 +158,7 @@ async function deleteUnusedDirectories (directoriesToDelete) {
       return true
     }
     const reporter = await addReporter(`Remove unused directory ${dir}`)
-    const result = await deleteDirectory(dirPath, { recursive: true })
+    const result = await deleteDirectory(dirPath)
     await reporter(result)
     return result
   }))

diff --git a/migrator/migration-steps.spec.js b/migrator/migration-steps.spec.js
@@ -272,8 +272,8 @@ describe('migration steps', () => {
     expect(result).toBeTruthy()
 
     expect(fileHelpers.deleteDirectory).toHaveBeenCalledTimes(2)
-    expect(fileHelpers.deleteDirectory).toHaveBeenNthCalledWith(1, path.join(projectDir, directoriesToDelete[0]), { recursive: true })
-    expect(fileHelpers.deleteDirectory).toHaveBeenNthCalledWith(2, path.join(projectDir, directoriesToDelete[1]), { recursive: true })
+    expect(fileHelpers.deleteDirectory).toHaveBeenNthCalledWith(1, path.join(projectDir, directoriesToDelete[0]))
+    expect(fileHelpers.deleteDirectory).toHaveBeenNthCalledWith(2, path.join(projectDir, directoriesToDelete[1]))
 
     expect(mockReporter).toHaveBeenCalledTimes(3)
     expect(mockReporter).toHaveBeenNthCalledWith(1, true)