added fakeMessage method and rename mockClose to fakeClose to make intention more clear

Author: Christian Jeschke

README.md

@@ -139,7 +139,8 @@ flush                          |            | Executes all pending requests
 expectConnect                  | url:String | Specify the url of an expected WebSocket connection
 expectClose                    | url:String | Expect "close" to be called on the WebSocket
 expectSend                     | msg:String | Expectation of send to be called, with required message
-mockClose                      | url:String | Used to fake close a socket and test corresponding close handlers
+fakeClose                      | url:String | Used to fake close a socket and test corresponding close handlers
+fakeMessage                    | url:String, data:object | Used to fake a backend initialized send action, which can be handled in onMessage
 verifyNoOutstandingExpectation |            | Makes sure all expectations have been satisfied, should be called in afterEach
 verifyNoOutstandingRequest     |            | Makes sure no requests are pending, should be called in afterEach
 

dist/angular-websocket-mock.js

@@ -28,6 +28,7 @@
     var pendingCloses = [];
     var sendQueue = [];
     var pendingSends = [];
+    var pendingMessages = [];
     var mock = false;
     var existingMocks = {};
 
@@ -52,14 +53,18 @@
       }
     };
 
-    this.mockClose = function (url, code) {
+    this.fakeClose = function (url, code) {
       if (existingMocks[url]) {
         existingMocks[url].map(function (mockSocket) {
           mockSocket.close(code);
         });
       }
     };
 
+    this.fakeMessage = function (url, data) {
+      pendingMessages.push({ url: url, data: data });
+    };
+
     this.mock = function () {
       mock = true;
     };
@@ -107,6 +112,16 @@
       });
     }
 
+    function callMessageCallbacks(url, data) {
+      if (existingMocks[url]) {
+        existingMocks[url].map(function (socketMock) {
+          if (socketMock.onmessage && typeof socketMock.onmessage === "function") {
+            socketMock.onmessage(data);
+          }
+        });
+      }
+    }
+
     this.flush = function () {
       var url, msg, config;
       while (url = pendingConnects.shift()) {
@@ -140,6 +155,10 @@
           sendQueue.splice(j, 1);
         }
       }
+
+      while (msg = pendingMessages.shift()) {
+        callMessageCallbacks(msg.url, msg.data);
+      }
     };
 
     this.expectConnect = function (url, protocols) {

src/angular-websocket-mock.js

@@ -7,6 +7,7 @@ function $WebSocketBackend() {
   var pendingCloses = [];
   var sendQueue = [];
   var pendingSends = [];
+  var pendingMessages = [];
   var mock = false;
   var existingMocks = {};
 
@@ -32,14 +33,18 @@ function $WebSocketBackend() {
     }
   };
 
-  this.mockClose = function(url, code) {
+  this.fakeClose = function(url, code) {
     if(existingMocks[url]) {
       existingMocks[url].map(function(mockSocket) {
         mockSocket.close(code);
       });
     }
   };
 
+  this.fakeMessage = function(url, data) {
+    pendingMessages.push({url: url, data: data});
+  };
+
   this.mock = function() {
     mock = true;
   };
@@ -87,6 +92,16 @@ function $WebSocketBackend() {
     });
   }
 
+  function callMessageCallbacks(url, data) {
+    if(existingMocks[url]) {
+      existingMocks[url].map(function(socketMock) {
+        if(socketMock.onmessage && typeof socketMock.onmessage === "function") {
+          socketMock.onmessage(data);
+        }
+      });
+    }
+  }
+
   this.flush = function () {
     var url, msg, config;
     while (url = pendingConnects.shift()) {
@@ -120,6 +135,10 @@ function $WebSocketBackend() {
         sendQueue.splice(j, 1);
       }
     }
+
+    while (msg = pendingMessages.shift()) {
+      callMessageCallbacks(msg.url, msg.data);
+    }
   };
 
   this.expectConnect = function (url, protocols) {

test/angular-websocket.spec.js

@@ -943,11 +943,19 @@ describe('angular-websocket', function() {
        expect(spy).toHaveBeenCalled();
      });
 
-     it("should be automatically called on mock close", function() {
+     it("should be automatically called on fake close", function() {
        var spy = jasmine.createSpy('callback');
        ws.onCloseCallbacks.push(spy);
        $websocketBackend.expectClose(url);
-       $websocketBackend.mockClose(url);
+       $websocketBackend.fakeClose(url);
+       $websocketBackend.flush();
+       expect(spy).toHaveBeenCalled();
+     });
+
+     it("should be automatically called on fake send", function() {
+       var spy = jasmine.createSpy('callback');
+       ws.onMessage(spy);
+       $websocketBackend.fakeMessage(url, {data: "test"});
        $websocketBackend.flush();
        expect(spy).toHaveBeenCalled();
      });