Sending email after ship shipment on grid

features/shipping/managing_shipments/managing_of_shipments_status.feature

@@ -15,9 +15,10 @@ Feature: Shipping a shipment from shipment list
         And the customer chose "UPS" shipping method with "Cash on Delivery" payment
         And I am logged in as an administrator
 
-    @ui
+    @ui @email
     Scenario: Shipping a shipment from shipments index
         When I browse shipments
         And I ship the shipment of order "#00000001"
         Then I should be notified that the shipment has been successfully shipped
+        And an email with shipment's confirmation should be sent to "donald@duck.com"
         And I should see the shipment of order "#00000001" as "Shipped"

src/Sylius/Behat/Context/Ui/EmailContext.php

@@ -38,6 +38,7 @@ final class EmailContext implements Context
      * @Then it should be sent to :recipient
      * @Then the email with reset token should be sent to :recipient
      * @Then the email with contact request should be sent to :recipient
+     * @Then an email with shipment's confirmation should be sent to :email
      */
     public function anEmailShouldBeSentTo($recipient)
     {

src/Sylius/Behat/Resources/config/suites/ui/shipping/managing_shipments.yml

@@ -24,6 +24,7 @@ default:
                 - sylius.behat.context.setup.shipping
                 - sylius.behat.context.setup.zone
                 - sylius.behat.context.ui.channel
+                - sylius.behat.context.ui.email
 
                 - sylius.behat.context.ui.admin.managing_shipments
                 - sylius.behat.context.ui.shop.cart

src/Sylius/Bundle/AdminBundle/Resources/config/routing/shipment.yml

@@ -19,6 +19,8 @@ sylius_admin_shipment_ship:
     defaults:
         _controller: sylius.controller.shipment:applyStateMachineTransitionAction
         _sylius:
+            event: ship
+            section: admin
             permission: true
             state_machine:
                 graph: sylius_shipment

src/Sylius/Bundle/CoreBundle/Fixture/OrderFixture.php

@@ -299,7 +299,6 @@ class OrderFixture extends AbstractFixture
         $this->stateMachineFactory->get($order, OrderCheckoutTransitions::GRAPH)->apply($transition);
     }
 
-<<<<<<< HEAD
     private function setOrderCompletedDate(OrderInterface $order, \DateTimeInterface $date): void
     {
         if ($order->getCheckoutState() === OrderCheckoutStates::STATE_COMPLETED) {
@@ -318,7 +317,8 @@ class OrderFixture extends AbstractFixture
         sort($dates);
 
         return $dates;
-=======
+    }
+
     private function generateInvalidSkipMessage(string $type, string $channelCode): string
     {
         return sprintf(
@@ -326,6 +326,5 @@ class OrderFixture extends AbstractFixture
             "Set 'skipping_%s_step_allowed' option to true for this channel if you want to skip %s method selection.",
             $type, $channelCode, $type, $type
         );
->>>>>>> 1.5
     }
 }