mirror of https://github.com/vector-im/riot-web
parent
37a0957285
commit
935f95fcde
|
@ -40,7 +40,6 @@ import "fake-indexeddb/auto";
|
|||
import {cleanLocalstorage} from "../test-utils";
|
||||
import {IndexedDBCryptoStore} from "matrix-js-sdk/src/crypto/store/indexeddb-crypto-store";
|
||||
import { RoomView as RoomViewClass } from 'matrix-react-sdk/src/components/structures/RoomView';
|
||||
import LoginComponent from 'matrix-react-sdk/src/components/structures/auth/Login';
|
||||
|
||||
const DEFAULT_HS_URL='http://my_server';
|
||||
const DEFAULT_IS_URL='http://my_is';
|
||||
|
@ -96,7 +95,7 @@ describe('loading:', function() {
|
|||
* TODO: it would be nice to factor some of this stuff out of index.js so
|
||||
* that we can test it rather than our own implementation of it.
|
||||
*/
|
||||
function loadApp(opts?) {
|
||||
function loadApp(opts) {
|
||||
opts = opts || {};
|
||||
const queryString = opts.queryString || "";
|
||||
const uriFragment = opts.uriFragment || "";
|
||||
|
@ -166,7 +165,7 @@ describe('loading:', function() {
|
|||
// http requests until we do.
|
||||
//
|
||||
// returns a promise resolving to the received request
|
||||
async function expectAndAwaitSync(opts?) {
|
||||
async function expectAndAwaitSync(opts) {
|
||||
let syncRequest = null;
|
||||
const isGuest = opts && opts.isGuest;
|
||||
if (!isGuest) {
|
||||
|
@ -635,7 +634,7 @@ describe('loading:', function() {
|
|||
async function completeLogin(matrixChat) {
|
||||
// we expect a single <Login> component
|
||||
const login = ReactTestUtils.findRenderedComponentWithType(
|
||||
matrixChat, LoginComponent);
|
||||
matrixChat, sdk.getComponent('structures.auth.Login'));
|
||||
|
||||
// When we switch to the login component, it'll hit the login endpoint
|
||||
// for proof of life and to get flows. We'll only give it one option.
|
||||
|
@ -675,7 +674,7 @@ describe('loading:', function() {
|
|||
|
||||
// assert that we are on the loading page
|
||||
function assertAtLoadingSpinner(matrixChat) {
|
||||
const domComponent = ReactDOM.findDOMNode(matrixChat) as Element;
|
||||
const domComponent = ReactDOM.findDOMNode(matrixChat);
|
||||
expect(domComponent.className).toEqual("mx_MatrixChat_splash");
|
||||
|
||||
// just the spinner
|
||||
|
@ -693,14 +692,14 @@ function awaitLoggedIn(matrixChat) {
|
|||
}
|
||||
console.log(Date.now() + ": Received on_logged_in action");
|
||||
dis.unregister(dispatcherRef);
|
||||
resolve(undefined);
|
||||
resolve();
|
||||
};
|
||||
const dispatcherRef = dis.register(onAction);
|
||||
console.log(Date.now() + ": Waiting for on_logged_in action");
|
||||
});
|
||||
}
|
||||
|
||||
function awaitRoomView(matrixChat, retryLimit?, retryCount?) {
|
||||
function awaitRoomView(matrixChat, retryLimit, retryCount) {
|
||||
if (retryLimit === undefined) {
|
||||
retryLimit = 5;
|
||||
}
|
||||
|
@ -727,13 +726,13 @@ function awaitRoomView(matrixChat, retryLimit?, retryCount?) {
|
|||
return Promise.resolve();
|
||||
}
|
||||
|
||||
function awaitLoginComponent(matrixChat, attempts?) {
|
||||
function awaitLoginComponent(matrixChat, attempts) {
|
||||
return MatrixReactTestUtils.waitForRenderedComponentWithType(
|
||||
matrixChat, sdk.getComponent('structures.auth.Login'), attempts,
|
||||
);
|
||||
}
|
||||
|
||||
function awaitWelcomeComponent(matrixChat, attempts?) {
|
||||
function awaitWelcomeComponent(matrixChat, attempts) {
|
||||
return MatrixReactTestUtils.waitForRenderedComponentWithType(
|
||||
matrixChat, sdk.getComponent('auth.Welcome'), attempts,
|
||||
);
|
||||
|
|
Loading…
Reference in New Issue