diff options
| author | Joas Schilling <coding@schilljs.com> | 2022-11-08 16:56:52 +0300 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2022-11-08 16:56:52 +0300 |
| commit | 516d50836a333b146e70c2f8ab1abe6564fa8328 (patch) | |
| tree | 47bf291381c1e52b1c0096516934b85e4e6883b7 | |
| parent | 6850fcbdb3c8c1c031b25ad20ab5a5410aff7c34 (diff) | |
Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
| -rw-r--r-- | src/services/messagesService.spec.js | 2 | ||||
| -rw-r--r-- | src/store/messagesStore.js | 2 | ||||
| -rw-r--r-- | src/store/messagesStore.spec.js | 23 |
3 files changed, 14 insertions, 13 deletions
diff --git a/src/services/messagesService.spec.js b/src/services/messagesService.spec.js index d27234673..b825b8c1e 100644 --- a/src/services/messagesService.spec.js +++ b/src/services/messagesService.spec.js @@ -32,6 +32,7 @@ describe('messagesService', () => { setReadMarker: 0, lookIntoFuture: 0, lastKnownMessageId: 1234, + limit: 100, includeLastKnown: 0, }, } @@ -55,6 +56,7 @@ describe('messagesService', () => { setReadMarker: 0, lookIntoFuture: 0, lastKnownMessageId: 1234, + limit: 100, includeLastKnown: 1, }, } diff --git a/src/store/messagesStore.js b/src/store/messagesStore.js index 16b25ac77..49e5c3b06 100644 --- a/src/store/messagesStore.js +++ b/src/store/messagesStore.js @@ -737,7 +737,7 @@ const actions = { * @param {boolean} data.includeLastKnown whether to include the last known message in the response; */ async fetchMessages(context, { token, lastKnownMessageId, includeLastKnown, requestOptions, minimumVisible }) { - minimumVisible = minimumVisible || CHAT.MINIMUM_VISIBLE + minimumVisible = (typeof minimumVisible === 'undefined') ? CHAT.MINIMUM_VISIBLE : minimumVisible context.dispatch('cancelFetchMessages') diff --git a/src/store/messagesStore.spec.js b/src/store/messagesStore.spec.js index ebabf2d92..8fc605be9 100644 --- a/src/store/messagesStore.spec.js +++ b/src/store/messagesStore.spec.js @@ -137,19 +137,14 @@ describe('messagesStore', () => { expect(store.getters.messagesList(TOKEN)[1]).toStrictEqual(message3) expect(store.getters.messagesList('token-2')[0]).toStrictEqual(message2) - // by id - expect(store.getters.messages(TOKEN)[1]).toStrictEqual(message1) - expect(store.getters.messages(TOKEN)[3]).toStrictEqual(message3) - expect(store.getters.messages('token-2')[2]).toStrictEqual(message2) - // with messages getter - expect(store.getters.messages(TOKEN)).toStrictEqual({ - 1: message1, - 3: message3, - }) - expect(store.getters.messages('token-2')).toStrictEqual({ - 2: message2, - }) + expect(store.getters.messagesList(TOKEN)).toStrictEqual([ + message1, + message3, + ]) + expect(store.getters.messagesList('token-2')).toStrictEqual([ + message2, + ]) }) describe('delete message', () => { @@ -767,12 +762,14 @@ describe('messagesStore', () => { requestOptions: { dummyOption: true, }, + minimumVisible: 0, }) expect(fetchMessages).toHaveBeenCalledWith({ token: TOKEN, lastKnownMessageId: 100, includeLastKnown: true, + limit: 100, }, { dummyOption: true, }) @@ -818,12 +815,14 @@ describe('messagesStore', () => { requestOptions: { dummyOption: true, }, + minimumVisible: 0, }) expect(fetchMessages).toHaveBeenCalledWith({ token: TOKEN, lastKnownMessageId: 100, includeLastKnown: false, + limit: 100, }, { dummyOption: true, }) |