From e147cc9341a1b950760e669ada259d5bdd707d72 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 3 Apr 2019 14:31:31 +0200
Subject: [PATCH] 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
---
 src/usecases/accept-invite.js | 3 ---
 src/usecases/dialog.js        | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/usecases/accept-invite.js b/src/usecases/accept-invite.js
index 8cc1a0b37d..03fbac28fa 100644
--- a/src/usecases/accept-invite.js
+++ b/src/usecases/accept-invite.js
@@ -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();
 }
diff --git a/src/usecases/dialog.js b/src/usecases/dialog.js
index b11dac616d..da71f6b61f 100644
--- a/src/usecases/dialog.js
+++ b/src/usecases/dialog.js
@@ -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,
 };