Skip to content

Commit dbc7d66

Browse files
MadLittleModsMadLittleMods
committed
Fix tests failing from function signature changes
1 parent d37fa81 commit dbc7d66

File tree

3 files changed

+43
-30
lines changed

3 files changed

+43
-30
lines changed

‎spec/unit/event-timeline.spec.js‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,11 @@ describe("EventTimeline", function() {
5050
timeline.initialiseState(events);
5151
expect(timeline.startState.setStateEvents).toHaveBeenCalledWith(
5252
events,
53+
{ timelineWasEmpty: undefined },
5354
);
5455
expect(timeline.endState.setStateEvents).toHaveBeenCalledWith(
5556
events,
57+
{ timelineWasEmpty: undefined },
5658
);
5759
});
5860

@@ -73,7 +75,7 @@ describe("EventTimeline", function() {
7375
expect(function() {
7476
timeline.initialiseState(state);
7577
}).not.toThrow();
76-
timeline.addEvent(event, false);
78+
timeline.addEvent(event, { toStartOfTimeline: false });
7779
expect(function() {
7880
timeline.initialiseState(state);
7981
}).toThrow();
@@ -149,19 +151,19 @@ describe("EventTimeline", function() {
149151
];
150152

151153
it("should be able to add events to the end", function() {
152-
timeline.addEvent(events[0], false);
154+
timeline.addEvent(events[0], { toStartOfTimeline: false });
153155
const initialIndex = timeline.getBaseIndex();
154-
timeline.addEvent(events[1], false);
156+
timeline.addEvent(events[1], { toStartOfTimeline: false });
155157
expect(timeline.getBaseIndex()).toEqual(initialIndex);
156158
expect(timeline.getEvents().length).toEqual(2);
157159
expect(timeline.getEvents()[0]).toEqual(events[0]);
158160
expect(timeline.getEvents()[1]).toEqual(events[1]);
159161
});
160162

161163
it("should be able to add events to the start", function() {
162-
timeline.addEvent(events[0], true);
164+
timeline.addEvent(events[0], { toStartOfTimeline: true });
163165
const initialIndex = timeline.getBaseIndex();
164-
timeline.addEvent(events[1], true);
166+
timeline.addEvent(events[1], { toStartOfTimeline: true });
165167
expect(timeline.getBaseIndex()).toEqual(initialIndex + 1);
166168
expect(timeline.getEvents().length).toEqual(2);
167169
expect(timeline.getEvents()[0]).toEqual(events[1]);
@@ -203,9 +205,9 @@ describe("EventTimeline", function() {
203205
content: { name: "Old Room Name" },
204206
});
205207

206-
timeline.addEvent(newEv, false);
208+
timeline.addEvent(newEv, { toStartOfTimeline: false });
207209
expect(newEv.sender).toEqual(sentinel);
208-
timeline.addEvent(oldEv, true);
210+
timeline.addEvent(oldEv, { toStartOfTimeline: true });
209211
expect(oldEv.sender).toEqual(oldSentinel);
210212
});
211213

@@ -242,9 +244,9 @@ describe("EventTimeline", function() {
242244
const oldEv = utils.mkMembership({
243245
room: roomId, mship: "ban", user: userB, skey: userA, event: true,
244246
});
245-
timeline.addEvent(newEv, false);
247+
timeline.addEvent(newEv, { toStartOfTimeline: false });
246248
expect(newEv.target).toEqual(sentinel);
247-
timeline.addEvent(oldEv, true);
249+
timeline.addEvent(oldEv, { toStartOfTimeline: true });
248250
expect(oldEv.target).toEqual(oldSentinel);
249251
});
250252

@@ -262,13 +264,13 @@ describe("EventTimeline", function() {
262264
}),
263265
];
264266

265-
timeline.addEvent(events[0], false);
266-
timeline.addEvent(events[1], false);
267+
timeline.addEvent(events[0], { toStartOfTimeline: false });
268+
timeline.addEvent(events[1], { toStartOfTimeline: false });
267269

268270
expect(timeline.getState(EventTimeline.FORWARDS).setStateEvents).
269-
toHaveBeenCalledWith([events[0]]);
271+
toHaveBeenCalledWith([events[0]], { timelineWasEmpty: undefined });
270272
expect(timeline.getState(EventTimeline.FORWARDS).setStateEvents).
271-
toHaveBeenCalledWith([events[1]]);
273+
toHaveBeenCalledWith([events[1]], { timelineWasEmpty: undefined });
272274

273275
expect(events[0].forwardLooking).toBe(true);
274276
expect(events[1].forwardLooking).toBe(true);
@@ -291,13 +293,13 @@ describe("EventTimeline", function() {
291293
}),
292294
];
293295

294-
timeline.addEvent(events[0], true);
295-
timeline.addEvent(events[1], true);
296+
timeline.addEvent(events[0], { toStartOfTimeline: true });
297+
timeline.addEvent(events[1], { toStartOfTimeline: true });
296298

297299
expect(timeline.getState(EventTimeline.BACKWARDS).setStateEvents).
298-
toHaveBeenCalledWith([events[0]]);
300+
toHaveBeenCalledWith([events[0]], { timelineWasEmpty: undefined });
299301
expect(timeline.getState(EventTimeline.BACKWARDS).setStateEvents).
300-
toHaveBeenCalledWith([events[1]]);
302+
toHaveBeenCalledWith([events[1]], { timelineWasEmpty: undefined });
301303

302304
expect(events[0].forwardLooking).toBe(false);
303305
expect(events[1].forwardLooking).toBe(false);
@@ -324,8 +326,8 @@ describe("EventTimeline", function() {
324326
];
325327

326328
it("should remove events", function() {
327-
timeline.addEvent(events[0], false);
328-
timeline.addEvent(events[1], false);
329+
timeline.addEvent(events[0], { toStartOfTimeline: false });
330+
timeline.addEvent(events[1], { toStartOfTimeline: false });
329331
expect(timeline.getEvents().length).toEqual(2);
330332

331333
let ev = timeline.removeEvent(events[0].getId());
@@ -338,9 +340,9 @@ describe("EventTimeline", function() {
338340
});
339341

340342
it("should update baseIndex", function() {
341-
timeline.addEvent(events[0], false);
342-
timeline.addEvent(events[1], true);
343-
timeline.addEvent(events[2], false);
343+
timeline.addEvent(events[0], { toStartOfTimeline: false });
344+
timeline.addEvent(events[1], { toStartOfTimeline: true });
345+
timeline.addEvent(events[2], { toStartOfTimeline: false });
344346
expect(timeline.getEvents().length).toEqual(3);
345347
expect(timeline.getBaseIndex()).toEqual(1);
346348

@@ -358,11 +360,11 @@ describe("EventTimeline", function() {
358360
// further addEvent(ev, false) calls made the index increase.
359361
it("should not make baseIndex assplode when removing the last event",
360362
function() {
361-
timeline.addEvent(events[0], true);
363+
timeline.addEvent(events[0], { toStartOfTimeline: true });
362364
timeline.removeEvent(events[0].getId());
363365
const initialIndex = timeline.getBaseIndex();
364-
timeline.addEvent(events[1], false);
365-
timeline.addEvent(events[2], false);
366+
timeline.addEvent(events[1], { toStartOfTimeline: false });
367+
timeline.addEvent(events[2], { toStartOfTimeline: false });
366368
expect(timeline.getBaseIndex()).toEqual(initialIndex);
367369
expect(timeline.getEvents().length).toEqual(2);
368370
});

‎spec/unit/room.spec.ts‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,9 @@ describe("Room", function() {
209209

210210
it("should throw if duplicateStrategy isn't 'replace' or 'ignore'", function() {
211211
expect(function() {
212-
room.addLiveEvents(events, "foo");
212+
room.addLiveEvents(events, {
213+
duplicateStrategy: "foo",
214+
});
213215
}).toThrow();
214216
});
215217

@@ -221,7 +223,9 @@ describe("Room", function() {
221223
dupe.event.event_id = events[0].getId();
222224
room.addLiveEvents(events);
223225
expect(room.timeline[0]).toEqual(events[0]);
224-
room.addLiveEvents([dupe], DuplicateStrategy.Replace);
226+
room.addLiveEvents([dupe], {
227+
duplicateStrategy: DuplicateStrategy.Replace,
228+
});
225229
expect(room.timeline[0]).toEqual(dupe);
226230
});
227231

@@ -233,7 +237,9 @@ describe("Room", function() {
233237
dupe.event.event_id = events[0].getId();
234238
room.addLiveEvents(events);
235239
expect(room.timeline[0]).toEqual(events[0]);
236-
room.addLiveEvents([dupe], "ignore");
240+
room.addLiveEvents([dupe], {
241+
duplicateStrategy: "ignore",
242+
});
237243
expect(room.timeline[0]).toEqual(events[0]);
238244
});
239245

@@ -266,9 +272,11 @@ describe("Room", function() {
266272
room.addLiveEvents(events);
267273
expect(room.currentState.setStateEvents).toHaveBeenCalledWith(
268274
[events[0]],
275+
{ timelineWasEmpty: undefined },
269276
);
270277
expect(room.currentState.setStateEvents).toHaveBeenCalledWith(
271278
[events[1]],
279+
{ timelineWasEmpty: undefined },
272280
);
273281
expect(events[0].forwardLooking).toBe(true);
274282
expect(events[1].forwardLooking).toBe(true);
@@ -470,9 +478,11 @@ describe("Room", function() {
470478
room.addEventsToTimeline(events, true, room.getLiveTimeline());
471479
expect(room.oldState.setStateEvents).toHaveBeenCalledWith(
472480
[events[0]],
481+
{ timelineWasEmpty: undefined },
473482
);
474483
expect(room.oldState.setStateEvents).toHaveBeenCalledWith(
475484
[events[1]],
485+
{ timelineWasEmpty: undefined },
476486
);
477487
expect(events[0].forwardLooking).toBe(false);
478488
expect(events[1].forwardLooking).toBe(false);

‎spec/unit/timeline-window.spec.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,14 @@ function createTimeline(numEvents, baseIndex) {
3535
return timeline;
3636
}
3737

38-
function addEventsToTimeline(timeline, numEvents, atStart) {
38+
function addEventsToTimeline(timeline, numEvents, toStartOfTimeline) {
3939
for (let i = 0; i < numEvents; i++) {
4040
timeline.addEvent(
4141
utils.mkMessage({
4242
room: ROOM_ID, user: USER_ID,
4343
event: true,
44-
}), atStart,
44+
}),
45+
{ toStartOfTimeline },
4546
);
4647
}
4748
}

0 commit comments

Comments
 (0)