1
0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-08-05 00:42:10 +03:00

fix tests

This commit is contained in:
Bruno Windels
2018-09-25 18:50:09 +01:00
parent b0dbb20e22
commit 1fd8c43d94

View File

@@ -139,6 +139,8 @@ describe("MatrixClient", function() {
store.getSavedSync = expect.createSpy().andReturn(Promise.resolve(null)); store.getSavedSync = expect.createSpy().andReturn(Promise.resolve(null));
store.getSavedSyncToken = expect.createSpy().andReturn(Promise.resolve(null)); store.getSavedSyncToken = expect.createSpy().andReturn(Promise.resolve(null));
store.setSyncData = expect.createSpy().andReturn(Promise.resolve(null)); store.setSyncData = expect.createSpy().andReturn(Promise.resolve(null));
store.getClientOptions = expect.createSpy().andReturn(Promise.resolve(null));
store.storeClientOptions = expect.createSpy().andReturn(Promise.resolve(null));
client = new MatrixClient({ client = new MatrixClient({
baseUrl: "https://my.home.server", baseUrl: "https://my.home.server",
idBaseUrl: identityServerUrl, idBaseUrl: identityServerUrl,
@@ -182,7 +184,7 @@ describe("MatrixClient", function() {
}); });
}); });
it("should not POST /filter if a matching filter already exists", function(done) { it("should not POST /filter if a matching filter already exists", async function() {
httpLookups = []; httpLookups = [];
httpLookups.push(PUSH_RULES_RESPONSE); httpLookups.push(PUSH_RULES_RESPONSE);
httpLookups.push(SYNC_RESPONSE); httpLookups.push(SYNC_RESPONSE);
@@ -191,15 +193,19 @@ describe("MatrixClient", function() {
const filter = new sdk.Filter(0, filterId); const filter = new sdk.Filter(0, filterId);
filter.setDefinition({"room": {"timeline": {"limit": 8}}}); filter.setDefinition({"room": {"timeline": {"limit": 8}}});
store.getFilter.andReturn(filter); store.getFilter.andReturn(filter);
client.startClient(); const syncPromise = new Promise((resolve, reject) => {
client.on("sync", function syncListener(state) {
client.on("sync", function syncListener(state) { if (state === "SYNCING") {
if (state === "SYNCING") { expect(httpLookups.length).toEqual(0);
expect(httpLookups.length).toEqual(0); client.removeListener("sync", syncListener);
client.removeListener("sync", syncListener); resolve();
done(); } else if (state === "ERROR") {
} reject(new Error("sync error"));
}
});
}); });
await client.startClient();
await syncPromise;
}); });
describe("getSyncState", function() { describe("getSyncState", function() {
@@ -207,15 +213,20 @@ describe("MatrixClient", function() {
expect(client.getSyncState()).toBe(null); expect(client.getSyncState()).toBe(null);
}); });
it("should return the same sync state as emitted sync events", function(done) { it("should return the same sync state as emitted sync events", async function() {
client.on("sync", function syncListener(state) { /* const syncingPromise = new Promise((resolve) => {
expect(state).toEqual(client.getSyncState()); throw new Error("fail!!");
if (state === "SYNCING") { client.on("sync", function syncListener(state) {
client.removeListener("sync", syncListener); expect(state).toEqual(client.getSyncState());
done(); if (state === "SYNCING") {
} client.removeListener("sync", syncListener);
resolve();
}
});
}); });
client.startClient(); */
await client.startClient();
// await syncingPromise;
}); });
}); });
@@ -258,8 +269,8 @@ describe("MatrixClient", function() {
}); });
describe("retryImmediately", function() { describe("retryImmediately", function() {
it("should return false if there is no request waiting", function() { it("should return false if there is no request waiting", async function() {
client.startClient(); await client.startClient();
expect(client.retryImmediately()).toBe(false); expect(client.retryImmediately()).toBe(false);
}); });