From cb07fa53f4282ebfe8f12d63f93bba8344f62b9e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 27 May 2020 15:05:40 +0100
Subject: [PATCH] test

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 test/end-to-end-tests/src/scenarios/toast.js | 48 +++++---------------
 1 file changed, 12 insertions(+), 36 deletions(-)

diff --git a/test/end-to-end-tests/src/scenarios/toast.js b/test/end-to-end-tests/src/scenarios/toast.js
index 97b5caa14f..02496f398d 100644
--- a/test/end-to-end-tests/src/scenarios/toast.js
+++ b/test/end-to-end-tests/src/scenarios/toast.js
@@ -20,25 +20,13 @@ module.exports = async function toastScenarios(alice, bob) {
     console.log(" checking and clearing toasts:");
 
     alice.log.startGroup(`clears toasts`);
-    // alice.log.step(`accepts desktop notifications toast`);
-    // await acceptToast(alice, "Notifications");
-    // alice.log.done();
-    //
-    // alice.log.step(`accepts analytics toast`);
-    // await acceptToast(alice, "Help us improve Riot");
-    // alice.log.done();
+    alice.log.step(`accepts desktop notifications toast`);
+    await acceptToast(alice, "Notifications");
+    alice.log.done();
 
-    while (true) {
-        try {
-            const h2Element = await alice.query('.mx_Toast_title h2');
-            const toastTitle = await alice.innerText(h2Element);
-            console.log("DEBUG closing", toastTitle);
-            const toastDismissButton = await alice.query('.mx_Toast_buttons .mx_AccessibleButton_kind_danger');
-            await toastDismissButton.click();
-        } catch (e) {
-            break;
-        }
-    }
+    alice.log.step(`rejects analytics toast`);
+    await rejectToast(alice, "Help us improve Riot");
+    alice.log.done();
 
     alice.log.step(`checks no remaining toasts`);
     await assertNoToasts(alice);
@@ -46,25 +34,13 @@ module.exports = async function toastScenarios(alice, bob) {
     alice.log.endGroup();
 
     bob.log.startGroup(`clears toasts`);
-    // bob.log.step(`reject desktop notifications toast`);
-    // await rejectToast(bob, "Notifications");
-    // bob.log.done();
-    //
-    // bob.log.step(`reject analytics toast`);
-    // await rejectToast(bob, "Help us improve Riot");
-    // bob.log.done();
+    bob.log.step(`reject desktop notifications toast`);
+    await rejectToast(bob, "Notifications");
+    bob.log.done();
 
-    while (true) {
-        try {
-            const h2Element = await bob.query('.mx_Toast_title h2');
-            const toastTitle = await bob.innerText(h2Element);
-            console.log("DEBUG closing", toastTitle);
-            const toastDismissButton = await bob.query('.mx_Toast_buttons .mx_AccessibleButton_kind_danger');
-            await toastDismissButton.click();
-        } catch (e) {
-            break;
-        }
-    }
+    bob.log.step(`reject analytics toast`);
+    await rejectToast(bob, "Help us improve Riot");
+    bob.log.done();
 
     bob.log.step(`checks no remaining toasts`);
     await assertNoToasts(bob);