Additional test + improvements

features/being_notified_about_changes_in_order.feature

@@ -36,6 +36,17 @@ Feature: Being notified about changes in order
         And I should be notified that previous order total was "$59.00"
         And I should see exactly 2 notifications
 
+    @ui
+    Scenario: Reordering previously placed order when several items is out of stock
+        Given the product "Angel T-Shirt" is out of stock
+        Given the product "Awesome Mug" is out of stock
+        When I browse my orders
+        And I click reorder button next to the order "#00000666"
+        Then I should be on my cart summary page
+        And I should be notified that products "Angel T-Shirt", "Awesome Mug" are out of stock
+        And I should be notified that previous order total was "$59.00"
+        And I should see exactly 2 notifications
+
     @ui
     Scenario: Reordering previously placed order when promotion is no longer available
         Given the promotion was disabled for the channel "Web"

src/ReorderEligibility/ReorderEligibilityConstraintMessageFormatter.php

@@ -8,19 +8,19 @@ final class ReorderEligibilityConstraintMessageFormatter implements ReorderEligi
 {
     public function format(array $messageParameters): string
     {
-        $messageParameter = '';
+        $message = '';
 
         if (count($messageParameters) === 1) {
-            $messageParameter = array_pop($messageParameters);
+            $message = array_pop($messageParameters);
         }
 
         else {
             $lastMessageParameter = end($messageParameters);
             foreach ($messageParameters as $messageParameter) {
-                $messageParameter .= $messageParameter . ($messageParameters !== $lastMessageParameter) ? ', ' : '';
+                $message .= $messageParameter . (($messageParameter !== $lastMessageParameter) ? ', ' : '');
             }
         }
 
-        return $messageParameter;
+        return $message;
     }
 }

tests/Behat/Context/Reorder/ReorderContext.php

@@ -9,15 +9,22 @@
 use Behat\Mink\Session;
 use Sylius\Component\Core\Model\AddressInterface;
 use Sylius\Component\Core\Model\PromotionInterface;
+use Sylius\CustomerReorderPlugin\ReorderEligibility\ReorderEligibilityConstraintMessageFormatterInterface;
 
 final class ReorderContext implements Context
 {
     /** @var Session */
     private $session;
 
-    public function __construct(Session $session)
-    {
+    /** @var ReorderEligibilityConstraintMessageFormatterInterface */
+    private $reorderEligibilityConstraintMessageFormatter;
+
+    public function __construct(
+        Session $session,
+        ReorderEligibilityConstraintMessageFormatterInterface $reorderEligibilityConstraintMessageFormatter
+    ) {
         $this->session = $session;
+        $this->reorderEligibilityConstraintMessageFormatter = $reorderEligibilityConstraintMessageFormatter;
     }
 
     /**
@@ -59,13 +66,14 @@ public function iClickReorderButtonNextToTheOrder(string $orderNumber): void
     }
 
     /**
-     * @Then I should be notified that product :product is out of stock
+     * @Then I should be notified that product :firstProduct is out of stock
+     * @Then I should be notified that products :firstProduct, :secondProduct are out of stock
      */
-    public function iShouldBeNotifiedThatProductIsOutOfStock(string $product): void
+    public function iShouldBeNotifiedThatProductIsOutOfStock(string ... $products): void
     {
         $this->assertFlashMessageWithTextExists(sprintf(
             'Following items: %s are out of stock. It may have affected order total.',
-            $product)
+            $this->reorderEligibilityConstraintMessageFormatter->format($products))
         );
     }
 

tests/Behat/Resources/services.xml

@@ -5,6 +5,7 @@
         <service id="sylius_customer_reorder.behat.context.setup.reorder" class="Tests\Sylius\CustomerReorderPlugin\Behat\Context\Reorder\ReorderContext" public="false">
             <argument type="service" id="sylius_customer_reorder.behat.mink.session" />
             <tag name="fob.context_service" />
+            <argument type="service" id="__symfony__.Sylius\CustomerReorderPlugin\ReorderEligibility\ReorderEligibilityConstraintMessageFormatter"/>
         </service>
         <service id="sylius_customer_reorder.behat.mink.session" class="Behat\Mink\Session" lazy="true" public="false">
             <factory service="__behat__.mink" method="getSession" />