Merge branch 'master' into williamhogman-patch-1

Author: sitegui

package.json

@@ -1,27 +1,27 @@
 {
-  "name": "nodejs-websocket",
-  "version": "1.2.0",
-  "author": "Sitegui <[email protected]>",
-  "description": "Basic server&client approach to websocket (text and binary frames)",
-  "main": "./index.js",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/sitegui/nodejs-websocket"
-  },
-  "keywords": [
-    "websocket",
-    "websocket-server",
-    "websocket-client"
-  ],
-  "license": "MIT",
-  "engines": {
-    "node": ">=0.10"
-  },
-  "scripts": {
-    "test": "mocha -R spec -b"
-  },
-  "devDependencies": {
-    "mocha": "^2.1.0",
-    "should": "^4.4.1"
-  }
-}
+	"name": "nodejs-websocket",
+	"version": "1.2.0",
+	"author": "Sitegui <[email protected]>",
+	"description": "Basic server&client approach to websocket (text and binary frames)",
+	"main": "./index.js",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/sitegui/nodejs-websocket"
+	},
+	"keywords": [
+		"websocket",
+		"websocket-server",
+		"websocket-client"
+	],
+	"license": "MIT",
+	"engines": {
+		"node": ">=0.10"
+	},
+	"scripts": {
+		"test": "mocha -R spec -b"
+	},
+	"devDependencies": {
+		"mocha": "^2.2.1",
+		"should": "^5.2.0"
+	}
+}

test/test.js

@@ -86,7 +86,12 @@ describe('text frames', function () {
 		// If it arrives, send another, wait again and done
 		getServer(null, function (inStream) {
 			inStream.on('readable', function () {
-				compareBuffers(inStream.read(), buffer)
+				var read = inStream.read()
+				if (!read) {
+					// Ignore when read() returns null
+					return
+				}
+				compareBuffers(read, buffer)
 				if (again) {
 					stream.end(buffer)
 					again = false
@@ -124,6 +129,7 @@ describe('handshake', function () {
 	before(function (done) {
 		testServer = ws.createServer(function (conn) {
 			testConn = conn
+
 			// Send frame right after handshake answer
 			conn.sendText('hello')
 		}).listen(TEST_PORT, done)