gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-07-20 10:50:26 +00:00
parent e133160a68 7e00a86048
commit 878ff9826a
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/app-tests/loading.js
View File

@ -82,9 +82,14 @@ describe('loading:', function () {
// unmounting should have cleared the MatrixClientPeg // unmounting should have cleared the MatrixClientPeg
expect(MatrixClientPeg.get()).toBe(null); expect(MatrixClientPeg.get()).toBe(null);
// chrome seems to take *ages* to delete the indexeddbs.
this.timeout(10000);
// clear the indexeddbs so we can start from a clean slate next time. // clear the indexeddbs so we can start from a clean slate next time.
await test_utils.deleteIndexedDB('matrix-js-sdk:crypto'); await Promise.all([
await test_utils.deleteIndexedDB('matrix-js-sdk:riot-web-sync'); test_utils.deleteIndexedDB('matrix-js-sdk:crypto'),
test_utils.deleteIndexedDB('matrix-js-sdk:riot-web-sync'),
]);
console.log(`${Date.now()}: loading: afterEach complete`); console.log(`${Date.now()}: loading: afterEach complete`);
}); });

6
test/test-utils.js
View File

@ -34,7 +34,8 @@ export function deleteIndexedDB(dbName) {
return; return;
} }
console.log(`${Date.now()}: Removing indexeddb instance: ${dbName}`); const startTime = Date.now();
console.log(`${startTime}: Removing indexeddb instance: ${dbName}`);
const req = window.indexedDB.deleteDatabase(dbName); const req = window.indexedDB.deleteDatabase(dbName);
req.onblocked = () => { req.onblocked = () => {
@ -48,7 +49,8 @@ export function deleteIndexedDB(dbName) {
}; };
req.onsuccess = () => { req.onsuccess = () => {
console.log(`${Date.now()}: Removed indexeddb instance: ${dbName}`); const now = Date.now();
console.log(`${now}: Removed indexeddb instance: ${dbName} in ${now-startTime} ms`);
resolve(); resolve();
}; };
}).catch((e) => { }).catch((e) => {