Merge pull request #30 from vlizard/error-unresolvable-url

Allow to create mock server that is unreachable
thoov · Jun 25, 2015 · d7df971 · d7df971
2 parents 9490c8a + 9a2b7f8
commit d7df971
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 7 deletions.
diff --git a/dist/mock-socket.js b/dist/mock-socket.js
@@ -291,9 +291,17 @@ function MockServer(url) {
   globalContext.MockSocket.services[this.url] = service;
 
   this.service   = service;
-  service.server = this;
+  // ignore possible query parameters
+  if(url.indexOf(MockServer.unresolvableURL) === -1) {
+    service.server = this;
+  }
 }
 
+/*
+* This URL can be used to emulate server that does not establish connection
+*/
+MockServer.unresolvableURL = "ws://unresolvable_url";
+
 MockServer.prototype = {
   service: null,
 
@@ -526,8 +534,8 @@ SocketService.prototype = {
 
     // if the server has not been set then we notify the onclose method of this client
     if(!this.server) {
-      this.notify(client, 'updateReadyState', globalContext.MockSocket.CLOSED);
-      this.notifyOnlyFor(client, 'clientOnError');
+      this.notifyOnlyFor(client, 'updateReadyState', globalContext.MockSocket.CLOSED);
+      this.notifyOnlyFor(client, 'clientOnError', socketMessageEvent('error', null, client.url));
       return false;
     }
 

diff --git a/dist/mock-socket.min.js b/dist/mock-socket.min.js
diff --git a/src/mock-server.js b/src/mock-server.js
@@ -11,9 +11,17 @@ function MockServer(url) {
   globalContext.MockSocket.services[this.url] = service;
 
   this.service   = service;
-  service.server = this;
+  // ignore possible query parameters
+  if(url.indexOf(MockServer.unresolvableURL) === -1) {
+    service.server = this;
+  }
 }
 
+/*
+* This URL can be used to emulate server that does not establish connection
+*/
+MockServer.unresolvableURL = "ws://unresolvable_url";
+
 MockServer.prototype = {
   service: null,
 

diff --git a/src/service.js b/src/service.js
@@ -20,8 +20,8 @@ SocketService.prototype = {
 
     // if the server has not been set then we notify the onclose method of this client
     if(!this.server) {
-      this.notify(client, 'updateReadyState', globalContext.MockSocket.CLOSED);
-      this.notifyOnlyFor(client, 'clientOnError');
+      this.notifyOnlyFor(client, 'updateReadyState', globalContext.MockSocket.CLOSED);
+      this.notifyOnlyFor(client, 'clientOnError', socketMessageEvent('error', null, client.url));
       return false;
     }
 

diff --git a/tests/on-error-test.js b/tests/on-error-test.js
@@ -0,0 +1,14 @@
+module('Mocksocket onerror tests');
+
+asyncTest('that server rejects connection to unresolvable URL', function() {
+  var mockServer = new MockServer(MockServer.unresolvableURL);
+  var mockSocket = new MockSocket(MockServer.unresolvableURL);
+
+  expect(2);
+
+  mockSocket.onerror = function(event) {
+    ok(true, 'mocksocket onerror fires as expected');
+    equal(this.readyState, MockSocket.CLOSED, 'the readystate is correctly set to CLOSED');
+    start();
+  };
+});