From d5ca0a5639841059587bd31c2b5d64bee6b3e37a Mon Sep 17 00:00:00 2001 From: Clark Du Date: Fri, 30 Mar 2018 17:20:16 +0800 Subject: [PATCH] fix: correct afterall --- test/e2e/basic.browser.test.js | 5 +++-- test/e2e/children.patch.browser.test.js | 5 +++-- test/unit/basic.dev.test.js | 2 +- test/unit/basic.generate.test.js | 2 +- test/unit/basic.ssr.test.js | 2 +- test/unit/children.test.js | 2 +- test/unit/custom-dirs.test.js | 2 +- test/unit/debug.test.js | 2 +- test/unit/deprecate.test.js | 2 +- test/unit/error.test.js | 2 +- test/unit/express.test.js | 2 +- test/unit/fallback.generate.test.js | 2 +- test/unit/module.test.js | 2 +- test/unit/spa.test.js | 2 +- test/unit/ssr.test.js | 2 +- test/unit/with-config.test.js | 2 +- 16 files changed, 20 insertions(+), 18 deletions(-) diff --git a/test/e2e/basic.browser.test.js b/test/e2e/basic.browser.test.js index 69e584648d..c285c9e665 100644 --- a/test/e2e/basic.browser.test.js +++ b/test/e2e/basic.browser.test.js @@ -191,11 +191,12 @@ describe('basic browser', () => { }) // Close server and ask nuxt to stop listening to file changes - afterAll('Closing server and nuxt.js', async () => { + afterAll(async () => { await nuxt.close() }) - afterAll('Stop browser', async () => { + // Stop browser + afterAll(async () => { await page.close() await browser.close() }) diff --git a/test/e2e/children.patch.browser.test.js b/test/e2e/children.patch.browser.test.js index f303545918..0f52b75655 100644 --- a/test/e2e/children.patch.browser.test.js +++ b/test/e2e/children.patch.browser.test.js @@ -121,11 +121,12 @@ describe('children patch (browser)', () => { }) // Close server and ask nuxt to stop listening to file changes - afterAll('Closing server and nuxt.js', async () => { + afterAll(async () => { await nuxt.close() }) - afterAll('Stop browser', async () => { + // Stop browser + afterAll(async () => { await page.close() await browser.close() }) diff --git a/test/unit/basic.dev.test.js b/test/unit/basic.dev.test.js index 2fed94d1f3..c75268fafc 100644 --- a/test/unit/basic.dev.test.js +++ b/test/unit/basic.dev.test.js @@ -48,7 +48,7 @@ describe('basic dev', () => { // }) // Close server and ask nuxt to stop listening to file changes - afterAll('Closing server and nuxt.js', async () => { + afterAll(async () => { await nuxt.close() }) }) diff --git a/test/unit/basic.generate.test.js b/test/unit/basic.generate.test.js index 29968a004e..fb407c79e3 100644 --- a/test/unit/basic.generate.test.js +++ b/test/unit/basic.generate.test.js @@ -181,7 +181,7 @@ describe('basic generate', () => { }) // Close server and ask nuxt to stop listening to file changes - afterAll('Closing server', async () => { + afterAll(async () => { await server.close() }) }) diff --git a/test/unit/basic.ssr.test.js b/test/unit/basic.ssr.test.js index 88389ef868..39479ed4a1 100644 --- a/test/unit/basic.ssr.test.js +++ b/test/unit/basic.ssr.test.js @@ -266,7 +266,7 @@ describe('basic ssr', () => { }) // Close server and ask nuxt to stop listening to file changes - afterAll('Closing server and nuxt.js', async () => { + afterAll(async () => { await nuxt.close() }) }) diff --git a/test/unit/children.test.js b/test/unit/children.test.js index c5dc86d9a1..e634765713 100644 --- a/test/unit/children.test.js +++ b/test/unit/children.test.js @@ -48,7 +48,7 @@ describe('children', () => { }) // Close server and ask nuxt to stop listening to file changes - afterAll('Closing server and nuxt.js', async () => { + afterAll(async () => { await nuxt.close() }) }) diff --git a/test/unit/custom-dirs.test.js b/test/unit/custom-dirs.test.js index 789491f269..e391547b21 100644 --- a/test/unit/custom-dirs.test.js +++ b/test/unit/custom-dirs.test.js @@ -42,7 +42,7 @@ describe('custom-dirs', () => { }) // Close server and ask nuxt to stop listening to file changes - afterAll('Closing server and nuxt.js', async () => { + afterAll(async () => { await nuxt.close() }) }) diff --git a/test/unit/debug.test.js b/test/unit/debug.test.js index 0438c76319..5f79d35fb2 100644 --- a/test/unit/debug.test.js +++ b/test/unit/debug.test.js @@ -89,7 +89,7 @@ describe.skip('debug', () => { }) // Close server and ask nuxt to stop listening to file changes - afterAll('Closing server and nuxt.js', async () => { + afterAll(async () => { await nuxt.close() }) }) diff --git a/test/unit/deprecate.test.js b/test/unit/deprecate.test.js index 59469438d7..bca55b6c15 100644 --- a/test/unit/deprecate.test.js +++ b/test/unit/deprecate.test.js @@ -17,7 +17,7 @@ describe.skip('deprecate', () => { test() // Close server and ask nuxt to stop listening to file changes - afterAll('Closing server and nuxt.js', async () => { + afterAll(async () => { await nuxt.close() }) }) diff --git a/test/unit/error.test.js b/test/unit/error.test.js index 43bf15ed69..56c4291f8e 100644 --- a/test/unit/error.test.js +++ b/test/unit/error.test.js @@ -39,7 +39,7 @@ describe('error', () => { }) // Close server and ask nuxt to stop listening to file changes - afterAll('Closing server and nuxt.js', async () => { + afterAll(async () => { await nuxt.close() }) }) diff --git a/test/unit/express.test.js b/test/unit/express.test.js index 1f770394dc..4810140c2d 100644 --- a/test/unit/express.test.js +++ b/test/unit/express.test.js @@ -32,7 +32,7 @@ describe('express', () => { expect(html.includes('

