fix(realtime): 🔧 Reorder subscribeWhenReady arguments

cozy · Feb 6, 2019 · 40b81dc · 40b81dc
1 parent fbc7dfa
commit 40b81dc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/packages/cozy-realtime/src/index.js b/packages/cozy-realtime/src/index.js
@@ -37,8 +37,8 @@ const getTypeAndIdFromListenerKey = listenerKey => {
 // only if it is in a ready state. If not, retry a few milliseconds later.
 const MAX_SOCKET_POLLS = 500 // to avoid infinite polling
 export function subscribeWhenReady(
-  doctype,
   socket,
+  doctype,
   docId,
   remainingTries = MAX_SOCKET_POLLS
 ) {
@@ -64,7 +64,7 @@ export function subscribeWhenReady(
       throw error
     } else {
       setTimeout(() => {
-        subscribeWhenReady(doctype, socket, docId, --remainingTries)
+        subscribeWhenReady(socket, doctype, docId, --remainingTries)
       }, 10)
     }
   }
@@ -169,7 +169,7 @@ export function connectWebSocket(
   if (isRetry && subscriptionsState.size) {
     for (let listenerKey of subscriptionsState) {
       const { doctype, docId } = getTypeAndIdFromListenerKey(listenerKey)
-      subscribeWhenReady(doctype, socket, docId)
+      subscribeWhenReady(socket, doctype, docId)
     }
   }
 
@@ -263,7 +263,7 @@ export function getCozySocket(config) {
 
       if (!listeners.has(listenerKey)) {
         listeners.set(listenerKey, {})
-        subscribeWhenReady(doctype, socket, docId)
+        subscribeWhenReady(socket, doctype, docId)
       }
 
       listeners.set(listenerKey, {

diff --git a/packages/cozy-realtime/test/__snapshots__/connectWebSocket.spec.js.snap b/packages/cozy-realtime/test/__snapshots__/connectWebSocket.spec.js.snap
@@ -224,7 +224,6 @@ MessageEvent {
 exports[`(cozy-realtime) connectWebSocket:  socket should send doctype and docId subscriptions again if this is a retry and if there are subscriptionsState 1`] = `
 Array [
   Array [
-    "io.cozy.mocks",
     WebSocket {
       "binaryType": "blob",
       "listeners": Object {
@@ -245,10 +244,10 @@ Array [
       "readyState": 0,
       "url": "ws://localhost:8880/realtime/",
     },
+    "io.cozy.mocks",
     "id1234",
   ],
   Array [
-    "io.cozy.mocks2",
     WebSocket {
       "binaryType": "blob",
       "listeners": Object {
@@ -269,6 +268,7 @@ Array [
       "readyState": 0,
       "url": "ws://localhost:8880/realtime/",
     },
+    "io.cozy.mocks2",
     null,
   ],
 ]
@@ -277,7 +277,6 @@ Array [
 exports[`(cozy-realtime) connectWebSocket:  socket should send doctype subscriptions again if this is a retry and if there are subscriptionsState 1`] = `
 Array [
   Array [
-    "io.cozy.mocks",
     WebSocket {
       "binaryType": "blob",
       "listeners": Object {
@@ -298,10 +297,10 @@ Array [
       "readyState": 0,
       "url": "ws://localhost:8880/realtime/",
     },
+    "io.cozy.mocks",
     null,
   ],
   Array [
-    "io.cozy.mocks2",
     WebSocket {
       "binaryType": "blob",
       "listeners": Object {
@@ -322,6 +321,7 @@ Array [
       "readyState": 0,
       "url": "ws://localhost:8880/realtime/",
     },
+    "io.cozy.mocks2",
     null,
   ],
 ]

diff --git a/packages/cozy-realtime/test/subscribe.spec.js b/packages/cozy-realtime/test/subscribe.spec.js
@@ -21,7 +21,7 @@ describe('(cozy-realtime) subscribeWhenReady: ', () => {
       send: jest.fn()
     }
     jest.useFakeTimers()
-    mockSubscribe('io.cozy.mocks', mockSocket)
+    mockSubscribe(mockSocket, 'io.cozy.mocks')
     // we run pending timers for a number less one
     Array.apply(null, { length: MAX_RETRIES - 1 }).forEach(() => {
       jest.runOnlyPendingTimers()
@@ -42,7 +42,7 @@ describe('(cozy-realtime) subscribeWhenReady: ', () => {
       send: jest.fn()
     }
     jest.useFakeTimers()
-    mockSubscribe('io.cozy.mocks', mockSocket, 'id1234')
+    mockSubscribe(mockSocket, 'io.cozy.mocks', 'id1234')
     // we run pending timers for a number less one
     Array.apply(null, { length: MAX_RETRIES - 1 }).forEach(() => {
       jest.runOnlyPendingTimers()
@@ -66,7 +66,7 @@ describe('(cozy-realtime) subscribeWhenReady: ', () => {
     jest.useFakeTimers()
     console.warn = jest.fn()
     expect(() => {
-      mockSubscribe('io.cozy.mocks', mockSocket, null, maxRetries)
+      mockSubscribe(mockSocket, 'io.cozy.mocks', null, maxRetries)
       // we run pending timers for all retries
       Array.apply(null, { length: maxRetries }).forEach(() => {
         jest.runOnlyPendingTimers()
@@ -86,7 +86,7 @@ describe('(cozy-realtime) subscribeWhenReady: ', () => {
     }
     jest.useFakeTimers()
     expect(() => {
-      mockSubscribe('io.cozy.mocks', mockSocket)
+      mockSubscribe(mockSocket, 'io.cozy.mocks')
       // we run pending timers for all retries
       Array.apply(null, { length: MAX_RETRIES }).forEach(() => {
         jest.runOnlyPendingTimers()
@@ -103,7 +103,7 @@ describe('(cozy-realtime) subscribeWhenReady: ', () => {
     }
     jest.useFakeTimers()
     expect(() => {
-      mockSubscribe('io.cozy.mocks', mockSocket, 'id1234')
+      mockSubscribe(mockSocket, 'io.cozy.mocks', 'id1234')
       // we run pending timers for all retries
       Array.apply(null, { length: MAX_RETRIES }).forEach(() => {
         jest.runOnlyPendingTimers()
@@ -124,7 +124,7 @@ describe('(cozy-realtime) subscribeWhenReady: ', () => {
     jest.useFakeTimers()
     console.warn = jest.fn()
     expect(() => {
-      mockSubscribe('io.cozy.mocks', mockSocket)
+      mockSubscribe(mockSocket, 'io.cozy.mocks')
       // we run pending timers for all retries
       Array.apply(null, { length: MAX_RETRIES }).forEach(() => {
         jest.runOnlyPendingTimers()