Group color enabled tests

Author: feelepxyz

tap-snapshots/test/lib/commands/audit.js.test.cjs

@@ -148,7 +148,7 @@ verified registry signatures, audited 1 package in 0s
 
 `
 
-exports[`test/lib/commands/audit.js TAP audit signatures with color and both valid and missing signatures > must match snapshot 1`] = `
+exports[`test/lib/commands/audit.js TAP audit signatures with color output enabled with both valid and missing signatures > must match snapshot 1`] = `
 audited 2 packages in xxx
 
 1 packages have verified registry signatures
@@ -157,7 +157,18 @@ audited 2 packages in xxx
   run \`npm audit signatures --missing\` for details
 `
 
-exports[`test/lib/commands/audit.js TAP audit signatures with color and multiple invalid signatures > must match snapshot 1`] = `
+exports[`test/lib/commands/audit.js TAP audit signatures with color output enabled with invalid signatures > must match snapshot 1`] = `
+audited 1 package in 0s
+
+1 package has an invalid registry signature:
+
+kms-demo@1.0.0
+
+Someone might have tampered with the package since it was published on the registry (monster-in-the-middle attack)!
+
+`
+
+exports[`test/lib/commands/audit.js TAP audit signatures with color output enabled with multiple invalid signatures > must match snapshot 1`] = `
 audited 2 packages in xxx
 
 2 packages have invalid registry signatures:
@@ -169,24 +180,13 @@ Someone might have tampered with the packages since it was published on the regi
 
 `
 
-exports[`test/lib/commands/audit.js TAP audit signatures with color and multiple missing signatures > must match snapshot 1`] = `
+exports[`test/lib/commands/audit.js TAP audit signatures with color output enabled with multiple missing signatures > must match snapshot 1`] = `
 audited 2 packages in xxx
 
 2 packages have missing registry signatures but the registry is providing signing keys
   run \`npm audit signatures --missing\` for details
 `
 
