pusher-js 7.0.2 → 7.0.6

package/spec/javascripts/integration/core/timeout_configuration_spec.js

@@ -23,23 +23,25 @@ module.exports = function() {
     var pusher;
 
     beforeEach(function() {
-      spyOn(Network, "isOnline").andReturn(true);
+      jasmine.clock().install();
 
-      spyOn(transports.ws, "isSupported").andReturn(true);
-      spyOn(transports[BASE_FALLBACK], "isSupported").andReturn(false);
+      spyOn(Network, "isOnline").and.returnValue(true);
 
-      spyOn(Runtime, "getLocalStorage").andReturn({});
+      spyOn(transports.ws, "isSupported").and.returnValue(true);
+      spyOn(transports[BASE_FALLBACK], "isSupported").and.returnValue(false);
 
-      spyOn(transports.ws, "createConnection").andCallFake(function() {
+      spyOn(Runtime, "getLocalStorage").and.returnValue({});
+
+      spyOn(transports.ws, "createConnection").and.callFake(function() {
         transport = Mocks.getTransport(true);
-        transport.supportsPing.andReturn(false);
+        transport.supportsPing.and.returnValue(false);
         return transport;
       });
-      jasmine.Clock.useMock();
     });
 
     afterEach(function() {
       pusher.disconnect();
+      jasmine.clock().uninstall();
     });
 
     it("should transition to unavailable after default timeout", function() {
@@ -49,9 +51,9 @@ module.exports = function() {
       pusher.connect();
       pusher.connection.bind("unavailable", onUnavailable);
 
-      jasmine.Clock.tick(Defaults.unavailableTimeout - 1);
+      jasmine.clock().tick(Defaults.unavailableTimeout - 1);
       expect(onUnavailable).not.toHaveBeenCalled();
-      jasmine.Clock.tick(1);
+      jasmine.clock().tick(1);
       expect(onUnavailable).toHaveBeenCalled();
     });
 
@@ -62,9 +64,9 @@ module.exports = function() {
       pusher.connect();
       pusher.connection.bind("unavailable", onUnavailable);
 
-      jasmine.Clock.tick(2344);
+      jasmine.clock().tick(2344);
       expect(onUnavailable).not.toHaveBeenCalled();
-      jasmine.Clock.tick(1);
+      jasmine.clock().tick(1);
       expect(onUnavailable).toHaveBeenCalled();
     });
 
@@ -89,14 +91,14 @@ module.exports = function() {
       });
 
       expect(pusher.connection.state).toEqual("connected");
-      jasmine.Clock.tick(12000 - 1);
+      jasmine.clock().tick(12000 - 1);
       expect(firstTransport.send).not.toHaveBeenCalled();
-      jasmine.Clock.tick(1);
+      jasmine.clock().tick(1);
       expect(firstTransport.send).toHaveBeenCalled();
 
-      jasmine.Clock.tick(Defaults.pongTimeout - 1);
+      jasmine.clock().tick(Defaults.pongTimeout - 1);
       expect(firstTransport.close).not.toHaveBeenCalled();
-      jasmine.Clock.tick(1);
+      jasmine.clock().tick(2);
       expect(firstTransport.close).toHaveBeenCalled();
     });
 
@@ -124,9 +126,9 @@ module.exports = function() {
       });
 
       expect(pusher.connection.state).toEqual("connected");
-      jasmine.Clock.tick(15000 - 1);
+      jasmine.clock().tick(15000 - 1);
       expect(firstTransport.send).not.toHaveBeenCalled();
-      jasmine.Clock.tick(1);
+      jasmine.clock().tick(1);
       expect(firstTransport.send).toHaveBeenCalled();
     });
 
@@ -154,9 +156,9 @@ module.exports = function() {
       });
 
       expect(pusher.connection.state).toEqual("connected");
-      jasmine.Clock.tick(15555 - 1);
+      jasmine.clock().tick(15555 - 1);
       expect(firstTransport.send).not.toHaveBeenCalled();
