Add count step to scenarios

Author: KamilSznajdrowicz

src/lib/Behat/BrowserContext/UserNotificationContext.php

@@ -164,4 +164,20 @@ public function iShouldSeeTextInAllNotificationsView(string $expectedMessage): v
     {
         $this->notificationsViewAllPage->verifyNoNotificationsMessage($expectedMessage);
     }
+
+    /**
+     * @Then there should be :expectedCount notification on the list
+     */
+    public function thereShouldBeNotificationsInPopup(int $expectedCount): void
+    {
+        $this->userNotificationPopup->verifyNotificationsCount($expectedCount);
+    }
+
+    /**
+     * @Then there should be :expectedCount notification in the All Notifications view
+     */
+    public function thereShouldBeNotificationsInAllNotificationsView(int $expectedCount): void
+    {
+        $this->notificationsViewAllPage->verifyNotificationsCount($expectedCount);
+    }
 }

src/lib/Behat/Component/UserNotificationPopup.php

@@ -10,6 +10,7 @@
 
 use Exception;
 use Ibexa\Behat\Browser\Component\Component;
+use Ibexa\Behat\Browser\Element\Action\MouseOverAndClick;
 use Ibexa\Behat\Browser\Element\Condition\ElementExistsCondition;
 use Ibexa\Behat\Browser\Element\Condition\ElementNotExistsCondition;
 use Ibexa\Behat\Browser\Element\Criterion\ChildElementTextCriterion;
@@ -114,26 +115,16 @@ public function openNotificationMenu(string $expectedDescription): void
                     $this->getLocator('notificationActionsPopup'),
                 )
             );
-
-        $this->getHTMLPage()
-            ->setTimeout(10)
-            ->waitUntilCondition(
-                new ElementExistsCondition(
-                    $this->getHTMLPage(),
-                    $this->getLocator('notificationMenuItemContent')
-                )
-            );
     }
 
     public function clickActionButton(string $buttonText): void
     {
-        $button = $this->getActionButton($buttonText);
-
-        if ($button === null) {
-            throw new \Exception(sprintf('Action button "%s" not found.', $buttonText));
-        }
+        $buttons = $this->getHTMLPage()
+            ->setTimeout(10)
+            ->findAll($this->getLocator('notificationMenuItemContent'))
+            ->filterBy(new ElementTextCriterion($buttonText));
 
-        $button->click();
+        $buttons->first()->execute(new MouseOverAndClick());
 
         $this->getHTMLPage()
             ->setTimeout(10)
@@ -185,6 +176,11 @@ public function clickViewAllNotificationsButton(): void
         $this->getHTMLPage()->setTimeout(3)->find($this->getLocator('viewAllNotificationsButton'))->click();
     }
 
+    public function verifyNotificationsCount(int $expectedCount): void
+    {
+        $this->getHTMLPage()->setTimeout(10)->find($this->getLocator('notificationsCount'))->assert()->textEquals('(' . $expectedCount . ')');
+    }
+
     public function verifyIsLoaded(): void
     {
         $this->getHTMLPage()
@@ -208,6 +204,7 @@ protected function specifyLocators(): array
             new VisibleCSSLocator('viewAllNotificationsButton', '.ibexa-notifications-modal__view-all-btn'),
             new VisibleCSSLocator('notificationActionsPopup', '.ibexa-notification-actions-popup-menu:not(.ibexa-popup-menu--hidden)'),
             new VisibleCSSLocator('notificationsEmptyText', '.ibexa-notifications-modal__empty-text'),
+            new VisibleCSSLocator('notificationsCount', '.ibexa-notifications-modal__count'),
         ];
     }
 }

src/lib/Behat/Page/NotificationsViewAllPage.php

@@ -15,6 +15,7 @@
 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;
 use Ibexa\Behat\Browser\Page\Page;
 use Ibexa\Behat\Browser\Routing\Router;
@@ -84,6 +85,12 @@ public function verifyNoNotificationsMessage(string $expectedMessage): void
         $this->getHTMLPage()->find($this->getLocator('notificationsEmptyText'))->assert()->textEquals($expectedMessage);
     }
 
+    public function verifyNotificationsCount(int $expectedCount): void
+    {
+        $this->getHTMLPage()->setTimeout(10)->findAll($this->getLocator('notificationsTotalCount'))
+            ->getByCriterion(new ElementAttributeCriterion('data-notifications-total', (string)$expectedCount))->assert()->isVisible();
+    }
+
     public function verifyIsLoaded(): void
     {
         $this->getHTMLPage()->setTimeout(5)->find($this->getLocator('pageTitle'))->assert()->textContains('Notifications');
@@ -111,6 +118,7 @@ protected function specifyLocators(): array
             new VisibleCSSLocator('deleteButton', '.ibexa-notification-list__btn-delete'),
             new VisibleCSSLocator('notificationCheckbox', '.ibexa-notification-list__mark-row-checkbox'),
             new VisibleCSSLocator('notificationsEmptyText', '.ibexa-table__empty-table-info-text'),
+            new VisibleCSSLocator('notificationsTotalCount', 'table[data-notifications-total]'),
         ];
     }
 }