Fixes after review

Author: KamilSznajdrowicz

src/lib/Behat/BrowserContext/UserNotificationContext.php

@@ -55,7 +55,7 @@ public function iGoToUserNotificationWithDetails(TableNode $notificationDetails)
     /**
      * @Then the notification appears with details:
      */
-    public function thereIsNotificationAppearsWithDetails(TableNode $notificationDetails): void
+    public function notificationAppearsWithDetails(TableNode $notificationDetails): void
     {
         $type = $notificationDetails->getHash()[0]['Type'];
         $author = $notificationDetails->getHash()[0]['Author'];
@@ -75,34 +75,34 @@ public function iOpenNotificationMenu(string $description): void
     }
 
     /**
-     * @When I click :action action
+     * @When I perform the :action action on the notification
      */
-    public function iClickActionButton(string $action): void
+    public function iPerformNotificationAction(string $action): void
     {
         $this->userNotificationPopup->clickActionButton($action);
     }
 
     /**
-     * @Then the notification action should be :expectedAction
+     * @Then the notification should have :expectedAction action available
      */
     public function verifyNotificationAction(string $expectedAction): void
     {
-        $this->userNotificationPopup->getActionButton($expectedAction);
+        $this->userNotificationPopup->findActionButton($expectedAction);
     }
 
     /**
-     * @When I click mark all as read button
+     * @When I mark all notifications as read
      */
-    public function iClickButton(): void
+    public function markAllNotificationsAsRead(): void
     {
         $this->userNotificationPopup->verifyIsLoaded();
         $this->userNotificationPopup->clickOnMarkAllAsReadButton();
     }
 
     /**
-     * @When I click view all notifications button
+     * @When I go to the list of all notifications
      */
-    public function iClickViewAllNotificationsButton(): void
+    public function goToAllNotificationsList(): void
     {
         $this->userNotificationPopup->verifyIsLoaded();
         $this->userNotificationPopup->clickViewAllNotificationsButton();
@@ -150,31 +150,31 @@ public function iDeleteNotification(string $notificationTitle): void
     }
 
     /**
-     * @Then I should see the text :text in the notifications popup
+     * @Then an empty notifications state in the popup should be visible
      */
-    public function iShouldSeeTextInNotificationsPopup(string $expectedMessage): void
+    public function emptyNotificationsStateInPopup(): void
     {
-        $this->userNotificationPopup->verifyNoNotificationsMessage($expectedMessage);
+        $this->userNotificationPopup->assertEmptyStateVisible();
     }
 
     /**
-     * @Then I should see the text :text in the All Notifications view
+     * @Then an empty notifications state should be visible in the All Notifications view
      */
-    public function iShouldSeeTextInAllNotificationsView(string $expectedMessage): void
+    public function emptyNotificationsStateInAllNotificationsView(): void
     {
-        $this->notificationsViewAllPage->verifyNoNotificationsMessage($expectedMessage);
+        $this->notificationsViewAllPage->assertEmptyStateVisible();
     }
 
     /**
-     * @Then the notifications popup should contain :expectedCount notification
+     * @Then the notifications popup counter should display :expectedCount
      */
