OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/4401/head
Weblate 2017-06-20 15:24:12 +00:00
parent 8a17e3543a abf21675d5
commit d9f662c06e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,8 @@ describe('loading:', function () {
}); });
}); });
afterEach(async function() { afterEach(async function () {
console.log('loading: afterEach');
if (parentDiv) { if (parentDiv) {
ReactDOM.unmountComponentAtNode(parentDiv); ReactDOM.unmountComponentAtNode(parentDiv);
parentDiv.remove(); parentDiv.remove();

7
test/test-utils.js
View File

@ -38,12 +38,12 @@ export function deleteIndexedDB(dbName) {
const req = window.indexedDB.deleteDatabase(dbName); const req = window.indexedDB.deleteDatabase(dbName);
req.onblocked = () => { req.onblocked = () => {
console.log(`can't yet delete indexeddb because it is open elsewhere`); console.log(`can't yet delete indexeddb ${dbName} because it is open elsewhere`);
}; };
req.onerror = (ev) => { req.onerror = (ev) => {
reject(new Error( reject(new Error(
"unable to delete indexeddb: " + ev.target.error, `unable to delete indexeddb ${dbName}: ${ev.target.error}`,
)); ));
}; };
@ -51,5 +51,8 @@ export function deleteIndexedDB(dbName) {
console.log(`Removed indexeddb instance: ${dbName}`); console.log(`Removed indexeddb instance: ${dbName}`);
resolve(); resolve();
}; };
}).catch((e) => {
console.error(`Error removing indexeddb instance ${dbName}: ${e}`);
throw e;
}); });
} }