-exports[`test/lib/commands/audit.js TAP audit signatures with colour option and invalid signatures > must match snapshot 1`] = `
-audited 1 package in 0s
-
-1 package has an invalid registry signature:
-
-kms-demo@1.0.0
-
-Someone might have tampered with the package since it was published on the registry (monster-in-the-middle attack)!
-
-`
-
 exports[`test/lib/commands/audit.js TAP audit signatures with invalid signatures > must match snapshot 1`] = `
 audited 1 package in 0s
 

test/lib/commands/audit.js

@@ -871,24 +871,6 @@ t.test('audit signatures', async t => {
     t.matchSnapshot(joinedOutput())
   })
 
-  t.test('with colour option and invalid signatures', async t => {
-    npm.prefix = validInstall()
-    npm.color = true
-    await manifestWithInvalidSigs()
-    validKeys()
-
-    await audit.exec(['signatures'])
-
-    t.equal(process.exitCode, 1, 'should exit with error')
-    process.exitCode = 0
-    t.match(
-      joinedOutput(),
-      /* eslint-disable-next-line no-control-regex */
-      /\u001b\[1m\u001b\[31minvalid\u001b\[39m\u001b\[22m registry signature/
-    )
-    t.matchSnapshot(joinedOutput())
-  })
-
   t.test('with invalid signatures', async t => {
     npm.prefix = validInstall()
     await manifestWithInvalidSigs()
@@ -919,20 +901,6 @@ t.test('audit signatures', async t => {
     t.matchSnapshot(joinedOutput())
   })
 
-  t.test('with color and both valid and missing signatures', async t => {
-    npm.prefix = installWithMultipleDeps()
-    npm.color = true
-    await manifestWithValidSigs()
-    await manifestWithoutSigs('async', '1.1.1')
-    validKeys()
-
-    await audit.exec(['signatures'])
-
-    t.equal(process.exitCode, 1, 'should exit with error')
-    process.exitCode = 0
-    t.matchSnapshot(joinedOutput())
-  })
-
   t.test('with both invalid and missing signatures', async t => {
     npm.prefix = installWithMultipleDeps()
     await manifestWithInvalidSigs()
@@ -962,20 +930,6 @@ t.test('audit signatures', async t => {
     t.matchSnapshot(joinedOutput())
   })
 
-  t.test('with color and multiple invalid signatures', async t => {
-    npm.prefix = installWithMultipleDeps()
-    npm.color = true
-    await manifestWithInvalidSigs('kms-demo', '1.0.0')
-    await manifestWithInvalidSigs('async', '1.1.1')
-    validKeys()
-
-    await audit.exec(['signatures'])
-
-    t.equal(process.exitCode, 1, 'should exit with error')
-    process.exitCode = 0
-    t.matchSnapshot(joinedOutput())
-  })
-
   t.test('with multiple missing signatures', async t => {
     npm.prefix = installWithMultipleDeps()
     await manifestWithoutSigs('kms-demo', '1.0.0')
@@ -989,20 +943,6 @@ t.test('audit signatures', async t => {
     t.matchSnapshot(joinedOutput())
   })
 
-  t.test('with color and multiple missing signatures', async t => {
-    npm.prefix = installWithMultipleDeps()
-    npm.color = true
-    await manifestWithoutSigs('kms-demo', '1.0.0')
-    await manifestWithoutSigs('async', '1.1.1')
-    validKeys()
-
-    await audit.exec(['signatures'])
-
-    t.equal(process.exitCode, 1, 'should exit with error')
-    process.exitCode = 0
-    t.matchSnapshot(joinedOutput())
-  })
-
   t.test('with signatures but no public keys', async t => {
     npm.prefix = validInstall()
     await manifestWithValidSigs()
@@ -1454,6 +1394,68 @@ t.test('audit signatures', async t => {
     )
   })
 
+  t.test('with color output enabled', async t => {
+    t.test('with invalid signatures', async t => {
+      npm.prefix = validInstall()
+      npm.color = true
+      await manifestWithInvalidSigs()
+      validKeys()
+
+      await audit.exec(['signatures'])
+
+      t.equal(process.exitCode, 1, 'should exit with error')
+      process.exitCode = 0
+      t.match(
+        joinedOutput(),
+        /* eslint-disable-next-line no-control-regex */
+        /\u001b\[1m\u001b\[31minvalid\u001b\[39m\u001b\[22m registry signature/
+      )
+      t.matchSnapshot(joinedOutput())
+    })
+
+    t.test('with both valid and missing signatures', async t => {
+      npm.prefix = installWithMultipleDeps()
+      npm.color = true
+      await manifestWithValidSigs()
+      await manifestWithoutSigs('async', '1.1.1')
+      validKeys()
+
+      await audit.exec(['signatures'])
+
+      t.equal(process.exitCode, 1, 'should exit with error')
+      process.exitCode = 0
+      t.matchSnapshot(joinedOutput())
+    })
+
+    t.test('with multiple invalid signatures', async t => {
+      npm.prefix = installWithMultipleDeps()
+      npm.color = true
+      await manifestWithInvalidSigs('kms-demo', '1.0.0')
+      await manifestWithInvalidSigs('async', '1.1.1')
+      validKeys()
+
+      await audit.exec(['signatures'])
+
+      t.equal(process.exitCode, 1, 'should exit with error')
+      process.exitCode = 0
+      t.matchSnapshot(joinedOutput())
+    })
+
+    t.test('with multiple missing signatures', async t => {
+      npm.prefix = installWithMultipleDeps()
+      npm.color = true
+      await manifestWithoutSigs('kms-demo', '1.0.0')
+      await manifestWithoutSigs('async', '1.1.1')
+      validKeys()
+
+      await audit.exec(['signatures'])
+
+      t.equal(process.exitCode, 1, 'should exit with error')
+      process.exitCode = 0
+      t.matchSnapshot(joinedOutput())
+    })
+  })
+
   t.test('workspaces', async t => {
     t.test('verifies registry deps and ignores local workspace deps', async t => {
       npm.prefix = workspaceInstall()