1 files changed, 35 insertions, 41 deletions
diff --git a/workspaces/libnpmversion/test/enforce-clean.js b/workspaces/libnpmversion/test/enforce-clean.js
index d96fb09ff..3badf47ea 100644
--- a/workspaces/libnpmversion/test/enforce-clean.js
+++ b/workspaces/libnpmversion/test/enforce-clean.js
@@ -21,48 +21,42 @@ const enforceClean = requireInject('../lib/enforce-clean.js', {
 
 const warnings = []
 
-t.test('clean, ok', t =>
-  t.resolveMatch(enforceClean({ cwd: 'clean' }), true)
-    .then(() => t.strictSame(warnings, []))
-    .then(() => {
-      warnings.length = 0
-    }))
+t.afterEach(() => {
+  warnings.length = 0
+})
 
-t.test('unclean, no force, throws', t =>
-  t.rejects(enforceClean({ cwd: 'unclean' }))
-    .then(() => t.strictSame(warnings, []))
-    .then(() => {
-      warnings.length = 0
-    }))
+t.test('clean, ok', async t => {
+  await t.resolveMatch(enforceClean({ cwd: 'clean' }), true)
+  t.strictSame(warnings, [])
+})
 
-t.test('unclean, forced, no throw', t =>
-  t.resolveMatch(enforceClean({ cwd: 'unclean', force: true }), true)
-    .then(() => t.strictSame(warnings, [
-      [
-        'version',
-        'Git working directory not clean, proceeding forcefully.',
-      ],
-    ]))
-    .then(() => {
-      warnings.length = 0
-    }))
+t.test('unclean, no force, throws', async t => {
+  await t.rejects(enforceClean({ cwd: 'unclean' }))
+  t.strictSame(warnings, [])
+})
 
-t.test('nogit, return false, no throw', t =>
-  t.resolveMatch(enforceClean({ cwd: 'nogit' }), false)
-    .then(() => t.strictSame(warnings, [
-      [
-        'version',
-        'This is a Git checkout, but the git command was not found.',
-        'npm could not create a Git tag for this release!',
-      ],
-    ]))
-    .then(() => {
-      warnings.length = 0
-    }))
+t.test('unclean, forced, no throw', async t => {
+  await t.resolveMatch(enforceClean({ cwd: 'unclean', force: true }), true)
+  t.strictSame(warnings, [
+    [
+      'version',
+      'Git working directory not clean, proceeding forcefully.',
+    ],
+  ])
+})
 
-t.test('other error, throw it', t =>
-  t.rejects(enforceClean({ cwd: 'error' }), new Error('poop'))
-    .then(() => t.strictSame(warnings, []))
-    .then(() => {
-      warnings.length = 0
-    }))
+t.test('nogit, return false, no throw', async t => {
+  await t.resolveMatch(enforceClean({ cwd: 'nogit' }), false)
+  t.strictSame(warnings, [
+    [
+      'version',
+      'This is a Git checkout, but the git command was not found.',
+      'npm could not create a Git tag for this release!',
+    ],
+  ])
+})
+
+t.test('other error, throw it', async t => {
+  await t.rejects(enforceClean({ cwd: 'error' }), new Error('poop'))
+  t.strictSame(warnings, [])
+})