Skip to content

Commit a6fa2c5

Browse files
snitin315snitin315
committed
test: udpates
1 parent a224617 commit a6fa2c5

9 files changed

+117
-91
lines changed

‎test/e2e/DevServer.test.js

+27-15
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,22 @@ describe('DevServer', () => {
1717
});
1818

1919
it('should add devServer entry points to a multi entry point object', (done) => {
20-
testBin('--config ./test/fixtures/dev-server/multi-entry.js')
20+
testBin(
21+
'--config ./test/fixtures/dev-server/multi-entry.js --stats=verbose'
22+
)
2123
.then((output) => {
2224
expect(output.exitCode).toEqual(0);
2325
expect(output.stderr).toContain('client/default/index.js?');
2426
expect(output.stderr).toContain('foo.js');
25-
expect(output.stderr).toContain('bar.js');
2627
done();
2728
})
2829
.catch(done);
2930
});
3031

3132
webpack5Test('should supports entry as descriptor', (done) => {
32-
testBin('--config ./test/fixtures/entry-as-descriptor/webpack.config --stats detailed')
33+
testBin(
34+
'--config ./test/fixtures/entry-as-descriptor/webpack.config --stats detailed'
35+
)
3336
.then((output) => {
3437
expect(output.exitCode).toEqual(0);
3538
expect(output.stderr).toContain('foo.js');
@@ -39,7 +42,9 @@ describe('DevServer', () => {
3942
});
4043

4144
it('should only prepends devServer entry points to "web" target', (done) => {
42-
testBin('--config ./test/fixtures/dev-server/default-config.js --target web')
45+
testBin(
46+
'--config ./test/fixtures/dev-server/default-config.js --target web'
47+
)
4348
.then((output) => {
4449
expect(output.exitCode).toEqual(0);
4550
expect(output.stderr).toContain('client/default/index.js?');
@@ -50,7 +55,9 @@ describe('DevServer', () => {
5055
});
5156

5257
it('should not prepend devServer entry points to "node" target', (done) => {
53-
testBin('--config ./test/fixtures/dev-server/default-config.js --target node')
58+
testBin(
59+
'--config ./test/fixtures/dev-server/default-config.js --target node'
60+
)
5461
.then((output) => {
5562
expect(output.exitCode).toEqual(0);
5663
expect(output.stderr).not.toContain('client/default/index.js?');
@@ -61,7 +68,9 @@ describe('DevServer', () => {
6168
});
6269

6370
it('should prepends the hot runtime to "node" target as well', (done) => {
64-
testBin('--config ./test/fixtures/dev-server/default-config.js --target node --hot')
71+
testBin(
72+
'--config ./test/fixtures/dev-server/default-config.js --target node --hot'
73+
)
6574
.then((output) => {
6675
expect(output.exitCode).toEqual(0);
6776
expect(output.stderr).toContain('webpack/hot/dev-server');
@@ -90,13 +99,16 @@ describe('DevServer', () => {
9099
.catch(done);
91100
});
92101

93-
it('should prepend devServer entry points depending on targetProperties', (done) => {
94-
testBin('--config ./test/fixtures/dev-server/target-config.js')
95-
.then((output) => {
96-
expect(output.exitCode).toEqual(0);
97-
expect(output.stderr).toContain('client/default/index.js');
98-
done();
99-
})
100-
.catch(done);
101-
});
102+
webpack5Test(
103+
'should prepend devServer entry points depending on targetProperties',
104+
(done) => {
105+
testBin('--config ./test/fixtures/dev-server/target-config.js')
106+
.then((output) => {
107+
expect(output.exitCode).toEqual(0);
108+
expect(output.stderr).toContain('client/default/index.js');
109+
done();
110+
})
111+
.catch(done);
112+
}
113+
);
102114
});

‎test/fixtures/dev-server/bar.js

+2
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
'use strict';
2+
13
console.log('I am bar');

‎test/fixtures/dev-server/client-custom-path-config.js

+15-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1+
'use strict';
2+
13
const { resolve } = require('path');
24

35
module.exports = {
4-
mode: 'development',
5-
stats: 'detailed',
6-
entry: resolve(__dirname, './foo.js'),
7-
devServer: {
8-
client: {
9-
path: '/custom/path',
10-
},
11-
transportMode: {
12-
server: 'sockjs',
13-
client: 'sockjs',
14-
},
15-
}
16-
}
6+
mode: 'development',
7+
stats: 'detailed',
8+
entry: resolve(__dirname, './foo.js'),
9+
devServer: {
10+
client: {
11+
path: '/custom/path',
12+
},
13+
transportMode: {
14+
server: 'sockjs',
15+
client: 'sockjs',
16+
},
17+
},
18+
};

‎test/fixtures/dev-server/client-default-path-config.js

+15-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1+
'use strict';
2+
13
const { resolve } = require('path');
24

35
module.exports = {
4-
mode: 'development',
5-
stats: 'detailed',
6-
entry: resolve(__dirname, './foo.js'),
7-
devServer: {
8-
client: {
9-
path: '/ws',
10-
},
11-
transportMode: {
12-
server: 'sockjs',
13-
client: 'sockjs',
14-
},
15-
}
16-
}
6+
mode: 'development',
7+
stats: 'detailed',
8+
entry: resolve(__dirname, './foo.js'),
9+
devServer: {
10+
client: {
11+
path: '/ws',
12+
},
13+
transportMode: {
14+
server: 'sockjs',
15+
client: 'sockjs',
16+
},
17+
},
18+
};

‎test/fixtures/dev-server/default-config.js

+15-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1+
'use strict';
2+
13
const { resolve } = require('path');
24

35
module.exports = {
4-
mode: 'development',
5-
stats: 'detailed',
6-
entry: resolve(__dirname, './foo.js'),
7-
devServer: {
8-
client: {
9-
path: '/custom/path',
10-
},
11-
transportMode: {
12-
server: 'sockjs',
13-
client: 'sockjs',
14-
},
15-
}
16-
}
6+
mode: 'development',
7+
stats: 'detailed',
8+
entry: resolve(__dirname, './foo.js'),
9+
devServer: {
10+
client: {
11+
path: '/custom/path',
12+
},
13+
transportMode: {
14+
server: 'sockjs',
15+
client: 'sockjs',
16+
},
17+
},
18+
};

‎test/fixtures/dev-server/foo.js

+2
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
'use strict';
2+
13
console.log('I am foo');

‎test/fixtures/dev-server/multi-entry.js

+16-14
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1+
'use strict';
2+
13
const { resolve } = require('path');
24

35
module.exports = {
4-
mode: 'development',
5-
stats: 'detailed',
6-
context: __dirname,
7-
entry: {
8-
foo: resolve(__dirname, './foo.js'),
9-
bar: resolve(__dirname, './bar.js'),
10-
},
11-
devServer: {
12-
transportMode: {
13-
server: 'sockjs',
14-
client: 'sockjs',
15-
},
16-
}
17-
}
6+
mode: 'development',
7+
stats: 'detailed',
8+
context: __dirname,
9+
entry: {
10+
foo: resolve(__dirname, './foo.js'),
11+
bar: resolve(__dirname, './bar.js'),
12+
},
13+
devServer: {
14+
transportMode: {
15+
server: 'sockjs',
16+
client: 'sockjs',
17+
},
18+
},
19+
};

‎test/fixtures/dev-server/target-config.js

+20-18
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1+
'use strict';
2+
13
const { resolve } = require('path');
24

35
module.exports = {
4-
mode: 'development',
5-
stats: 'detailed',
6-
entry: resolve(__dirname, './foo.js'),
7-
target: ['web', 'webworker'],
8-
output: {
9-
chunkLoading: false,
10-
wasmLoading: false,
11-
workerChunkLoading: false,
6+
mode: 'development',
7+
stats: 'detailed',
8+
entry: resolve(__dirname, './foo.js'),
9+
target: ['web', 'webworker'],
10+
output: {
11+
chunkLoading: false,
12+
wasmLoading: false,
13+
workerChunkLoading: false,
14+
},
15+
devServer: {
16+
client: {
17+
path: '/custom/path',
18+
},
19+
transportMode: {
20+
server: 'sockjs',
21+
client: 'sockjs',
1222
},
13-
devServer: {
14-
client: {
15-
path: '/custom/path',
16-
},
17-
transportMode: {
18-
server: 'sockjs',
19-
client: 'sockjs',
20-
},
21-
}
22-
}
23+
},
24+
};

‎test/server/utils/updateCompiler.test.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ describe('updateCompiler', () => {
4343
expect(compiler.hooks.entryOption.taps.length).toBe(1);
4444
expect(tapsByHMR).toEqual(0);
4545
expect(tapsByProvidePlugin).toEqual(1);
46-
expect(tapsByDevServerPlugin).toEqual(isWebpack5 ? 1 : 0);
46+
expect(tapsByDevServerPlugin).toEqual(0);
4747
expect(compiler.options.plugins).toHaveLength(0);
4848
});
4949
});
@@ -87,7 +87,7 @@ describe('updateCompiler', () => {
8787
expect(compiler.hooks.entryOption.taps.length).toBe(1);
8888
expect(tapsByHMR).toEqual(1);
8989
expect(tapsByProvidePlugin).toEqual(1);
90-
expect(tapsByDevServerPlugin).toEqual(isWebpack5 ? 1 : 0);
90+
expect(tapsByDevServerPlugin).toEqual(0);
9191
});
9292
});
9393

@@ -131,8 +131,8 @@ describe('updateCompiler', () => {
131131

132132
expect(compiler.hooks.entryOption.taps.length).toBe(1);
133133
expect(tapsByHMR).toEqual(1);
134-
expect(tapsByProvidePlugin).toEqual(1);
135-
expect(tapsByDevServerPlugin).toEqual(isWebpack5 ? 1 : 0);
134+
expect(tapsByProvidePlugin).toEqual(isWebpack5 ? 4 : 1);
135+
expect(tapsByDevServerPlugin).toEqual(0);
136136
expect(compiler.options.plugins).toContainEqual(
137137
new webpack.HotModuleReplacementPlugin()
138138
);
@@ -181,7 +181,7 @@ describe('updateCompiler', () => {
181181
expect(compiler.hooks.entryOption.taps.length).toBe(1);
182182
expect(tapsByHMR).toEqual(1);
183183
expect(tapsByProvidePlugin).toEqual(1);
184-
expect(tapsByDevServerPlugin).toEqual(isWebpack5 ? 1 : 0);
184+
expect(tapsByDevServerPlugin).toEqual(0);
185185
});
186186
});
187187
});

0 commit comments

Comments
 (0)