Skip to content
This repository was archived by the owner on Dec 16, 2022. It is now read-only.

Commit ced885a

Browse files
committed
randomize test server port
1 parent f285bd3 commit ced885a

File tree

3 files changed

+30
-7
lines changed

3 files changed

+30
-7
lines changed

src/content-scripts/__tests__/attributes.spec.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {launchPuppeteerWithExtension, runDist} from '../../__e2e-tests__/helpers
44
import { waitForAndGetEvents, cleanEventLog, startServer } from './helpers'
55

66
let server
7+
let port
78
let browser
89
let page
910

@@ -12,7 +13,11 @@ describe.only('attributes', () => {
1213
await runDist()
1314
const buildDir = process.env.NODE_ENV === 'production' ? '../../../dist' : '../../../build'
1415
const fixture = './fixtures/attributes.html'
15-
server = await startServer(buildDir, fixture)
16+
{
17+
const {server: _s, port: _p} = await startServer(buildDir, fixture)
18+
server = _s
19+
port = _p
20+
}
1621
return done()
1722
}, 20000)
1823

@@ -25,7 +30,7 @@ describe.only('attributes', () => {
2530
beforeEach(async () => {
2631
browser = await launchPuppeteerWithExtension(puppeteer)
2732
page = await browser.newPage()
28-
await page.goto('http://localhost:3000/')
33+
await page.goto(`http://localhost:${port}/`)
2934
await cleanEventLog(page)
3035
})
3136

src/content-scripts/__tests__/forms.spec.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {launchPuppeteerWithExtension, runDist} from '../../__e2e-tests__/helpers
44
import { waitForAndGetEvents, cleanEventLog, startServer } from './helpers'
55

66
let server
7+
let port
78
let browser
89
let page
910

@@ -12,7 +13,11 @@ describe('forms', () => {
1213
await runDist()
1314
const buildDir = process.env.NODE_ENV === 'production' ? '../../../dist' : '../../../build'
1415
const fixture = './fixtures/forms.html'
15-
server = await startServer(buildDir, fixture)
16+
{
17+
const {server: _s, port: _p} = await startServer(buildDir, fixture)
18+
server = _s
19+
port = _p
20+
}
1621
return done()
1722
}, 20000)
1823

@@ -25,7 +30,7 @@ describe('forms', () => {
2530
beforeEach(async () => {
2631
browser = await launchPuppeteerWithExtension(puppeteer)
2732
page = await browser.newPage()
28-
await page.goto('http://localhost:3000/')
33+
await page.goto(`http://localhost:${port}/`)
2934
await cleanEventLog(page)
3035
})
3136

src/content-scripts/__tests__/helpers.js

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,21 @@ export const startServer = function (buildDir, file) {
2525
app.get('/', (req, res) => {
2626
res.status(200).sendFile(file, { root: __dirname })
2727
})
28-
const server = app.listen(3000, () => {
29-
return resolve(server)
30-
})
28+
let server
29+
let port
30+
const retry = (e) => {
31+
if(e.code == 'EADDRINUSE') {
32+
setTimeout(() => connect, 1000)
33+
}
34+
}
35+
const connect = () => {
36+
port = 0|(Math.random() * 1000) + 3000
37+
server = app.listen(port)
38+
server.once('error', retry)
39+
server.once('listening', () => {
40+
return resolve({server, port})
41+
})
42+
}
43+
connect()
3144
})
3245
}

0 commit comments

Comments
 (0)