Skip to content

Commit

Permalink
Merge pull request #15 from julianfrank/master
Browse files Browse the repository at this point in the history
Use Latest Socket.io Client
  • Loading branch information
stbrenner committed Nov 25, 2017
2 parents a2c23da + f26b260 commit f0b8ab6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
language: node_js
node_js:
- "0.10"
- "0.8"
- "0.6"
- "8.9.1"
- "9.2.0"
notifications:
email:
on_success: never
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"test": "mocha test/*.js"
},
"dependencies": {
"socket.io-client": ">=0.9.16"
"socket.io-client": ">=2.0.4"
},
"devDependencies": {
"mocha": "",
Expand Down
6 changes: 3 additions & 3 deletions test/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@ describe('proxy.connect', function() {
it('connects to the destination through the proxy', function() {
process.env.http_proxy = 'http://proxy:8081';
proxy.init();
var socket = proxy.connect('https://destination');
var socket = proxy.connect('https://www.google.com');
should.exist(socket);
});
});
describe('and http_proxy env variable not defined', function() {
it('directly connects to the destination', function() {
process.env.http_proxy = '';
proxy.init();
var socket = proxy.connect('http://destination');
var socket = proxy.connect('http://www.google.com');
should.exist(socket);
});
});
});
describe('with proxy server URL', function() {
it('connects to the specified proxy server', function() {
proxy.init('http://proxy:8080');
var socket = proxy.connect('http://destination');
var socket = proxy.connect('http://www.google.com');
should.exist(socket);
});
});
Expand Down

0 comments on commit f0b8ab6

Please sign in to comment.