Replace beforeEach with just a cleanLocalstorage call

The rest isn't needed anymore.
pull/11869/head
Travis Ralston 2020-01-15 14:06:24 -07:00
parent 3c9c0ec447
commit e37da08730
2 changed files with 3 additions and 24 deletions

View File

@ -37,6 +37,7 @@ import {makeType} from "matrix-react-sdk/src/utils/TypeUtils";
import {ValidatedServerConfig} from "matrix-react-sdk/src/utils/AutoDiscoveryUtils"; import {ValidatedServerConfig} from "matrix-react-sdk/src/utils/AutoDiscoveryUtils";
import {sleep} from "../test-utils"; import {sleep} from "../test-utils";
import "fake-indexeddb/auto"; import "fake-indexeddb/auto";
import {cleanLocalstorage} from "../test-utils";
const DEFAULT_HS_URL='http://my_server'; const DEFAULT_HS_URL='http://my_server';
const DEFAULT_IS_URL='http://my_is'; const DEFAULT_IS_URL='http://my_is';
@ -86,6 +87,7 @@ describe('loading:', function() {
test_utils.deleteIndexedDB('matrix-js-sdk:crypto'), test_utils.deleteIndexedDB('matrix-js-sdk:crypto'),
test_utils.deleteIndexedDB('matrix-js-sdk:riot-web-sync'), test_utils.deleteIndexedDB('matrix-js-sdk:riot-web-sync'),
]); ]);
cleanLocalstorage();
console.log(`${Date.now()}: loading: afterEach complete`); console.log(`${Date.now()}: loading: afterEach complete`);
}); });

View File

@ -1,30 +1,7 @@
"use strict"; export function cleanLocalstorage() {
/**
* Perform common actions before each test case, e.g. printing the test case
* name to stdout.
* @param {Mocha.Context} context The test context
*/
export function beforeEach(context) {
const desc = context.currentTest.fullTitle();
console.log();
console.log(desc);
console.log(new Array(1 + desc.length).join("="));
// some tests store things in localstorage. Improve independence of tests
// by making sure that they don't inherit any old state.
window.localStorage.clear(); window.localStorage.clear();
} }
/**
* returns true if the current environment supports webrtc
*/
export function browserSupportsWebRTC() {
const n = global.window.navigator;
return n.getUserMedia || n.webkitGetUserMedia ||
n.mozGetUserMedia;
}
export function deleteIndexedDB(dbName) { export function deleteIndexedDB(dbName) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (!window.indexedDB) { if (!window.indexedDB) {