Skip to content

Commit 478317b

Browse files
committed
test: avoid throwing in afterAll hooks
1 parent f92ffe1 commit 478317b

File tree

6 files changed

+36
-12
lines changed

6 files changed

+36
-12
lines changed

packages/@vue/cli-plugin-typescript/__tests__/tsPlugin.helper.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,11 @@ exports.assertBuild = async (name, options, customAssert) => {
6262
})
6363

6464
afterAll(async () => {
65-
await browser.close()
66-
server.close()
65+
if (browser) {
66+
await browser.close()
67+
}
68+
if (server) {
69+
server.close()
70+
}
6771
})
6872
}

packages/@vue/cli-service-global/__tests__/globalService.spec.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ test('global build', async () => {
7676
})
7777

7878
afterAll(async () => {
79-
await browser.close()
80-
server.close()
79+
if (browser) {
80+
await browser.close()
81+
}
82+
if (server) {
83+
server.close()
84+
}
8185
})

packages/@vue/cli-service-global/__tests__/globalServiceBuildLib.spec.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ test('global build --target lib', async () => {
5454
})
5555

5656
afterAll(async () => {
57-
await browser.close()
58-
server.close()
57+
if (browser) {
58+
await browser.close()
59+
}
60+
if (server) {
61+
server.close()
62+
}
5963
})

packages/@vue/cli-service-global/__tests__/globalServiceBuildWc.spec.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ test('global build --target wc', async () => {
5252
})
5353

5454
afterAll(async () => {
55-
await browser.close()
56-
server.close()
55+
if (browser) {
56+
await browser.close()
57+
}
58+
if (server) {
59+
server.close()
60+
}
5761
})

packages/@vue/cli-service/__tests__/buildLib.spec.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,12 @@ const launchPuppeteer = require('@vue/cli-test-utils/launchPuppeteer')
1010
let server, browser, page
1111

1212
afterEach(async () => {
13-
await browser.close()
14-
server.close()
13+
if (browser) {
14+
await browser.close()
15+
}
16+
if (server) {
17+
server.close()
18+
}
1519
})
1620

1721
test('build as lib', async () => {

packages/@vue/cli-service/__tests__/buildWc.spec.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@ test('build as single wc', async () => {
9090
})
9191

9292
afterEach(async () => {
93-
await browser.close()
94-
server.close()
93+
if (browser) {
94+
await browser.close()
95+
}
96+
if (server) {
97+
server.close()
98+
}
9599
})

0 commit comments

Comments
 (0)