Skip to content

Commit 398af35

Browse files
arnautov-antonarnautov-anton
committed
Adjust related tests
1 parent 701183f commit 398af35

File tree

2 files changed

+83
-25
lines changed

2 files changed

+83
-25
lines changed

‎test/unit/channel.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1275,9 +1275,13 @@ describe('Channel.query', async () => {
12751275
it('should update pagination for queried message set to prevent more pagination', async () => {
12761276
const client = await getClientWithUser();
12771277
const channel = client.channel('messaging', uuidv4());
1278+
const timestamp = new Date('2024-01-01T00:00:00.000Z').getTime();
1279+
12781280
const mockedChannelQueryResponse = {
12791281
...mockChannelQueryResponse,
1280-
messages: Array.from({ length: DEFAULT_QUERY_CHANNEL_MESSAGE_LIST_PAGE_SIZE - 1 }, generateMsg),
1282+
messages: Array.from({ length: DEFAULT_QUERY_CHANNEL_MESSAGE_LIST_PAGE_SIZE - 1 }, (_, index) =>
1283+
generateMsg({ created_at: new Date(timestamp + index * 1000).toISOString() }),
1284+
),
12811285
};
12821286
const mock = sinon.mock(client);
12831287
mock.expects('post').returns(Promise.resolve(mockedChannelQueryResponse));

‎test/unit/channel_state.js

Lines changed: 78 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ describe('ChannelState addMessagesSorted', function () {
110110
expect(state.messages).to.have.length(10);
111111
state.addMessagesSorted([generateMsg({ id: 'id', date: `2020-01-01T00:00:00.007Z` })]);
112112
expect(state.messages).to.have.length(11);
113-
expect(state.messages[7].id).to.be.equal('7');
114-
expect(state.messages[8].id).to.be.equal('id');
113+
expect(state.messages[7].id).to.be.equal('id');
114+
expect(state.messages[8].id).to.be.equal('7');
115115
});
116116

117117
it('add lots of messages in order', async function () {
@@ -208,8 +208,22 @@ describe('ChannelState addMessagesSorted', function () {
208208

209209
it('should add messages to new message set', () => {
210210
const state = new ChannelState();
211-
state.addMessagesSorted([generateMsg({ id: '12' }), generateMsg({ id: '13' }), generateMsg({ id: '14' })]);
212-
state.addMessagesSorted([generateMsg({ id: '0' }), generateMsg({ id: '1' })], false, false, true, 'new');
211+
212+
state.addMessagesSorted([
213+
generateMsg({ id: '12', created_at: '2020-01-01T00:00:00.001Z' }),
214+
generateMsg({ id: '13', created_at: '2020-01-01T00:00:00.002Z' }),
215+
generateMsg({ id: '14', created_at: '2020-01-01T00:00:00.003Z' }),
216+
]);
217+
state.addMessagesSorted(
218+
[
219+
generateMsg({ id: '0', created_at: '2020-01-01T00:00:00.004Z' }),
220+
generateMsg({ id: '1', created_at: '2020-01-01T00:00:00.005Z' }),
221+
],
222+
false,
223+
false,
224+
true,
225+
'new',
226+
);
213227

214228
expect(state.messages.length).to.be.equal(3);
215229
expect(state.messages[0].id).to.be.equal('12');
@@ -223,7 +237,11 @@ describe('ChannelState addMessagesSorted', function () {
223237
it('should add messages to current message set', () => {
224238
const state = new ChannelState();
225239
state.addMessagesSorted(
226-
[generateMsg({ id: '12' }), generateMsg({ id: '13' }), generateMsg({ id: '14' })],
240+
[
241+
generateMsg({ id: '12', created_at: '2020-01-01T00:00:00.001Z' }),
242+
generateMsg({ id: '13', created_at: '2020-01-01T00:00:00.002Z' }),
243+
generateMsg({ id: '14', created_at: '2020-01-01T00:00:00.003Z' }),
244+
],
227245
false,
228246
false,
229247
true,
@@ -239,7 +257,11 @@ describe('ChannelState addMessagesSorted', function () {
239257
it('should add messages to latest message set', () => {
240258
const state = new ChannelState();
241259
state.addMessagesSorted(
242-
[generateMsg({ id: '12' }), generateMsg({ id: '13' }), generateMsg({ id: '14' })],
260+
[
261+
generateMsg({ id: '12', created_at: '2020-01-01T00:00:00.001Z' }),
262+
generateMsg({ id: '13', created_at: '2020-01-01T00:00:00.002Z' }),
263+
generateMsg({ id: '14', created_at: '2020-01-01T00:00:00.003Z' }),
264+
],
243265
false,
244266
false,
245267
true,
@@ -258,17 +280,37 @@ describe('ChannelState addMessagesSorted', function () {
258280

259281
it(`should add messages to latest message set when it's not currently active`, () => {
260282
const state = new ChannelState();
283+
261284
state.addMessagesSorted(
262-
[generateMsg({ id: '12' }), generateMsg({ id: '13' }), generateMsg({ id: '14' })],
285+
[
286+
generateMsg({ id: '12', created_at: '2020-01-01T00:00:00.001Z' }),
287+
generateMsg({ id: '13', created_at: '2020-01-01T00:00:00.002Z' }),
288+
generateMsg({ id: '14', created_at: '2020-01-01T00:00:00.003Z' }),
289+
],
263290
false,
264291
false,
265292
true,
266293
'latest',
267294
);
268-
state.addMessagesSorted([generateMsg({ id: '0' }), generateMsg({ id: '1' })], false, false, true, 'new');
295+
state.addMessagesSorted(
296+
[
297+
generateMsg({ id: '0', created_at: '2020-01-01T00:00:00.004Z' }),
298+
generateMsg({ id: '1', created_at: '2020-01-01T00:00:00.005Z' }),
299+
],
300+
false,
301+
false,
302+
true,
303+
'new',
304+
);
269305
state.messageSets[0].isCurrent = false;
270306
state.messageSets[1].isCurrent = true;
271-
state.addMessagesSorted([generateMsg({ id: '15' })], false, false, true, 'latest');
307+
state.addMessagesSorted(
308+
[generateMsg({ id: '15', created_at: '2020-01-01T00:00:00.006Z' })],
309+
false,
310+
false,
311+
true,
312+
'latest',
313+
);
272314

273315
expect(state.latestMessages.length).to.be.equal(4);
274316
expect(state.latestMessages[3].id).to.be.equal('15');
@@ -684,10 +726,10 @@ describe('deleteUserMessages', () => {
684726
const user1 = generateUser();
685727
const user2 = generateUser();
686728

687-
const m1u1 = generateMsg({ user: user1 });
688-
const m2u1 = generateMsg({ user: user1 });
689-
const m1u2 = generateMsg({ user: user2 });
690-
const m2u2 = generateMsg({ user: user2 });
729+
const m1u1 = generateMsg({ user: user1, created_at: '2020-01-01T00:00:00.001Z' });
730+
const m2u1 = generateMsg({ user: user1, created_at: '2020-01-01T00:00:00.002Z' });
731+
const m1u2 = generateMsg({ user: user2, created_at: '2020-01-01T00:00:00.003Z' });
732+
const m2u2 = generateMsg({ user: user2, created_at: '2020-01-01T00:00:00.004Z' });
691733

692734
state.addMessagesSorted([m1u1, m2u1, m1u2, m2u2]);
693735

@@ -719,10 +761,10 @@ describe('deleteUserMessages', () => {
719761
const user1 = generateUser();
720762
const user2 = generateUser();
721763

722-
const m1u1 = generateMsg({ user: user1 });
723-
const m2u1 = generateMsg({ user: user1 });
724-
const m1u2 = generateMsg({ user: user2 });
725-
const m2u2 = generateMsg({ user: user2 });
764+
const m1u1 = generateMsg({ user: user1, created_at: '2020-01-01T00:00:00.001Z' });
765+
const m2u1 = generateMsg({ user: user1, created_at: '2020-01-01T00:00:00.002Z' });
766+
const m1u2 = generateMsg({ user: user2, created_at: '2020-01-01T00:00:00.003Z' });
767+
const m2u2 = generateMsg({ user: user2, created_at: '2020-01-01T00:00:00.004Z' });
726768

727769
state.addMessagesSorted([m1u1, m2u1, m1u2, m2u2]);
728770
expect(state.messages).to.have.length(4);
@@ -755,10 +797,10 @@ describe('updateUserMessages', () => {
755797
let user1 = generateUser();
756798
const user2 = generateUser();
757799

758-
const m1u1 = generateMsg({ user: user1 });
759-
const m2u1 = generateMsg({ user: user1 });
760-
const m1u2 = generateMsg({ user: user2 });
761-
const m2u2 = generateMsg({ user: user2 });
800+
const m1u1 = generateMsg({ user: user1, created_at: '2020-01-01T00:00:00.001Z' });
801+
const m2u1 = generateMsg({ user: user1, created_at: '2020-01-01T00:00:00.002Z' });
802+
const m1u2 = generateMsg({ user: user2, created_at: '2020-01-01T00:00:00.003Z' });
803+
const m2u2 = generateMsg({ user: user2, created_at: '2020-01-01T00:00:00.004Z' });
762804

763805
state.addMessagesSorted([m1u1, m2u1, m1u2, m2u2]);
764806

@@ -785,7 +827,11 @@ describe('updateUserMessages', () => {
785827
describe('latestMessages', () => {
786828
it('should return latest messages - if they are the current message set', () => {
787829
const state = new ChannelState();
788-
const messages = [generateMsg({ id: '1' }), generateMsg({ id: '2' }), generateMsg({ id: '3' })];
830+
const messages = [
831+
generateMsg({ id: '1', created_at: '2020-01-01T00:00:00.001Z' }),
832+
generateMsg({ id: '2', created_at: '2020-01-01T00:00:00.002Z' }),
833+
generateMsg({ id: '3', created_at: '2020-01-01T00:00:00.003Z' }),
834+
];
789835
state.addMessagesSorted(messages);
790836

791837
expect(state.latestMessages.length).to.be.equal(messages.length);
@@ -796,7 +842,11 @@ describe('latestMessages', () => {
796842

797843
it('should return latest messages - if they are not the current message set', () => {
798844
const state = new ChannelState();
799-
const latestMessages = [generateMsg({ id: '1' }), generateMsg({ id: '2' }), generateMsg({ id: '3' })];
845+
const latestMessages = [
846+
generateMsg({ id: '1', created_at: '2020-01-01T00:00:00.001Z' }),
847+
generateMsg({ id: '2', created_at: '2020-01-01T00:00:00.002Z' }),
848+
generateMsg({ id: '3', created_at: '2020-01-01T00:00:00.003Z' }),
849+
];
800850
state.addMessagesSorted(latestMessages);
801851
const newMessages = [generateMsg({ id: '0' })];
802852
state.addMessagesSorted(newMessages, false, true, true, 'new');
@@ -811,7 +861,11 @@ describe('latestMessages', () => {
811861

812862
it('should return latest messages - if they are not the current message set and new messages received', () => {
813863
const state = new ChannelState();
814-
const latestMessages = [generateMsg({ id: '1' }), generateMsg({ id: '2' }), generateMsg({ id: '3' })];
864+
const latestMessages = [
865+
generateMsg({ id: '1', created_at: '2020-01-01T00:00:00.001Z' }),
866+
generateMsg({ id: '2', created_at: '2020-01-01T00:00:00.002Z' }),
867+
generateMsg({ id: '3', created_at: '2020-01-01T00:00:00.003Z' }),
868+
];
815869
state.addMessagesSorted(latestMessages);
816870
const newMessages = [generateMsg({ id: '0' })];
817871
state.addMessagesSorted(newMessages, false, true, true, 'new');

0 commit comments

Comments
 (0)