matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2026-01-03 23:22:30 +03:00
Code Activity

fix some racy tests

Browse Source
This commit is contained in:
Richard van der Hoff
2016-01-16 00:18:51 +00:00
parent e0ddd65922
commit 43e7173c30
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
"use strict";
var q = require("q");
var sdk = require("../..");
var HttpBackend = require("../mock-request");
var utils = require("../test-utils");
@@ -78,14 +79,18 @@ function startClient(httpBackend, client) {
client.startClient();
var syncstate;
// set up a promise which will resolve once the client is initialised
var deferred = q.defer();
client.on("sync", function(state) {
syncstate = state;
console.log("sync", state);
if (state != "SYNCING") {
return;
}
deferred.resolve();
});
return httpBackend.flush().then(function() {
expect(syncstate).toEqual("SYNCING");
});
httpBackend.flush();
return deferred.promise;
}
@@ -318,17 +323,17 @@ describe("MatrixClient event timelines", function() {
};
});
httpBackend.flush("/sync").then(function() {
return client.getEventTimeline(room, EVENTS[2].event_id);
}).then(function(tl) {
expect(tl.getEvents().length).toEqual(4);
expect(tl.getEvents()[0].event).toEqual(EVENTS[1]);
expect(tl.getEvents()[1].event).toEqual(EVENTS[2]);
expect(tl.getEvents()[3].event).toEqual(EVENTS[3]);
expect(tl.getPaginationToken(true)).toEqual("start_token");
// expect(tl.getPaginationToken(false)).toEqual("s_5_4");
}).catch(exceptFail).done(done);
client.on("sync", function() {
client.getEventTimeline(room, EVENTS[2].event_id
).then(function(tl) {
expect(tl.getEvents().length).toEqual(4);
expect(tl.getEvents()[0].event).toEqual(EVENTS[1]);
expect(tl.getEvents()[1].event).toEqual(EVENTS[2]);
expect(tl.getEvents()[3].event).toEqual(EVENTS[3]);
expect(tl.getPaginationToken(true)).toEqual("start_token");
// expect(tl.getPaginationToken(false)).toEqual("s_5_4");
}).catch(exceptFail).done(done);
});
httpBackend.flush().catch(exceptFail);
});