1
1
'use strict' ;
2
2
3
3
const assert = require ( 'assert' ) ;
4
- const request = require ( 'request ' ) ;
4
+ const request = require ( 'supertest ' ) ;
5
5
const config = require ( './fixtures/simple-config/webpack.config' ) ;
6
6
const helper = require ( './helper' ) ;
7
7
8
- const requestSucceeds = done => ( err , res ) => {
9
- if ( err ) {
10
- done ( err ) ;
11
- }
12
-
13
- assert . equal ( res . statusCode , 200 ) ;
14
- done ( ) ;
15
- } ;
16
-
17
8
describe ( 'socket options' , ( ) => {
18
9
let server ;
10
+ let req ;
19
11
20
- afterEach ( helper . close ) ;
12
+ afterEach ( ( done ) => {
13
+ helper . close ( done )
14
+ req = null ;
15
+ server = null ;
16
+ } ) ;
21
17
describe ( 'default behavior' , ( ) => {
22
18
beforeEach ( ( done ) => {
23
19
server = helper . start ( config , { } , done ) ;
20
+ req = request ( 'http://localhost:8080' ) ;
24
21
} ) ;
25
22
26
23
it ( 'defaults to a path' , ( ) => {
27
24
assert . ok ( server . sockPath . match ( / \/ [ a - z 0 - 9 \- / ] + [ ^ / ] $ / ) ) ;
28
25
} ) ;
29
26
30
27
it ( 'responds with a 200' , ( done ) => {
31
- request ( 'http://localhost:8080/ sockjs-node', requestSucceeds ( done ) ) ;
28
+ req . get ( '/ sockjs-node') . expect ( 200 , done ) ;
32
29
} ) ;
33
30
} ) ;
34
31
@@ -38,14 +35,16 @@ describe('socket options', () => {
38
35
server = helper . start ( config , {
39
36
sockPath : '/foo/test/bar/'
40
37
} , done ) ;
38
+ req = request ( 'http://localhost:8080' ) ;
41
39
} ) ;
42
40
43
41
it ( 'sets the sock path correctly and strips leading and trailing /s' , ( ) => {
44
42
assert . equal ( server . sockPath , path ) ;
45
43
} ) ;
46
44
45
+
47
46
it ( 'responds with a 200 second' , ( done ) => {
48
- request ( `http://localhost:8080 ${ path } ` , requestSucceeds ( done ) ) ;
47
+ req . get ( path ) . expect ( 200 , done ) ;
49
48
} ) ;
50
49
} ) ;
51
50
} ) ;
0 commit comments