My component!

')).toBe(true) }) - afterAll('close server', async () => { + afterAll(async () => { await nuxt.close() await new Promise((resolve, reject) => { server.close(err => err ? reject(err) : resolve()) diff --git a/test/unit/fallback.generate.test.js b/test/unit/fallback.generate.test.js index 6975b85f23..ef9a5fcac9 100644 --- a/test/unit/fallback.generate.test.js +++ b/test/unit/fallback.generate.test.js @@ -75,7 +75,7 @@ describe('fallback generate', () => { ) // Close server and ask nuxt to stop listening to file changes - afterAll('Closing server', async () => { + afterAll(async () => { await server.close() }) }) diff --git a/test/unit/module.test.js b/test/unit/module.test.js index 96573c978f..a331559f53 100644 --- a/test/unit/module.test.js +++ b/test/unit/module.test.js @@ -54,7 +54,7 @@ describe.skip('module', () => { }) // Close server and ask nuxt to stop listening to file changes - afterAll('Closing server and nuxt.js', async () => { + afterAll(async () => { await nuxt.close() }) }) diff --git a/test/unit/spa.test.js b/test/unit/spa.test.js index 629f08d810..54420ec4c6 100644 --- a/test/unit/spa.test.js +++ b/test/unit/spa.test.js @@ -71,7 +71,7 @@ describe.skip('spa', () => { }) // Close server and ask nuxt to stop listening to file changes - afterAll('Closing server and nuxt.js', async () => { + afterAll(async () => { await nuxt.close() }) }) diff --git a/test/unit/ssr.test.js b/test/unit/ssr.test.js index fd03d302f2..9907554f67 100644 --- a/test/unit/ssr.test.js +++ b/test/unit/ssr.test.js @@ -102,7 +102,7 @@ describe('ssr', () => { }) // Close server and ask nuxt to stop listening to file changes - afterAll('Closing server and nuxt.js', async () => { + afterAll(async () => { await nuxt.close() }) }) diff --git a/test/unit/with-config.test.js b/test/unit/with-config.test.js index 2e7b85b011..db7068dc84 100644 --- a/test/unit/with-config.test.js +++ b/test/unit/with-config.test.js @@ -179,7 +179,7 @@ describe('with-config', () => { }) // Close server and ask nuxt to stop listening to file changes - afterAll('Closing server and nuxt.js', async () => { + afterAll(async () => { await nuxt.close() }) })