fix: fix end meeting tests (jitsi#616)

* fix: fix end meeting tests

* revert test

* remove incorrect comment

* fix LobbyTest

src/test/java/org/jitsi/meet/test/IFrameAPICommandsTest.java

@@ -1029,14 +1029,10 @@ public void testCommandKickParticipant()
 
         participant1.waitForParticipants(0);
 
-        // check that the kicked participant sees the notification
+        // check that the kicked participant sees the kick reason dialog
         assertTrue(
-            getParticipant2().getNotifications().hasKickedNotification(),
-            "The second participant should see a warning that was kicked.");
-
-//        switchToIframeAPI(driver1);
-//         FIXME getEventResult(driver1, "participantKickedOut")
-//        switchToMeetContent(this.iFrameUrl, driver1);
+            getParticipant2().getDialogs().isLeaveReasonDialogOpen(),
+            "The second participant should see a dialog that states he was kicked.");
     }
 
     /**

src/test/java/org/jitsi/meet/test/KickTest.java

@@ -56,10 +56,10 @@ public void kickParticipant2AndCheck()
 
             participant1.waitForParticipants(0);
 
-            // check that the kicked participant sees the notification
+            // check that the kicked participant sees the kick reason dialog
             assertTrue(
-                getParticipant2().getNotifications().hasKickedNotification(),
-                "The second participant should see a warning that was kicked.");
+                getParticipant2().getDialogs().isLeaveReasonDialogOpen(),
+                "The second participant should see a dialog that states he was kicked.");
         }
         else
         {

src/test/java/org/jitsi/meet/test/LobbyTest.java

@@ -363,8 +363,8 @@ public void testConferenceEndedInLobby()
         WebParticipant participant3 = getParticipant3();
 
         assertTrue(
-            participant3.getNotifications().hasMeetingEndedNotification(),
-            "The third participant should see a warning that meeting has ended.");
+            getParticipant3().getDialogs().isLeaveReasonDialogOpen(),
+            "The second participant should see a dialog that states that the meeting has ended.");
 
         assertFalse(participant3.getLobbyScreen().isLobbyRoomJoined(), "Lobby room not left");
 

src/test/java/org/jitsi/meet/test/pageobjects/web/Dialogs.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright @ 2018 8x8 Pty Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jitsi.meet.test.pageobjects.web;
+
+import org.jitsi.meet.test.util.*;
+import org.jitsi.meet.test.web.*;
+import org.openqa.selenium.*;
+import org.openqa.selenium.NoSuchElementException;
+import org.openqa.selenium.interactions.*;
+
+import java.util.*;
+
+/**
+ * Manages dialogs
+ */
+public class Dialogs
+{
+    /**
+     * The participant on current page.
+     */
+    private final WebParticipant participant;
+
+    /**
+     * The test id for the notification when a participant joins.
+     */
+    private static final String LEAVE_REASON_ID = "dialog.leaveReason";
+
+    public Dialogs(WebParticipant participant)
+    {
+        this.participant = participant;
+    }
+
+    /**
+     * Whether the given dialog is open.
+     * @param testId the test id to search for.
+     * @return whether the given dialog is open.
+     */
+    private boolean isDialogOpen(String testId)
+    {
+        return this.participant.getDriver().findElements(ByTestId.testId(testId)).size() > 0;
+    }
+
+    /**
+     * Whether the leave reason dialog is open.
+     * @return whether the leave reason dialog is open.
+     */
+    public boolean isLeaveReasonDialogOpen()
+    {
+        return isDialogOpen(LEAVE_REASON_ID);
+    }
+}

src/test/java/org/jitsi/meet/test/web/WebParticipant.java

@@ -104,6 +104,7 @@ public class WebParticipant extends Participant<WebDriver>
     private AVModerationMenu avModerationMenu;
     private BreakoutRoomsList breakoutRoomsList;
     private DialInNumbersPage dialInNumbersPage;
+    private Dialogs dialogs;
     private InviteDialog inviteDialog;
     private LargeVideo largeVideo;
     private LobbyScreen lobbyScreen;
@@ -682,6 +683,20 @@ public LobbyScreen getLobbyScreen()
         return lobbyScreen;
     }
 
+
+    /**
+     * @return a representation of the dialogs.
+     */
+    public Dialogs getDialogs()
+    {
+        if (dialogs == null)
+        {
+            dialogs = new Dialogs(this);
+        }
+
+        return dialogs;
+    }
+
     /**
      * @return a representation of the notifications.
      */