-      jasmine.Clock.tick(1);
+      jasmine.clock().tick(1);
       expect(firstTransport.send).toHaveBeenCalled();
     });
 
@@ -183,11 +185,11 @@ module.exports = function() {
       });
 
       // first, send the ping
-      jasmine.Clock.tick(120000);
+      jasmine.clock().tick(120000);
       // wait for the pong timeout
-      jasmine.Clock.tick(2221);
+      jasmine.clock().tick(2221);
       expect(firstTransport.close).not.toHaveBeenCalled();
-      jasmine.Clock.tick(1);
+      jasmine.clock().tick(2);
       expect(firstTransport.close).toHaveBeenCalled();
     });
   });

package/spec/javascripts/integration/core/transport_lists_spec.js

@@ -20,18 +20,18 @@ module.exports = function() {
     var _isReady = Pusher.isReady;
 
     beforeEach(function() {
-      spyOn(transports.ws, "isSupported").andReturn(true);
-      spyOn(transports.xhr_streaming, "isSupported").andReturn(true);
-      spyOn(transports[BASE_FALLBACK], "isSupported").andReturn(true);
+      spyOn(transports.ws, "isSupported").and.returnValue(true);
+      spyOn(transports.xhr_streaming, "isSupported").and.returnValue(true);
+      spyOn(transports[BASE_FALLBACK], "isSupported").and.returnValue(true);
 
       spyOn(transports.ws, "createConnection")
-        .andCallFake(Mocks.getTransport);
+        .and.callFake(Mocks.getTransport);
       spyOn(transports.xhr_streaming, "createConnection")
-        .andCallFake(Mocks.getTransport);
+        .and.callFake(Mocks.getTransport);
       spyOn(transports[BASE_FALLBACK], "createConnection")
-        .andCallFake(Mocks.getTransport);
+        .and.callFake(Mocks.getTransport);
 
-      spyOn(Runtime, "getDefaultStrategy").andCallFake(function(config) {
+      spyOn(Runtime, "getDefaultStrategy").and.callFake(function(config) {
         return new BestConnectedEverStrategy([
           defineTransport(config, 'a', 'ws', 1, {}),
           defineTransport(config, 'b', 'xhr_streaming', 2, {}),
@@ -39,7 +39,7 @@ module.exports = function() {
         ]);
       });
 
-      spyOn(Network, "isOnline").andReturn(true);
+      spyOn(Network, "isOnline").and.returnValue(true);
       Pusher.isReady = true;
     });
 

package/spec/javascripts/integration/web/dom/jsonp_spec.js

@@ -1,99 +1,97 @@
-var Pusher = require('pusher_integration');
+const Pusher = require('pusher_integration');
 window.Pusher = Pusher;
 
-var Integration = require("integration");
-var JSONPRequest = require('dom/jsonp_request').default;
+const Integration = require('integration');
+const JSONPRequest = require('dom/jsonp_request').default;
+const waitsFor = require('../../../helpers/waitsFor');
 
 Integration.describe("JSONP", function() {
-  it("should send a request and receive a correct response", function() {
+  it("should send a request and receive a correct response", async function() {
     var callback = jasmine.createSpy();
     var receiver = Pusher.ScriptReceivers.create(callback);
     var url = Integration.API_URL + "/v2/jsonp/echo";
     var request;
 
-    runs(function() {
-      request = new JSONPRequest(url, {
-        "session": 2289545,
-        "features": ["ws", "sockjs"],
-        "version": "1.13.0",
-        "t0": 1355850357911,
-        "timeline": [
-          { t:    0, e: 2 },
-          { t:    2, e: 2, type: "ws" },
-          { t: 1001, e: 4, type: "ws" },
-          { t: 1001, e: 0, type: "sockjs" },
-          { t: 2000, e: 5 },
-          { t: 2158, e: 1, type: "sockjs" },
-          { t: 2378, e: 2, type: "sockjs" },
-          { t: 3892, e: 3, type: "sockjs" },
-          { t: 3892, e: 3 }
-        ]
-      });
-      request.send(receiver);
+    request = new JSONPRequest(url, {
+      "session": 2289545,
+      "features": ["ws", "sockjs"],
+      "version": "1.13.0",
+      "t0": 1355850357911,
+      "timeline": [
+        { t:    0, e: 2 },
+        { t:    2, e: 2, type: "ws" },
+        { t: 1001, e: 4, type: "ws" },
+        { t: 1001, e: 0, type: "sockjs" },
+        { t: 2000, e: 5 },
+        { t: 2158, e: 1, type: "sockjs" },
+        { t: 2378, e: 2, type: "sockjs" },
+        { t: 3892, e: 3, type: "sockjs" },
+        { t: 3892, e: 3 }
+      ]
     });
-    waitsFor(function() {
-      return callback.calls.length > 0;
+    request.send(receiver);
+
+    await waitsFor(function() {
+      return callback.calls.count() > 0;
     }, "JSONP to respond", 5000);
-    runs(function() {
-      expect(callback.calls.length).toEqual(1);
-      expect(callback).toHaveBeenCalledWith(null, {
-        "session": "2289545",
-        "features": ["ws", "sockjs"],
-        "version": "1.13.0",
-        "t0": "1355850357911",
-        "timeline": [
-          { t:    0, e: 2 },
-          { t:    2, e: 2, type: "ws" },
-          { t: 1001, e: 4, type: "ws" },
-          { t: 1001, e: 0, type: "sockjs" },
-          { t: 2000, e: 5 },
-          { t: 2158, e: 1, type: "sockjs" },
-          { t: 2378, e: 2, type: "sockjs" },
-          { t: 3892, e: 3, type: "sockjs" },
-          { t: 3892, e: 3 }
-        ]
-      });
-      request.cleanup()
+
+    expect(callback.calls.count()).toEqual(1);
+    expect(callback).toHaveBeenCalledWith(null, {
+      "session": "2289545",
+      "features": ["ws", "sockjs"],
+      "version": "1.13.0",
+      "t0": "1355850357911",
+      "timeline": [
+        { t:    0, e: 2 },
+        { t:    2, e: 2, type: "ws" },
+        { t: 1001, e: 4, type: "ws" },
+        { t: 1001, e: 0, type: "sockjs" },
+        { t: 2000, e: 5 },
+        { t: 2158, e: 1, type: "sockjs" },
+        { t: 2378, e: 2, type: "sockjs" },
+        { t: 3892, e: 3, type: "sockjs" },
+        { t: 3892, e: 3 }
+      ]
     });
+
+    request.cleanup()
   });
 
-  it("should call back without a result on 404 response", function() {
+  it("should call back without a result on 404 response", async function() {
     var callback = jasmine.createSpy();
     var receiver = Pusher.ScriptReceivers.create(callback);
     var url = Integration.API_URL + "/jsonp/404";
     var request;
 
-    runs(function() {
-      request = new JSONPRequest(url, {});
-      request.send(receiver);
-    });
-    waitsFor(function() {
-      return callback.calls.length > 0;
+    request = new JSONPRequest(url, {});
+    request.send(receiver);
+
+    await waitsFor(function() {
+      return callback.calls.count() > 0;
     }, "JSONP to respond", 5000);
-    runs(function() {
-      expect(callback.calls.length).toEqual(1);
-      expect(callback.calls[0].args[1]).toBe(undefined);
-      request.cleanup();
-    });
+
+    expect(callback.calls.count()).toEqual(1);
+    expect(callback.calls.first().args[1]).toBe(undefined);
+
+    request.cleanup();
   });
 
-  it("should call back without a result on 500 response", function() {
+  it("should call back without a result on 500 response", async function() {
     var callback = jasmine.createSpy();
     var receiver = Pusher.ScriptReceivers.create(callback);
     var url = Integration.API_URL + "/jsonp/500";
     var request;
 
-    runs(function() {
-      request = new JSONPRequest(url, {});
-      request.send(receiver);
-    });
-    waitsFor(function() {
-      return callback.calls.length > 0;
+    request = new JSONPRequest(url, {});
+    request.send(receiver);
+
+    await waitsFor(function() {
+      return callback.calls.count() > 0;
     }, "JSONP to respond", 5000);
-    runs(function() {
-      expect(callback.calls.length).toEqual(1);
-      expect(callback.calls[0].args[1]).toBe(undefined);
-      request.cleanup();
-    });
+
+    expect(callback.calls.count()).toEqual(1);
+    expect(callback.calls.first().args[1]).toBe(undefined);
+
+    request.cleanup();
   });
 });

package/spec/javascripts/integration/web/dom/script_request_spec.js

@@ -1,9 +1,9 @@
-var Pusher = require('pusher_integration');
+const Pusher = require('pusher_integration');
 window.Pusher = Pusher;
 
-var Integration = require('integration');
-var ScriptRequest = require('dom/script_request').default;
-
+const Integration = require('integration');
+const ScriptRequest = require('dom/script_request').default;
+const waitsFor = require('../../../helpers/waitsFor');
 
 Integration.describe("ScriptRequest", function() {
   var callback, receiver;
@@ -23,20 +23,18 @@ Integration.describe("ScriptRequest", function() {
     request.cleanup();
   });
 
-  it("should send a request and receive a correct response", function() {
-    runs(function() {
-      request.send(receiver);
-    });
-    waitsFor(function() {
-      return callback.calls.length > 0;
+  it("should send a request and receive a correct response", async function() {
+    request.send(receiver);
+
+    await waitsFor(function() {
+      return callback.calls.count() > 0;
     }, "endpoint to respond", 5000);
-    runs(function() {
-      expect(callback.calls.length).toEqual(1);
-      expect(callback).toHaveBeenCalledWith(null, { param: "test" });
-    });
+
+    expect(callback.calls.count()).toEqual(1);
+    expect(callback).toHaveBeenCalledWith(null, { param: "test" });
   });
 
-  it("should allow cleaning up", function() {
+  it("should allow cleaning up", async function() {
     var callback = jasmine.createSpy();
     var receiver = Pusher.Integration.ScriptReceivers.create(callback);
     var query = "receiver=" + receiver.name;
@@ -44,55 +42,49 @@ Integration.describe("ScriptRequest", function() {
 
     var request = new ScriptRequest(url);
 
-    runs(function() {
-      expect(document.getElementById(receiver.id)).toBe(null);
-      expect(document.getElementById(receiver.id + "_error")).toBe(null);
-      request.send(receiver);
-      // we don't test for the _error tag, because it's Opera-specific
-      expect(document.getElementById(receiver.id)).not.toBe(null);
-    });
-    waitsFor(function() {
-      return callback.calls.length > 0;
+    expect(document.getElementById(receiver.id)).toBe(null);
+    expect(document.getElementById(receiver.id + "_error")).toBe(null);
+    request.send(receiver);
+    // we don't test for the _error tag, because it's Opera-specific
+    expect(document.getElementById(receiver.id)).not.toBe(null);
+
+    await waitsFor(function() {
+      return callback.calls.count() > 0;
     }, "endpoint to respond", 5000);
-    runs(function() {
-      expect(document.getElementById(receiver.id)).not.toBe(null);
-      request.cleanup();
-      expect(document.getElementById(receiver.id)).toBe(null);
-      expect(document.getElementById(receiver.id + "_error")).toBe(null);
-    });
+
+    expect(document.getElementById(receiver.id)).not.toBe(null);
+    request.cleanup();
+    expect(document.getElementById(receiver.id)).toBe(null);
+    expect(document.getElementById(receiver.id + "_error")).toBe(null);
   });
 
-  it("should call back without result on a 404 response", function() {
+  it("should call back without result on a 404 response", async function() {
     var url = Integration.API_URL + "/jsonp/404/" + receiver.number;
     var request = new ScriptRequest(url);
 
-    runs(function() {
-      request.send(receiver);
-    });
-    waitsFor(function() {
-      return callback.calls.length > 0;
+    request.send(receiver);
+
+    await waitsFor(function() {
+      return callback.calls.count() > 0;
     }, "endpoint to respond", 5000);
-    runs(function() {
-      expect(callback.calls.length).toEqual(1);
-      expect(callback.calls[0].args[1]).toBe(undefined);
-      request.cleanup();
-    });
+
+    expect(callback.calls.count()).toEqual(1);
+    expect(callback.calls.first().args[1]).toBe(undefined);
+    request.cleanup();
   });
 
-  it("should call back without result on a 500 response", function() {
+  it("should call back without result on a 500 response", async function() {
     var url = Integration.API_URL + "/jsonp/500/" + receiver.number;
     var request = new ScriptRequest(url);
 
-    runs(function() {
-      request.send(receiver);
-    });
-    waitsFor(function() {
-      return callback.calls.length > 0;
+    request.send(receiver);
+
+    await waitsFor(function() {
+      return callback.calls.count() > 0;
     }, "endpoint to respond", 5000);
-    runs(function() {
-      expect(callback.calls.length).toEqual(1);
-      expect(callback.calls[0].args[1]).toBe(undefined);
-      request.cleanup();
-    });
+
+    expect(callback.calls.count()).toEqual(1);
+    expect(callback.calls.first().args[1]).toBe(undefined);
+    request.cleanup();
   });
 });

package/spec/javascripts/unit/core/channels/channel_spec.js

@@ -38,19 +38,9 @@ describe("Channel", function() {
     beforeEach(function() {
       channel.subscribed = true;
     });
+
     it("should raise an exception if the event name does not start with client-", function() {
-    // we can't use toThrow with jasmine.any because it compares
-    // (exception.message || exception) with (expected.message || expected)
-    // the thrown exception has a message so it's passed to the matcher. The
-    // message is a string, and *not* an instanceof the expected class
-    // https://github.com/jasmine/jasmine/blob/v1.3.1/src/core/Matchers.js#L331-L333
-      var exception;
-      try {
-        channel.trigger("whatever", {});
-      } catch(e) {
-        exception = e;
-      }
-      expect(exception).toMatch(jasmine.any(Errors.BadEventName))
+      expect(() => channel.trigger('whatever', {})).toThrow(jasmine.any(Errors.BadEventName));
     });
 
     it("should call send_event on connection", function() {
@@ -60,12 +50,12 @@ describe("Channel", function() {
     });
 
     it("should return true if connection sent the event", function() {
-      pusher.send_event.andReturn(true);
+      pusher.send_event.and.returnValue(true);
       expect(channel.trigger("client-test", {})).toBe(true);
     });
 
     it("should return false if connection didn't send the event", function() {
-      pusher.send_event.andReturn(false);
+      pusher.send_event.and.returnValue(false);
       expect(channel.trigger("client-test", {})).toBe(false);
     });
   });
@@ -81,7 +71,7 @@ describe("Channel", function() {
 
     it("should set subscriptionPending to false", function() {
       channel.subscriptionPending = true;
-      
+
       channel.disconnect();
 
       expect(channel.subscriptionPending).toEqual(false);
@@ -216,10 +206,10 @@ describe("Channel", function() {
     });
 
     it("should authorize the connection first", function() {
-      expect(channel.authorize.calls.length).toEqual(0);
+      expect(channel.authorize.calls.count()).toEqual(0);
       channel.subscribe();
 
-      expect(channel.authorize.calls.length).toEqual(1);
+      expect(channel.authorize.calls.count()).toEqual(1);
       expect(channel.authorize).toHaveBeenCalledWith(
         "9.37", jasmine.any(Function)
       );
@@ -229,7 +219,7 @@ describe("Channel", function() {
       expect(pusher.send_event).not.toHaveBeenCalled();
 
       channel.subscribe();
-      var authorizeCallback = channel.authorize.calls[0].args[1];
+      var authorizeCallback = channel.authorize.calls.first().args[1];
       authorizeCallback(false, {
         auth: "one",
         channel_data: "two"
@@ -246,7 +236,7 @@ describe("Channel", function() {
       channel.bind("pusher:subscription_error", onSubscriptionError);
 
       channel.subscribe();
-      var authorizeCallback = channel.authorize.calls[0].args[1];
+      var authorizeCallback = channel.authorize.calls.first().args[1];
       authorizeCallback(new Error("test error"), {auth: ""})
 
       expect(onSubscriptionError).toHaveBeenCalledWith(
@@ -270,7 +260,7 @@ describe("Channel", function() {
       expect(channel.subscriptionPending).toEqual(false);
 
       channel.subscribe();
-      var authorizeCallback = channel.authorize.calls[0].args[1];
+      var authorizeCallback = channel.authorize.calls.first().args[1];
       authorizeCallback(new Error("test error"), {auth: ""})
 
       expect(channel.subscriptionPending).toEqual(false);
@@ -280,7 +270,7 @@ describe("Channel", function() {
       expect(channel.subscriptionPending).toEqual(false);
 
       channel.subscribe();
-      var authorizeCallback = channel.authorize.calls[0].args[1];
+      var authorizeCallback = channel.authorize.calls.first().args[1];
       authorizeCallback(false, {
         auth: "one",
         channel_data: "two"

package/spec/javascripts/unit/core/channels/encrypted_channel_spec.js

@@ -28,7 +28,7 @@ describe("EncryptedChannel", function() {
     pusher = Mocks.getPusher({ foo: "bar" });
     channel = new EncryptedChannel("private-encrypted-test", pusher, nacl);
     authorizer = Mocks.getAuthorizer();
-    factorySpy = spyOn(Factory, "createAuthorizer").andReturn(authorizer);
+    factorySpy = spyOn(Factory, "createAuthorizer").and.returnValue(authorizer);
   });
 
   describe("after construction", function() {
@@ -48,7 +48,7 @@ describe("EncryptedChannel", function() {
   describe("#authorize", function() {
     it("should create and call an authorizer", function() {
       channel.authorize("1.23", function() {});
-      expect(Factory.createAuthorizer.calls.length).toEqual(1);
+      expect(Factory.createAuthorizer.calls.count()).toEqual(1);
       expect(Factory.createAuthorizer).toHaveBeenCalledWith(channel, {
         foo: "bar"
       });
@@ -73,8 +73,9 @@ describe("EncryptedChannel", function() {
       });
       // For some reason comparing the Error types doesn't work properly in
       // Safari on Mojave. Manually check the arguments.
-      expect(callback.calls.length).toEqual(1)
-      let args = callback.calls[0].args;
+      expect(callback.calls.count()).toEqual(1)
+      let args = callback.calls.first().args;
+
       expect(args.length).toEqual(2)
       expect(args[0]).toEqual(jasmine.any(Error))
       expect(args[0].message).toEqual(
@@ -91,7 +92,7 @@ describe("EncryptedChannel", function() {
           }
         });
         channel = new EncryptedChannel("private-test-custom-auth", pusher, nacl);
-        factorySpy.andCallThrough();
+        factorySpy.and.callThrough();
       });
 
       it("should call the authorizer", function() {
@@ -112,18 +113,9 @@ describe("EncryptedChannel", function() {
       channel.authorize("1.23", callback);
     });
     it("should raise an exception if called", function() {
-      // we can't use toThrow with jasmine.any because it compares
-      // (exception.message || exception) with (expected.message || expected)
-      // the thrown exception has a message so it's passed to the matcher. The
-      // message is a string, and *not* an instanceof the expected class
-      // https://github.com/jasmine/jasmine/blob/v1.3.1/src/core/Matchers.js#L331-L333
-      var exception;
-      try {
-        channel.trigger("whatever", {});
-      } catch(e) {
-        exception = e;
-      }
-      expect(exception).toMatch(jasmine.any(Errors.UnsupportedFeature));
+      expect(() => channel.trigger('whatever', {})).toThrow(
+        jasmine.any(Errors.UnsupportedFeature)
+      );
     });
   });