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

Create unencrypted rooms by default in e2e-tests 

Otherwise the lazy loading test will try to join the room after the encrypted messages have already been sent, making them invisible. 

See https://github.com/vector-im/riot-web/issues/13226#issuecomment-614928362
pull/21833/head
Travis Ralston 2020-04-16 16:27:43 -06:00
parent 6d46ef548e
commit a5f5f759cb
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/views/dialogs/CreateRoomDialog.js
View File

@ -194,7 +194,12 @@ export default createReactClass({
let e2eeSection; let e2eeSection;
if (!this.state.isPublic && SettingsStore.getValue("feature_cross_signing")) { if (!this.state.isPublic && SettingsStore.getValue("feature_cross_signing")) {
e2eeSection = <React.Fragment> e2eeSection = <React.Fragment>
<LabelledToggleSwitch label={ _t("Enable end-to-end encryption")} onChange={this.onEncryptedChange} value={this.state.isEncrypted} /> <LabelledToggleSwitch
label={ _t("Enable end-to-end encryption")}
onChange={this.onEncryptedChange}
value={this.state.isEncrypted}
className='mx_CreateRoomDialog_e2eSwitch' // for end-to-end tests
/>
<p>{ _t("You can’t disable this later. Bridges & most bots won’t work yet.") }</p> <p>{ _t("You can’t disable this later. Bridges & most bots won’t work yet.") }</p>
</React.Fragment>; </React.Fragment>;
} }

6
src/components/views/elements/LabelledToggleSwitch.js
View File

@ -35,6 +35,9 @@ export default class LabelledToggleSwitch extends React.Component {
// True to put the toggle in front of the label // True to put the toggle in front of the label
// Default false. // Default false.
toggleInFront: PropTypes.bool, toggleInFront: PropTypes.bool,
// Additional class names to append to the switch. Optional.
className: PropTypes.string,
}; };
render() { render() {
@ -50,8 +53,9 @@ export default class LabelledToggleSwitch extends React.Component {
secondPart = temp; secondPart = temp;
} }
const classes = `mx_SettingsFlag ${this.props.className || ""}`;
return ( return (
<div className="mx_SettingsFlag"> <div className={classes}>
{firstPart} {firstPart}
{secondPart} {secondPart}
</div> </div>

8
test/end-to-end-tests/src/usecases/create-room.js
View File

@ -20,7 +20,7 @@ async function openRoomDirectory(session) {
await roomDirectoryButton.click(); await roomDirectoryButton.click();
} }
async function createRoom(session, roomName) { async function createRoom(session, roomName, encrypted=false) {
session.log.step(`creates room "${roomName}"`); session.log.step(`creates room "${roomName}"`);
const roomListHeaders = await session.queryAll('.mx_RoomSubList_labelContainer'); const roomListHeaders = await session.queryAll('.mx_RoomSubList_labelContainer');
@ -33,10 +33,14 @@ async function createRoom(session, roomName) {
const addRoomButton = await roomsHeader.$(".mx_RoomSubList_addRoom"); const addRoomButton = await roomsHeader.$(".mx_RoomSubList_addRoom");
await addRoomButton.click(); await addRoomButton.click();
const roomNameInput = await session.query('.mx_CreateRoomDialog_name input'); const roomNameInput = await session.query('.mx_CreateRoomDialog_name input');
await session.replaceInputText(roomNameInput, roomName); await session.replaceInputText(roomNameInput, roomName);
if (!encrypted) {
const encryptionToggle = await session.query('.mx_CreateRoomDialog_e2eSwitch .mx_ToggleSwitch');
await encryptionToggle.click();
}
const createButton = await session.query('.mx_Dialog_primary'); const createButton = await session.query('.mx_Dialog_primary');
await createButton.click(); await createButton.click();