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

this dialog isn't shown anymore and this was accepting the SAS dialog 

also lower timeout so we don't wait 5s if there is no dialog
pull/21833/head
Bruno Windels 2019-04-03 14:31:31 +02:00
parent d63a0c5aea
commit e147cc9341
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/usecases/accept-invite.js
View File

@ -34,8 +34,5 @@ module.exports = async function acceptInvite(session, name) {
const acceptInvitationLink = await session.waitAndQuery(".mx_RoomPreviewBar_join_text a:first-child");
await acceptInvitationLink.click();
// accept e2e warning dialog
acceptDialogMaybe(session, "encryption");
session.log.done();
}

4
src/usecases/dialog.js
View File

@ -32,7 +32,7 @@ async function acceptDialog(session, expectedTitle) {
async function acceptDialogMaybe(session, expectedTitle) {
let primaryButton = null;
try {
primaryButton = await session.waitAndQuery(".mx_Dialog [role=dialog] .mx_Dialog_primary");
primaryButton = await session.waitAndQuery(".mx_Dialog .mx_Dialog_primary", 50);
} catch(err) {
return false;
}
@ -44,7 +44,7 @@ async function acceptDialogMaybe(session, expectedTitle) {
}
module.exports = {
assertDialog,
acceptDialog,
acceptDialogMaybe,
assertDialog,
};