Merge pull request #21 from thoov/multipleCloseIssue

If you call close on a non open socket it will act like it is open
thoov · Mar 30, 2015 · 8300125 · 8300125
2 parents 820f7d7 + f3d23f8
commit 8300125
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 10 deletions.
diff --git a/dist/mock-socket.js b/dist/mock-socket.js
@@ -497,10 +497,12 @@ SocketService.prototype = {
   * @param {client: object} the context of the client
   */
   closeConnectionFromClient: function(messageEvent, client) {
-    this.notifyOnlyFor(client, 'updateReadyState', globalContext.MockSocket.CLOSING);
-    this.notifyOnlyFor(client, 'clientOnclose', messageEvent);
-    this.notifyOnlyFor(client, 'updateReadyState', globalContext.MockSocket.CLOSED);
-    this.notify('clientHasLeft');
+    if(client.readyState === globalContext.MockSocket.OPEN) {
+      this.notifyOnlyFor(client, 'updateReadyState', globalContext.MockSocket.CLOSING);
+      this.notifyOnlyFor(client, 'clientOnclose', messageEvent);
+      this.notifyOnlyFor(client, 'updateReadyState', globalContext.MockSocket.CLOSED);
+      this.notify('clientHasLeft');
+    }
   },
 
 
@@ -510,7 +512,7 @@ SocketService.prototype = {
   * @param {messageEvent: object} the mock message event.
   */
   sendMessageToServer: function(messageEvent) {
-    this.notify('clientHasSentMessage', messageEvent.data);
+    this.notify('clientHasSentMessage', messageEvent.data, messageEvent);
   },
 
   /*

diff --git a/dist/mock-socket.min.js b/dist/mock-socket.min.js
diff --git a/src/service.js b/src/service.js
@@ -52,10 +52,12 @@ SocketService.prototype = {
   * @param {client: object} the context of the client
   */
   closeConnectionFromClient: function(messageEvent, client) {
-    this.notifyOnlyFor(client, 'updateReadyState', globalContext.MockSocket.CLOSING);
-    this.notifyOnlyFor(client, 'clientOnclose', messageEvent);
-    this.notifyOnlyFor(client, 'updateReadyState', globalContext.MockSocket.CLOSED);
-    this.notify('clientHasLeft');
+    if(client.readyState === globalContext.MockSocket.OPEN) {
+      this.notifyOnlyFor(client, 'updateReadyState', globalContext.MockSocket.CLOSING);
+      this.notifyOnlyFor(client, 'clientOnclose', messageEvent);
+      this.notifyOnlyFor(client, 'updateReadyState', globalContext.MockSocket.CLOSED);
+      this.notify('clientHasLeft');
+    }
   },
 
 

diff --git a/tests/on-close-test.js b/tests/on-close-test.js
@@ -45,3 +45,22 @@ asyncTest('that the mocksocket onclose function is called after closing the mock
 
   mockServer.close();
 });
+
+asyncTest('that closing a mock socket will only call the mock servers onclose callback once', function() {
+  var socketUrl  = 'ws://localhost:8080';
+  var mockServer = new MockServer(socketUrl);
+  var mockSocket = new MockSocket(socketUrl);
+
+  expect(1);
+
+  mockServer.on('close', function() {
+    ok(true, 'mock server on close fires as expected');
+  });
+
+  mockSocket.close();
+  mockSocket.close();
+
+  setTimeout(function() {
+    start();
+  }, 100);
+});