testing assertion helper

arti0090 · arti0090 · commit f310afdc384d · 2020-12-02T14:41:39.000+01:00
diff --git a/src/Sylius/Behat/Context/Ui/Admin/NotificationContext.php b/src/Sylius/Behat/Context/Ui/Admin/NotificationContext.php
@@ -16,46 +16,73 @@
 use Behat\Behat\Context\Context;
 use Sylius\Behat\NotificationType;
 use Sylius\Behat\Service\NotificationCheckerInterface;
+use Sylius\Behat\TestAssertionHelper;
+use Sylius\Behat\TestAssertionHelperInterface;
+use Webmozart\Assert\Assert;
 
 final class NotificationContext implements Context
 {
     /** @var NotificationCheckerInterface */
     private $notificationChecker;
 
-    public function __construct(NotificationCheckerInterface $notificationChecker)
+    /** @var TestAssertionHelperInterface */
+    private $assertionHelper;
+
+    public function __construct(NotificationCheckerInterface $notificationChecker, TestAssertionHelperInterface $assertionHelper)
     {
         $this->notificationChecker = $notificationChecker;
+        $this->assertionHelper = $assertionHelper;
     }
 
     /**
      * @Then I should be notified that it has been successfully created
      */
     public function iShouldBeNotifiedItHasBeenSuccessfullyCreated()
     {
-        $this->notificationChecker->checkNotification('has been successfully created.', NotificationType::success());
+        $this->assertionHelper->waitUntilAssertionPasses(
+            3,
+            function (): void {
+                $this->notificationChecker->checkNotification('has been successfully created.', NotificationType::success());
+            }
+        );
     }
 
     /**
      * @Then I should be notified that it has been successfully edited
      */
     public function iShouldBeNotifiedThatItHasBeenSuccessfullyEdited()
     {
-        $this->notificationChecker->checkNotification('has been successfully updated.', NotificationType::success());
+        $this->assertionHelper->waitUntilAssertionPasses(
+            3,
+            function (): void {
+                $this->notificationChecker->checkNotification('has been successfully updated.', NotificationType::success());
+            }
+        );
     }
 
     /**
      * @Then I should be notified that it has been successfully deleted
      */
     public function iShouldBeNotifiedThatItHasBeenSuccessfullyDeleted()
     {
-        $this->notificationChecker->checkNotification('has been successfully deleted.', NotificationType::success());
+        $this->assertionHelper->waitUntilAssertionPasses(
+            3,
+            function (): void {
+                $this->notificationChecker->checkNotification('has been successfully deleted.', NotificationType::success());
+            }
+        );
     }
 
     /**
      * @Then I should be notified that they have been successfully deleted
      */
     public function iShouldBeNotifiedThatTheyHaveBeenSuccessfullyDeleted()
     {
-        $this->notificationChecker->checkNotification('have been successfully deleted.', NotificationType::success());
+        $this->assertionHelper->waitUntilAssertionPasses(
+            3,
+            function (): void {
+                $this->notificationChecker->checkNotification('have been successfully deleted.', NotificationType::success());
+            }
+        );
     }
 }
diff --git a/src/Sylius/Behat/Resources/config/services.xml b/src/Sylius/Behat/Resources/config/services.xml
@@ -88,6 +88,8 @@
 
         <service id="sylius.behat.shared_storage" class="Sylius\Behat\Service\SharedStorage" public="false"/>
 
+        <service id="sylius.behat.test_assertion_helper" class="Sylius\Behat\TestAssertionHelper" />
+
         <service id="sylius.calendar" class="Sylius\Behat\Service\Provider\Calendar">
             <argument>%kernel.project_dir%</argument>
         </service>
diff --git a/src/Sylius/Behat/Resources/config/services/contexts/ui.xml b/src/Sylius/Behat/Resources/config/services/contexts/ui.xml
@@ -280,6 +280,7 @@
 
         <service id="sylius.behat.context.ui.admin.notification" class="Sylius\Behat\Context\Ui\Admin\NotificationContext">
             <argument type="service" id="sylius.behat.notification_checker" />
+            <argument type="service" id="sylius.behat.test_assertion_helper" />
         </service>
 
         <service id="sylius.behat.context.ui.admin.impersonating_customers" class="Sylius\Behat\Context\Ui\Admin\ImpersonatingCustomersContext">
diff --git a/src/Sylius/Behat/TestAssertionHelper.php b/src/Sylius/Behat/TestAssertionHelper.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Behat;
+
+final class TestAssertionHelper implements TestAssertionHelperInterface
+{
+    public function waitUntilAssertionPasses(int $timeout, callable $assertion): void
+    {
+        $start = microtime(true);
+        $end = $start + $timeout;
+
+        do {
+            try {
+                $assertion();
+            } catch (\InvalidArgumentException $exception) {
+                usleep(100000);
+
+                continue;
+            }
+
+            return;
+        } while (microtime(true) < $end);
+
+        throw new \InvalidArgumentException('Time has run out and the assertion has not passed yet.');
+    }
+}
diff --git a/src/Sylius/Behat/TestAssertionHelperInterface.php b/src/Sylius/Behat/TestAssertionHelperInterface.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Sylius\Behat;
+
+interface TestAssertionHelperInterface
+{
+    public function waitUntilAssertionPasses(int $timeout, callable $assertion): void;
+}
