Change unit tests accordingly

pusher · Aug 11, 2022 · 23410ae · 23410ae
1 parent 1eaa87b
commit 23410ae
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/spec/javascripts/unit/core/channels/presence_channel_spec.js b/spec/javascripts/unit/core/channels/presence_channel_spec.js
@@ -5,7 +5,7 @@ var Errors = require('core/errors');
 var Factory = require('core/utils/factory').default;
 var Mocks = require("mocks");
 var flatPromise = require("core/utils/flat_promise").default;
-var { setTimeout } = require("timers/promises").default;
+var { setTimeout } = require("../../../helpers/timers/promises").default;
 
 describe("PresenceChannel", function() {
   var pusher;

diff --git a/spec/javascripts/unit/core/user_spec.js b/spec/javascripts/unit/core/user_spec.js
@@ -82,7 +82,7 @@ describe("Pusher (User)", function () {
       });
 
       pusher.connection.state = "connected";
-      pusher.connection.emit('connected');
+      pusher.connection.emit('state_change', {previous:'connecting', current:'connected'});
 
       expect(pusher.config.userAuthenticator).toHaveBeenCalledWith(
         { socketId: "1.23" },
@@ -116,11 +116,11 @@ describe("Pusher (User)", function () {
       pusher.config.userAuthenticator.calls.reset()
 
       pusher.connection.state == "disconnected";
-      pusher.connection.emit("disconnected");
+      pusher.connection.emit('state_change', {previous:'connected', current:'disconnected'});
       pusher.connection.state == "connecting";
-      pusher.connection.emit("connecting");
+      pusher.connection.emit('state_change', {previous:'disconnected', current:'connecting'});
       pusher.connection.state == "connected";
-      pusher.connection.emit("connected");
+      pusher.connection.emit('state_change', {previous:'connecting', current:'connected'});
 
       expect(pusher.config.userAuthenticator).toHaveBeenCalledWith(
         { socketId: "1.23" },
@@ -134,7 +134,7 @@ describe("Pusher (User)", function () {
 
     it("should not signin when the connection is connected if signin() was never called", function () {
       pusher.connection.state = "connected";
-      pusher.connection.emit('connected');
+      pusher.connection.emit('state_change', {previous:'connecting', current:'connected'});
       expect(pusher.config.userAuthenticator).not.toHaveBeenCalled();
     })
 
@@ -292,7 +292,7 @@ describe("Pusher (User)", function () {
       expect(pusher.user.serverToUserChannel.subscribed).toBe(true);
 
       // Disconnect
-      pusher.connection.emit('disconnected');
+      pusher.connection.emit('state_change', {previous:'connected', current:'disconnected'});
 
       expect(pusher.user.user_data).toEqual(null);
       expect(pusher.user.serverToUserChannel).toEqual(null);

diff --git a/src/core/user.ts b/src/core/user.ts
@@ -21,11 +21,11 @@ export default class UserFacade extends EventsDispatcher {
       Logger.debug('No callbacks on user for ' + eventName);
     });
     this.pusher = pusher;
-    this.pusher.connection.bind('state_change', ({previous, current}) => {
-      if (previous !=='connected' && current === 'connected') {
+    this.pusher.connection.bind('state_change', ({ previous, current }) => {
+      if (previous !== 'connected' && current === 'connected') {
         this._signin();
       }
-      if (previous ==='connected' && current !== 'connected') {
+      if (previous === 'connected' && current !== 'connected') {
         this._cleanup();
         this._newSigninPromiseIfNeeded();
       }