PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fix tests to use new serverConfig prop

Browse source
This commit is contained in:
Travis Ralston 2019-05-02 23:46:43 -06:00
parent a4b6464902
commit ae63df95ea
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/components/structures/auth/Login-test.js
View file

@ -22,6 +22,7 @@ import ReactTestUtils from 'react-dom/test-utils';
import sdk from 'matrix-react-sdk'; import sdk from 'matrix-react-sdk';
import SdkConfig from '../../../../src/SdkConfig'; import SdkConfig from '../../../../src/SdkConfig';
import * as TestUtils from '../../../test-utils'; import * as TestUtils from '../../../test-utils';
import {mkServerConfig} from "../../../test-utils";
const Login = sdk.getComponent( const Login = sdk.getComponent(
'structures.auth.Login', 'structures.auth.Login',
@ -44,8 +45,7 @@ describe('Login', function() {
function render() { function render() {
return ReactDOM.render(<Login return ReactDOM.render(<Login
defaultHsUrl="https://matrix.org" serverConfig={mkServerConfig("https://matrix.org", "https://vector.im")}
defaultIsUrl="https://vector.im"
onLoggedIn={() => {}} onLoggedIn={() => {}}
onRegisterClick={() => {}} onRegisterClick={() => {}}
onServerConfigChange={() => {}} onServerConfigChange={() => {}}

4
test/components/structures/auth/Registration-test.js
View file

@ -22,6 +22,7 @@ import ReactTestUtils from 'react-dom/test-utils';
import sdk from 'matrix-react-sdk'; import sdk from 'matrix-react-sdk';
import SdkConfig from '../../../../src/SdkConfig'; import SdkConfig from '../../../../src/SdkConfig';
import * as TestUtils from '../../../test-utils'; import * as TestUtils from '../../../test-utils';
import {mkServerConfig} from "../../../test-utils";
const Registration = sdk.getComponent( const Registration = sdk.getComponent(
'structures.auth.Registration', 'structures.auth.Registration',
@ -44,8 +45,7 @@ describe('Registration', function() {
function render() { function render() {
return ReactDOM.render(<Registration return ReactDOM.render(<Registration
defaultHsUrl="https://matrix.org" serverConfig={mkServerConfig("https://matrix.org", "https://vector.im")}
defaultIsUrl="https://vector.im"
makeRegistrationUrl={() => {}} makeRegistrationUrl={() => {}}
onLoggedIn={() => {}} onLoggedIn={() => {}}
onLoginClick={() => {}} onLoginClick={() => {}}

12
test/test-utils.js
View file

@ -7,6 +7,8 @@ import PropTypes from 'prop-types';
import peg from '../src/MatrixClientPeg'; import peg from '../src/MatrixClientPeg';
import dis from '../src/dispatcher'; import dis from '../src/dispatcher';
import jssdk from 'matrix-js-sdk'; import jssdk from 'matrix-js-sdk';
import {makeType} from "../src/utils/TypeUtils";
import {ValidatedServerConfig} from "../src/utils/AutoDiscoveryUtils";
const MatrixEvent = jssdk.MatrixEvent; const MatrixEvent = jssdk.MatrixEvent;
/** /**
@ -260,6 +262,16 @@ export function mkStubRoom(roomId = null) {
}; };
} }
export function mkServerConfig(hsUrl, isUrl) {
return makeType(ValidatedServerConfig, {
hsUrl,
hsName: "TEST_ENVIRONMENT",
hsNameIsDifferent: false, // yes, we lie
isUrl,
identityEnabled: true,
});
}
export function getDispatchForStore(store) { export function getDispatchForStore(store) {
// Mock the dispatcher by gut-wrenching. Stores can only __emitChange whilst a // Mock the dispatcher by gut-wrenching. Stores can only __emitChange whilst a
// dispatcher `_isDispatching` is true. // dispatcher `_isDispatching` is true.