Skip to content

Commit 13597a2

Browse files
anshumanvanshumanv
authored
refactor: migrate tests on async await (#3460)
* refactor: migrate tests on async await * refactor: migrate tests on async await * refactor: migrate tests on async await
1 parent 591b810 commit 13597a2

8 files changed

+154
-221
lines changed

‎test/server/Server.test.js

Lines changed: 33 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -521,75 +521,63 @@ describe('Server', () => {
521521
);
522522
}
523523

524-
it('should returns the port when the port is specified', () => {
524+
it('should returns the port when the port is specified', async () => {
525525
process.env.WEBPACK_DEV_SERVER_PORT_RETRY = 1;
526526

527-
return Server.getFreePort(8082).then((freePort) => {
528-
expect(freePort).toEqual(8082);
529-
});
527+
const freePort = await Server.getFreePort(8082);
528+
expect(freePort).toEqual(8082);
530529
});
531530

532-
it('should returns the port when the port is null', () => {
531+
it('should returns the port when the port is null', async () => {
533532
const retryCount = 2;
534533

535534
process.env.WEBPACK_DEV_SERVER_PORT_RETRY = 2;
536535

537-
return createDummyServers(retryCount)
538-
.then(() => Server.getFreePort(null))
539-
.then((freePort) => {
540-
expect(freePort).toEqual(60000 + retryCount);
541-
});
536+
await createDummyServers(retryCount);
537+
const freePort = await Server.getFreePort(null);
538+
expect(freePort).toEqual(60000 + retryCount);
542539
});
543540

544-
it('should returns the port when the port is undefined', () => {
541+
it('should returns the port when the port is undefined', async () => {
545542
const retryCount = 3;
546543

547544
process.env.WEBPACK_DEV_SERVER_PORT_RETRY = 3;
548545

549-
return (
550-
createDummyServers(retryCount)
551-
// eslint-disable-next-line no-undefined
552-
.then(() => Server.getFreePort(undefined))
553-
.then((freePort) => {
554-
expect(freePort).toEqual(60000 + retryCount);
555-
})
556-
);
546+
await createDummyServers(retryCount);
547+
// eslint-disable-next-line no-undefined
548+
const freePort = await Server.getFreePort(undefined);
549+
expect(freePort).toEqual(60000 + retryCount);
557550
});
558551

559-
it('should retry finding the port for up to defaultPortRetry times (number)', () => {
560-
const retryCount = 4;
552+
it('should retry finding the port for up to defaultPortRetry times (number)', async () => {
553+
const retryCount = 3;
561554

562555
process.env.WEBPACK_DEV_SERVER_PORT_RETRY = retryCount;
563556

564-
return createDummyServers(retryCount)
565-
.then(() => Server.getFreePort())
566-
.then((freePort) => {
567-
expect(freePort).toEqual(60000 + retryCount);
568-
});
557+
await createDummyServers(retryCount);
558+
const freePort = await Server.getFreePort();
559+
expect(freePort).toEqual(60000 + retryCount);
569560
});
570561

571-
it('should retry finding the port for up to defaultPortRetry times (string)', () => {
572-
const retryCount = 5;
562+
it('should retry finding the port for up to defaultPortRetry times (string)', async () => {
563+
const retryCount = 3;
573564

574565
process.env.WEBPACK_DEV_SERVER_PORT_RETRY = `${retryCount}`;
575566

576-
return createDummyServers(retryCount)
577-
.then(() => Server.getFreePort())
578-
.then((freePort) => {
579-
expect(freePort).toEqual(60000 + retryCount);
580-
});
567+
await createDummyServers(retryCount);
568+
const freePort = await Server.getFreePort();
569+
expect(freePort).toEqual(60000 + retryCount);
581570
});
582571

583-
it('should retry finding the port when serial ports are busy', () => {
572+
// TODO: fix me, Flaky on CI
573+
it('should retry finding the port when serial ports are busy', async () => {
584574
const busyPorts = [60000, 60001, 60002, 60003, 60004, 60005, 60006];
585575

586576
process.env.WEBPACK_DEV_SERVER_PORT_RETRY = 6;
587577

588-
return createDummyServers(busyPorts)
589-
.then(() => Server.getFreePort())
590-
.then((freePort) => {
591-
expect(freePort).toEqual(60000 + busyPorts.length);
592-
});
578+
await createDummyServers(busyPorts);
579+
const freePort = await Server.getFreePort();
580+
expect(freePort).toEqual(60000 + busyPorts.length);
593581
});
594582

595583
it("should throws the error when the port isn't found", async () => {
@@ -605,17 +593,16 @@ describe('Server', () => {
605593

606594
try {
607595
await Server.getFreePort();
608-
} catch (error) {
609-
expect(error.message).toMatchSnapshot();
596+
} catch (err) {
597+
expect(err.message).toMatchSnapshot();
610598
}
611599
});
612600

613-
it('should work with findPort util', () => {
614-
process.env.WEBPACK_DEV_SERVER_PORT_RETRY = 5;
601+
it('should work with findPort util', async () => {
602+
process.env.DEFAULT_PORT_RETRY = 5;
615603

616-
return findPort(8082).then((freePort) => {
617-
expect(freePort).toEqual(8082);
618-
});
604+
const freePort = await findPort(8082);
605+
expect(freePort).toEqual(8082);
619606
});
620607
});
621608
});

‎test/server/client-option.test.js

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,10 @@ describe('client option', () => {
8080
},
8181
port,
8282
},
83-
() => {
84-
request(server.app)
85-
.get('/main.js')
86-
.then((res) => {
87-
expect(res.text).not.toMatch(/client\/index\.js/);
88-
})
89-
.then(done, done);
83+
async () => {
84+
const res = await request(server.app).get('/main.js');
85+
expect(res.text).not.toMatch(/client\/index\.js/);
86+
done();
9087
}
9188
);
9289
});
@@ -100,13 +97,10 @@ describe('client option', () => {
10097
},
10198
port,
10299
},
103-
() => {
104-
request(server.app)
105-
.get('/main.js')
106-
.then((res) => {
107-
expect(res.text).not.toMatch(/webpack\/hot\/dev-server\.js/);
108-
})
109-
.then(done, done);
100+
async () => {
101+
const res = await request(server.app).get('/main.js');
102+
expect(res.text).not.toMatch(/webpack\/hot\/dev-server\.js/);
103+
done();
110104
}
111105
);
112106
});

‎test/server/hot-option.test.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,10 @@ describe('hot option', () => {
7777

7878
afterAll(testServer.close);
7979

80-
it('should NOT include hot script in the bundle', (done) => {
81-
req
82-
.get('/main.js')
83-
.expect(200)
84-
.then(({ text }) => {
85-
expect(text).not.toMatch(/webpack\/hot\/dev-server\.js/);
86-
done();
87-
});
80+
it('should NOT include hot script in the bundle', async () => {
81+
const res = await req.get('/main.js');
82+
expect(res.status).toEqual(200);
83+
expect(res.text).not.toMatch(/webpack\/hot\/dev-server\.js/);
8884
});
8985
});
9086

‎test/server/http2-option.test.js

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,11 @@ describe('http2 option', () => {
106106
req = request(server.app);
107107
});
108108

109-
it('Request to index', (done) => {
110-
req
111-
.get('/')
112-
.expect(200, /Heyo/)
113-
.then(({ res }) => {
114-
expect(res.httpVersion).not.toEqual('2.0');
115-
done();
116-
});
109+
it('Request to index', async () => {
110+
const res = await req.get('/');
111+
expect(res.status).toEqual(200);
112+
expect(res.text).toContain('Heyo');
113+
expect(res.res.httpVersion).not.toEqual('2.0');
117114
});
118115

119116
afterAll(testServer.close);

‎test/server/onAfterSetupMiddleware-option.test.js

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,17 @@ describe('onAfterSetupMiddleware option', () => {
3939

4040
afterAll(testServer.close);
4141

42-
it('should handle after route', () =>
43-
req
44-
.get('/after/some/path')
45-
.expect('Content-Type', 'text/html; charset=utf-8')
46-
.expect(200)
47-
.then((response) => {
48-
expect(response.text).toBe('after');
49-
}));
50-
51-
it('should handle POST requests to after route', () =>
52-
req
53-
.post('/after/some/path')
54-
.expect('Content-Type', 'text/html; charset=utf-8')
55-
.expect(200)
56-
.then((response) => {
57-
expect(response.text).toBe('after POST');
58-
}));
42+
it('should handle after route', async () => {
43+
const res = await req.get('/after/some/path');
44+
expect(res.headers['content-type']).toEqual('text/html; charset=utf-8');
45+
expect(res.status).toEqual(200);
46+
expect(res.text).toBe('after');
47+
});
48+
49+
it('should handle POST requests to after route', async () => {
50+
const res = await req.post('/after/some/path');
51+
expect(res.headers['content-type']).toEqual('text/html; charset=utf-8');
52+
expect(res.status).toEqual(200);
53+
expect(res.text).toBe('after POST');
54+
});
5955
});

‎test/server/onBeforeSetupMiddleware-option.test.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,10 @@ describe('onBeforeSetupMiddleware option', () => {
3535

3636
afterAll(testServer.close);
3737

38-
it('should handle before route', () =>
39-
req
40-
.get('/before/some/path')
41-
.expect('Content-Type', 'text/html; charset=utf-8')
42-
.expect(200)
43-
.then((response) => {
44-
expect(response.text).toBe('before');
45-
}));
38+
it('should handle before route', async () => {
39+
const res = await req.get('/before/some/path');
40+
expect(res.headers['content-type']).toEqual('text/html; charset=utf-8');
41+
expect(res.status).toEqual(200);
42+
expect(res.text).toBe('before');
43+
});
4644
});

‎test/server/utils/DevServerPlugin.test.js

Lines changed: 39 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ describe('DevServerPlugin util', () => {
1414
return compiler.options.entry;
1515
}
1616

17-
it('should preserves dynamic entry points', (done) => {
17+
it('should preserves dynamic entry points', async () => {
1818
let i = 0;
1919
const webpackOptions = {
2020
// simulate dynamic entry
@@ -42,33 +42,27 @@ describe('DevServerPlugin util', () => {
4242

4343
plugin.apply(compiler);
4444

45-
getEntries(compiler).then((entries) => {
46-
expect(typeof entries).toEqual('function');
47-
48-
entries()
49-
.then((entryFirstRun) =>
50-
entries().then((entrySecondRun) => {
51-
if (isWebpack5) {
52-
expect(entryFirstRun.main.import.length).toEqual(1);
53-
expect(entryFirstRun.main.import[0]).toEqual('./src-1.js');
54-
55-
expect(entrySecondRun.main.import.length).toEqual(1);
56-
expect(entrySecondRun.main.import[0]).toEqual('./src-2.js');
57-
} else {
58-
expect(entryFirstRun.length).toEqual(3);
59-
expect(entryFirstRun[2]).toEqual('./src-1.js');
60-
61-
expect(entrySecondRun.length).toEqual(3);
62-
expect(entrySecondRun[2]).toEqual('./src-2.js');
63-
}
64-
done();
65-
})
66-
)
67-
.catch(done);
68-
});
45+
const entries = await getEntries(compiler);
46+
expect(typeof entries).toEqual('function');
47+
48+
const entryFirstRun = await entries();
49+
const entrySecondRun = await entries();
50+
if (isWebpack5) {
51+
expect(entryFirstRun.main.import.length).toEqual(1);
52+
expect(entryFirstRun.main.import[0]).toEqual('./src-1.js');
53+
54+
expect(entrySecondRun.main.import.length).toEqual(1);
55+
expect(entrySecondRun.main.import[0]).toEqual('./src-2.js');
56+
} else {
57+
expect(entryFirstRun.length).toEqual(3);
58+
expect(entryFirstRun[2]).toEqual('./src-1.js');
59+
60+
expect(entrySecondRun.length).toEqual(3);
61+
expect(entrySecondRun[2]).toEqual('./src-2.js');
62+
}
6963
});
7064

71-
it('should preserves asynchronous dynamic entry points', (done) => {
65+
it('should preserves asynchronous dynamic entry points', async () => {
7266
let i = 0;
7367
const webpackOptions = {
7468
// simulate async dynamic entry
@@ -96,30 +90,25 @@ describe('DevServerPlugin util', () => {
9690

9791
const plugin = new DevServerPlugin(devServerOptions);
9892
plugin.apply(compiler);
99-
getEntries(compiler).then((entries) => {
100-
expect(typeof entries).toEqual('function');
101-
102-
entries()
103-
.then((entryFirstRun) =>
104-
entries().then((entrySecondRun) => {
105-
if (isWebpack5) {
106-
expect(entryFirstRun.main.import.length).toEqual(1);
107-
expect(entryFirstRun.main.import[0]).toEqual('./src-1.js');
108-
109-
expect(entrySecondRun.main.import.length).toEqual(1);
110-
expect(entrySecondRun.main.import[0]).toEqual('./src-2.js');
111-
} else {
112-
expect(entryFirstRun.length).toEqual(3);
113-
expect(entryFirstRun[2]).toEqual('./src-1.js');
114-
115-
expect(entrySecondRun.length).toEqual(3);
116-
expect(entrySecondRun[2]).toEqual('./src-2.js');
117-
}
118-
done();
119-
})
120-
)
121-
.catch(done);
122-
});
93+
94+
const entries = await getEntries(compiler);
95+
expect(typeof entries).toEqual('function');
96+
97+
const entryFirstRun = await entries();
98+
const entrySecondRun = await entries();
99+
if (isWebpack5) {
100+
expect(entryFirstRun.main.import.length).toEqual(1);
101+
expect(entryFirstRun.main.import[0]).toEqual('./src-1.js');
102+
103+
expect(entrySecondRun.main.import.length).toEqual(1);
104+
expect(entrySecondRun.main.import[0]).toEqual('./src-2.js');
105+
} else {
106+
expect(entryFirstRun.length).toEqual(3);
107+
expect(entryFirstRun[2]).toEqual('./src-1.js');
108+
109+
expect(entrySecondRun.length).toEqual(3);
110+
expect(entrySecondRun[2]).toEqual('./src-2.js');
111+
}
123112
});
124113

125114
it("should doesn't add the HMR plugin if not hot and no plugins", () => {

0 commit comments

Comments
 (0)