Skip to content

Commit f333479

Browse files
thiamsantosdarrachequesne
authored andcommittedOct 16, 2017
[test] Use npm scripts instead of gulp (#3078)
1 parent 3f61165 commit f333479

File tree

5 files changed

+9
-113
lines changed

5 files changed

+9
-113
lines changed
 

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ node_modules
1111
coverage
1212
.idea
1313
dist
14+
.nyc_output

‎Makefile

-8
This file was deleted.

‎gulpfile.js

-69
This file was deleted.

‎package.json

+3-10
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"url": "git://github.com/socketio/socket.io"
2222
},
2323
"scripts": {
24-
"test": "gulp test"
24+
"test": "nyc mocha --reporter spec --slow 200 --bail --timeout 10000 test/socket.io.js"
2525
},
2626
"dependencies": {
2727
"debug": "~2.6.6",
@@ -31,16 +31,9 @@
3131
"socket.io-parser": "~3.1.1"
3232
},
3333
"devDependencies": {
34-
"babel-preset-es2015": "^6.24.1",
35-
"del": "^2.2.2",
3634
"expect.js": "0.3.1",
37-
"gulp": "^3.9.1",
38-
"gulp-babel": "^6.1.2",
39-
"gulp-istanbul": "^1.1.1",
40-
"gulp-mocha": "^4.3.1",
41-
"gulp-task-listing": "1.0.1",
42-
"istanbul": "^0.4.5",
43-
"mocha": "^3.3.0",
35+
"mocha": "^3.5.3",
36+
"nyc": "^11.2.1",
4437
"superagent": "1.6.1",
4538
"supertest": "1.1.0"
4639
},

‎test/socket.io.js

+5-26
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
1-
var testVersion = process.env.TEST_VERSION;
21
var http = require('http').Server;
3-
var io;
4-
if (testVersion === 'compat') {
5-
console.log('testing compat version');
6-
io = require('../dist');
7-
} else {
8-
io = require('../lib');
9-
}
2+
var io = require('../lib');
103
var fs = require('fs');
114
var join = require('path').join;
125
var exec = require('child_process').exec;
@@ -432,18 +425,9 @@ describe('socket.io', function(){
432425
});
433426

434427
describe('namespaces', function(){
435-
var Socket;
436-
if (testVersion === 'compat') {
437-
Socket = require('../dist/socket');
438-
} else {
439-
Socket = require('../lib/socket');
440-
}
441-
var Namespace;
442-
if (testVersion === 'compat') {
443-
Namespace = require('../dist/namespace');
444-
} else {
445-
Namespace = require('../lib/namespace');
446-
}
428+
var Socket = require('../lib/socket');
429+
var Namespace = require('../lib/namespace');
430+
447431
it('should be accessible through .sockets', function(){
448432
var sio = io();
449433
expect(sio.sockets).to.be.a(Namespace);
@@ -2123,12 +2107,7 @@ describe('socket.io', function(){
21232107
});
21242108

21252109
describe('middleware', function(done){
2126-
var Socket;
2127-
if (testVersion === 'compat') {
2128-
Socket = require('../dist/socket');
2129-
} else {
2130-
Socket = require('../lib/socket');
2131-
}
2110+
var Socket = require('../lib/socket');
21322111

21332112
it('should call functions', function(done){
21342113
var srv = http();

0 commit comments

Comments
 (0)
Please sign in to comment.