matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-04 05:02:41 +03:00
Code Activity

More test deflakifying (#491)

Browse Source 
Call `flushAllExpected()` from some more places. In a couple of places, we were
apparently calling `flush()` redundantly, so remove it altogether.
This commit is contained in:
Richard van der Hoff
2017-07-12 14:05:39 +01:00
committed by Luke Barnard
parent b5a8e6bbdf
commit 83bd24adf8
1 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
spec/integ/matrix-client-event-timeline.spec.js
View File

@@ -92,7 +92,7 @@ function startClient(httpBackend, client) {
}); });
return q.all([ return q.all([
httpBackend.flush(), httpBackend.flushAllExpected(),
deferred.promise, deferred.promise,
]); ]);
} }
@@ -138,16 +138,13 @@ describe("getEventTimeline support", function() {
timelineSupport: true, timelineSupport: true,
}); });
return q.all([ return startClient(httpBackend, client).then(() => {
startClient(httpBackend, client).then(function() { const room = client.getRoom(roomId);
const room = client.getRoom(roomId); const timelineSet = room.getTimelineSets()[0];
const timelineSet = room.getTimelineSets()[0]; expect(function() {
expect(function() { client.getEventTimeline(timelineSet, "event");
client.getEventTimeline(timelineSet, "event"); }).toNotThrow();
}).toNotThrow(); });
}),
httpBackend.flush(),
]);
}); });
@@ -281,7 +278,7 @@ describe("MatrixClient event timelines", function() {
expect(tl.getPaginationToken(EventTimeline.FORWARDS)) expect(tl.getPaginationToken(EventTimeline.FORWARDS))
.toEqual("end_token"); .toEqual("end_token");
}), }),
httpBackend.flush(), httpBackend.flushAllExpected(),
]); ]);
}); });
@@ -304,20 +301,17 @@ describe("MatrixClient event timelines", function() {
}, },
}); });
return q.all([ return httpBackend.flush("/sync").then(function() {
httpBackend.flush("/sync").then(function() { return client.getEventTimeline(timelineSet, EVENTS[0].event_id);
return client.getEventTimeline(timelineSet, EVENTS[0].event_id); }).then(function(tl) {
}).then(function(tl) { expect(tl.getEvents().length).toEqual(2);
expect(tl.getEvents().length).toEqual(2); expect(tl.getEvents()[1].event).toEqual(EVENTS[0]);
expect(tl.getEvents()[1].event).toEqual(EVENTS[0]); expect(tl.getEvents()[1].sender.name).toEqual(userName);
expect(tl.getEvents()[1].sender.name).toEqual(userName); expect(tl.getPaginationToken(EventTimeline.BACKWARDS))
expect(tl.getPaginationToken(EventTimeline.BACKWARDS)) .toEqual("f_1_1");
.toEqual("f_1_1"); // expect(tl.getPaginationToken(EventTimeline.FORWARDS))
// expect(tl.getPaginationToken(EventTimeline.FORWARDS)) // .toEqual("s_5_4");
// .toEqual("s_5_4"); });
}),
httpBackend.flush(),
]);
}); });
it("should update timelines where they overlap a previous /sync", function() { it("should update timelines where they overlap a previous /sync", function() {
@@ -369,7 +363,7 @@ describe("MatrixClient event timelines", function() {
}); });
return q.all([ return q.all([
httpBackend.flush(), httpBackend.flushAllExpected(),
deferred.promise, deferred.promise,
]); ]);
}); });
@@ -466,7 +460,7 @@ describe("MatrixClient event timelines", function() {
expect(tl3.getPaginationToken(EventTimeline.FORWARDS)) expect(tl3.getPaginationToken(EventTimeline.FORWARDS))
.toEqual("end_token3"); .toEqual("end_token3");
}), }),
httpBackend.flush(), httpBackend.flushAllExpected(),
]); ]);
}); });
@@ -494,7 +488,7 @@ describe("MatrixClient event timelines", function() {
}, function(e) { }, function(e) {
expect(String(e)).toMatch(/'event'/); expect(String(e)).toMatch(/'event'/);
}), }),
httpBackend.flush(), httpBackend.flushAllExpected(),
]); ]);
}); });
}); });
@@ -547,7 +541,7 @@ describe("MatrixClient event timelines", function() {
expect(tl.getPaginationToken(EventTimeline.FORWARDS)) expect(tl.getPaginationToken(EventTimeline.FORWARDS))
.toEqual("end_token0"); .toEqual("end_token0");
}), }),
httpBackend.flush(), httpBackend.flushAllExpected(),
]); ]);
}); });
@@ -600,7 +594,7 @@ describe("MatrixClient event timelines", function() {
expect(tl.getPaginationToken(EventTimeline.FORWARDS)) expect(tl.getPaginationToken(EventTimeline.FORWARDS))
.toEqual("end_token1"); .toEqual("end_token1");
}), }),
httpBackend.flush(), httpBackend.flushAllExpected(),
]); ]);
}); });
}); });
@@ -732,7 +726,7 @@ describe("MatrixClient event timelines", function() {
}; };
httpBackend.when("GET", "/sync").respond(200, syncData); httpBackend.when("GET", "/sync").respond(200, syncData);
httpBackend.flush().then(function() { httpBackend.flushAllExpected().then(function() {
const room = client.getRoom(roomId); const room = client.getRoom(roomId);
const tl = room.getLiveTimeline(); const tl = room.getLiveTimeline();
expect(tl.getEvents().length).toEqual(3); expect(tl.getEvents().length).toEqual(3);
@@ -757,7 +751,7 @@ describe("MatrixClient event timelines", function() {
}; };
httpBackend.when("GET", "/sync").respond(200, sync2); httpBackend.when("GET", "/sync").respond(200, sync2);
return httpBackend.flush(); return httpBackend.flushAllExpected();
}).then(function() { }).then(function() {
const room = client.getRoom(roomId); const room = client.getRoom(roomId);
const tl = room.getLiveTimeline(); const tl = room.getLiveTimeline();