Skip to content

Commit

Permalink
Merge pull request #436 from nkzawa/patch-19
Browse files Browse the repository at this point in the history
Set ngrok authtoken
  • Loading branch information
rauchg committed Nov 22, 2015
2 parents 97d54c6 + faa0913 commit 8bedf60
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions .zuul.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ ui: mocha-bdd
server: ./test/support/server.js
tunnel:
type: ngrok
authtoken: 6Aw8vTgcG5EvXdQywVvbh_3fMxvd4Q7dcL2caAHAFjV
proto: tcp
browsers:
- name: chrome
Expand Down
2 changes: 1 addition & 1 deletion lib/transports/websocket.js
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ WS.prototype.write = function(packets){
var total = packets.length;
for (var i = 0, l = total; i < l; i++) {
(function(packet) {
parser.encodePacket(packet, this.supportsBinary, function(data) {
parser.encodePacket(packet, self.supportsBinary, function(data) {
//Sometimes the websocket has already been closed but the browser didn't
//have a chance of informing us about it yet, in that case send will
//throw an error
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
"xmlhttprequest-ssl": "1.5.1",
"component-emitter": "1.1.2",
"indexof": "0.0.1",
"engine.io-parser": "1.2.2",
"engine.io-parser": "nkzawa/engine.io-parser#patch-5",
"debug": "2.2.0",
"parseuri": "0.0.4",
"parsejson": "0.0.1",
"parseqs": "0.0.2",
"component-inherit": "0.0.3"
},
"devDependencies": {
"blob": "0.0.2",
"blob": "0.0.4",
"browserify": "6.2.0",
"concat-stream": "1.4.6",
"derequire": "1.2.0",
Expand Down
2 changes: 1 addition & 1 deletion test/blob/ws.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe('blob', function() {
socket.on('upgrade', function() {
socket.send(binaryData);
socket.on('message', function (data) {
expect(data).to.be.a(Blob);
expect(data).to.be.a(global.Blob);
var fr = new FileReader();
fr.onload = function() {
var ab = this.result;
Expand Down

0 comments on commit 8bedf60

Please sign in to comment.