-    public function thereShouldBeNotificationsInPopup(int $expectedCount): void
+    public function iShouldSeeNotificationsCountInPopup(int $expectedCount): void
     {
         $this->userNotificationPopup->verifyNotificationsCount($expectedCount);
     }
 
     /**
-     * @Then there should be :expectedCount notification in the All Notifications view
+     * @Then I should see :expectedCount notifications in the All Notifications view
      */
     public function thereShouldBeNotificationsInAllNotificationsView(int $expectedCount): void
     {

src/lib/Behat/Component/UserNotificationPopup.php

@@ -64,12 +64,12 @@ public function verifyNotification(string $expectedType, string $expectedAuthor,
 
             foreach ($criteria as $criterion) {
                 if (!$criterion->matches($notification)) {
-                    continue 2; // go to next notification
+                    continue 2;
                 }
             }
 
             if ($shouldExist) {
-                return; // matching notification found
+                return;
             } else {
                 throw new \Exception(sprintf(
                     'Notification of type "%s" with author "%s" and description "%s" should not exist, but was found.',
@@ -92,20 +92,9 @@ public function verifyNotification(string $expectedType, string $expectedAuthor,
 
     public function openNotificationMenu(string $expectedDescription): void
     {
-        $this->getHTMLPage()
-            ->setTimeout(10)
-            ->waitUntilCondition(
-                new ElementExistsCondition(
-                    $this->getHTMLPage(),
-                    $this->getLocator('notificationDescriptionText')
-                )
-            );
-
-        $notifications = $this->getHTMLPage()->setTimeout(5)->findAll($this->getLocator('notificationItem'))
-            ->filterBy(new ChildElementTextCriterion($this->getLocator('notificationDescriptionText'), $expectedDescription));
-
-        $menuButton = $notifications->first()->find($this->getLocator('notificationMenuButton'));
-        $menuButton->click();
+        $this->getHTMLPage()->setTimeout(5)->findAll($this->getLocator('notificationItem'))
+            ->filterBy(new ChildElementTextCriterion($this->getLocator('notificationDescriptionText'), $expectedDescription))
+            ->first()->find($this->getLocator('notificationMenuButton'))->click();
 
         $this->getHTMLPage()
             ->setTimeout(10)
@@ -119,12 +108,10 @@ public function openNotificationMenu(string $expectedDescription): void
 
     public function clickActionButton(string $buttonText): void
     {
-        $buttons = $this->getHTMLPage()
+        $this->getHTMLPage()
             ->setTimeout(10)
             ->findAll($this->getLocator('notificationMenuItemContent'))
-            ->filterBy(new ElementTextCriterion($buttonText));
-
-        $buttons->first()->execute(new MouseOverAndClick());
+            ->filterBy(new ElementTextCriterion($buttonText))->first()->execute(new MouseOverAndClick());
 
         $this->getHTMLPage()
             ->setTimeout(10)
@@ -136,7 +123,7 @@ public function clickActionButton(string $buttonText): void
             );
     }
 
-    public function getActionButton(string $buttonText): ?ElementInterface
+    public function findActionButton(string $buttonText): ?ElementInterface
     {
         $this->getHTMLPage()
             ->setTimeout(10)
@@ -154,16 +141,9 @@ public function getActionButton(string $buttonText): ?ElementInterface
             ->first();
     }
 
-    public function verifyNoNotificationsMessage(string $expectedMessage): void
+    public function assertEmptyStateVisible(): void
     {
-        $this->getHTMLPage()->setTimeout(20)->waitUntilCondition(
-            new ElementExistsCondition(
-                $this->getHTMLPage(),
-                $this->getLocator('notificationsEmptyText')
-            )
-        );
-
-        $this->getHTMLPage()->find($this->getLocator('notificationsEmptyText'))->assert()->textEquals($expectedMessage);
+        $this->getHTMLPage()->setTimeout(5)->find($this->getLocator('notificationsEmptyText'))->assert()->isVisible();
     }
 
     public function clickOnMarkAllAsReadButton(): void

src/lib/Behat/Page/NotificationsViewAllPage.php

@@ -13,7 +13,6 @@
 use Ibexa\AdminUi\Behat\Component\Dialog;
 use Ibexa\AdminUi\Behat\Component\Table\TableBuilder;
 use Ibexa\AdminUi\Behat\Component\Table\TableInterface;
-use Ibexa\Behat\Browser\Element\Condition\ElementExistsCondition;
 use Ibexa\Behat\Browser\Element\Criterion\ChildElementTextCriterion;
 use Ibexa\Behat\Browser\Element\Criterion\ElementAttributeCriterion;
 use Ibexa\Behat\Browser\Locator\VisibleCSSLocator;
@@ -73,16 +72,9 @@ public function getStatusForNotification(string $notificationTitle): string
             ->find($this->getLocator('rowStatus'))->getText();
     }
 
-    public function verifyNoNotificationsMessage(string $expectedMessage): void
+    public function assertEmptyStateVisible(): void
     {
-        $this->getHTMLPage()->setTimeout(10)->waitUntilCondition(
-            new ElementExistsCondition(
-                $this->getHTMLPage(),
-                $this->getLocator('notificationsEmptyText')
-            )
-        );
-
-        $this->getHTMLPage()->find($this->getLocator('notificationsEmptyText'))->assert()->textEquals($expectedMessage);
+        $this->getHTMLPage()->setTimeout(5)->find($this->getLocator('notificationsEmptyText'))->assert()->isVisible();
     }
 
     public function verifyNotificationsCount(int $expectedCount): void