[Shipment] Fixes for setting shipped at date feature

GSadee · AdamKasp · commit 7aa394d5c540 · 2020-02-11T09:21:29.000+01:00
diff --git a/features/shipping/managing_shipments/setting_date_when_a_shipment_has been_shipped.feature b/features/shipping/managing_shipments/setting_date_when_a_shipment_has been_shipped.feature
diff --git a/features/shipping/managing_shipments/shipping_a_shipment_from_shipment_list.feature b/features/shipping/managing_shipments/shipping_a_shipment_from_shipment_list.feature
@@ -13,7 +13,6 @@ Feature: Shipping a shipment from shipment list
         And the customer bought a single "Apple"
         And the customer "Donald Duck" addressed it to "Elm street", "90802" "Duckburg" in the "United States" with identical billing address
         And the customer chose "UPS" shipping method with "Cash on Delivery" payment
-        And it is "20-02-2020 10:30:05" now
         And I am logged in as an administrator
 
     @ui @email
@@ -33,7 +32,7 @@ Feature: Shipping a shipment from shipment list
 
     @ui
     Scenario: Setting date when a shipment has been shipped
-        Given this order has already been shipped
+        Given it is "20-02-2020 10:30:05" now
         When I browse shipments
         And I ship the shipment of order "#00000001"
         Then I should see the shipment of order "#00000001" as "Shipped"
diff --git a/psalm.xml b/psalm.xml
@@ -44,8 +44,8 @@
             <directory name="src/Sylius/Bundle/PromotionBundle/test" />
             <directory name="src/Sylius/Bundle/PromotionBundle/Tests" />
             <directory name="src/Sylius/Bundle/ReviewBundle/spec" />
-            <directory name="src/Sylius/Bundle/ShippingBundle/test" />
             <directory name="src/Sylius/Bundle/ShippingBundle/spec" />
+            <directory name="src/Sylius/Bundle/ShippingBundle/test" />
             <directory name="src/Sylius/Bundle/ShopBundle/spec" />
             <directory name="src/Sylius/Bundle/TaxationBundle/spec" />
             <directory name="src/Sylius/Bundle/TaxationBundle/test" />
diff --git a/src/Sylius/Behat/Page/Admin/Order/ShowPage.php b/src/Sylius/Behat/Page/Admin/Order/ShowPage.php
@@ -379,7 +379,7 @@ public function resendShipmentConfirmationEmail(): void
 
     public function getShippedAtDate(): string
     {
-        return  $this->getElement('shipment_shipping_at_date')->getText();
+        return  $this->getElement('shipment_shipped_at_date')->getText();
     }
 
     protected function getDefinedElements(): array
@@ -400,7 +400,7 @@ protected function getDefinedElements(): array
             'promotion_total' => '#promotion-total',
             'resend_order_confirmation_email' => '[data-test-resend-order-confirmation-email]',
             'resend_shipment_confirmation_email' => '[data-test-resend-shipment-confirmation-email]',
-            'shipment_shipping_at_date' => '#sylius-shipments .shipped-at-date',
+            'shipment_shipped_at_date' => '#sylius-shipments .shipped-at-date',
             'shipments' => '#sylius-shipments',
             'shipping_address' => '#shipping-address',
             'shipping_adjustment_name' => '#shipping-adjustment-label',
diff --git a/src/Sylius/Behat/Resources/config/suites/ui/shipping/managing_shipments.yml b/src/Sylius/Behat/Resources/config/suites/ui/shipping/managing_shipments.yml
@@ -6,7 +6,6 @@ default:
                 - sylius.behat.context.hook.doctrine_orm
                 - sylius.behat.context.hook.email_spool
 
-                - sylius.behat.context.setup.calendar
                 - sylius.behat.context.transform.address
                 - sylius.behat.context.transform.channel
                 - sylius.behat.context.transform.country
@@ -19,14 +18,15 @@ default:
                 - sylius.behat.context.transform.zone
 
                 - sylius.behat.context.setup.admin_security
+                - sylius.behat.context.setup.calendar
                 - sylius.behat.context.setup.channel
                 - sylius.behat.context.setup.geographical
                 - sylius.behat.context.setup.order
                 - sylius.behat.context.setup.payment
                 - sylius.behat.context.setup.product
                 - sylius.behat.context.setup.shipping
                 - sylius.behat.context.setup.zone
-                
+
                 - sylius.behat.context.ui.channel
                 - sylius.behat.context.ui.email
 
diff --git a/src/Sylius/Behat/Service/Provider/Calendar.php b/src/Sylius/Behat/Service/Provider/Calendar.php
@@ -27,11 +27,14 @@ public function __construct(string $projectDirectory)
 
     public function today(): \DateTimeInterface
     {
-        /** @var resource $file */
-        $file = fopen($this->projectDirectory . '/var/temporaryDate.txt', 'r');
-        $dateTime = fgets($file);
-        fclose($file);
+        if (file_exists($this->projectDirectory . '/var/temporaryDate.txt')) {
+            $file = fopen($this->projectDirectory . '/var/temporaryDate.txt', 'r');
+            $dateTime = fgets($file);
+            fclose($file);
 
-        return new \DateTimeImmutable($dateTime);
+            return new \DateTimeImmutable($dateTime);
+        }
+
+        return new \DateTimeImmutable();
     }
 }
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_shipment.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_shipment.html.twig
@@ -15,7 +15,7 @@
             <i class="globe icon"></i>{{ shipment.method.zone }}
         </div>
         {% if shipment.shippedAt is not empty %}
-        {{ 'sylius.ui.shipped_at'|trans }}: <span class="shipped-at-date">{{ shipment.shippedAt|date('d-m-Y H:i:s') }}</span>
+            {{ 'sylius.ui.shipped_at'|trans }}: <span class="shipped-at-date">{{ shipment.shippedAt|date('d-m-Y H:i:s') }}</span>
         {% endif %}
     </div>
     {% if sm_can(shipment, 'ship', 'sylius_shipment') %}
diff --git a/src/Sylius/Bundle/ShippingBundle/spec/Assigner/ShippingDateAssignerSpec.php b/src/Sylius/Bundle/ShippingBundle/spec/Assigner/ShippingDateAssignerSpec.php
@@ -11,10 +11,9 @@
 
 declare(strict_types=1);
 
-namespace spec\Sylius\Bundle\ShippingBundle\DateAssigner;
+namespace spec\Sylius\Bundle\ShippingBundle\Assigner;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Sylius\Bundle\ShippingBundle\Assigner\ShippingDateAssignerInterface;
 use Sylius\Bundle\ShippingBundle\Provider\DateTimeProvider;
 use Sylius\Component\Shipping\Model\ShipmentInterface;
@@ -31,7 +30,7 @@ function let(DateTimeProvider $calendar): void
         $this->beConstructedWith($calendar);
     }
 
-    function it_assigns_a_shipped_at_date_to_an_shipment(ShipmentInterface $shipment, DateTimeProvider $calendar): void
+    function it_assigns_a_shipped_at_date_to_a_shipment(ShipmentInterface $shipment, DateTimeProvider $calendar): void
     {
         $calendar->today()->willReturn(new \DateTime('20-05-2019 20:20:20'));
         $shipment->setShippedAt(new \DateTime('20-05-2019 20:20:20'))->shouldBeCalled();
diff --git a/src/Sylius/Bundle/ShippingBundle/spec/Provider/CalendarSpec.php b/src/Sylius/Bundle/ShippingBundle/spec/Provider/CalendarSpec.php
@@ -11,20 +11,20 @@
 
 declare(strict_types=1);
 
-namespace Sylius\Bundle\ShippingBundle\spec\Provider;
+namespace spec\Sylius\Bundle\ShippingBundle\Provider;
 
 use PhpSpec\ObjectBehavior;
-use Sylius\Bundle\ShippingBundle\Assigner\ShippingDateAssignerInterface;
+use Sylius\Bundle\ShippingBundle\Provider\DateTimeProvider;
 
 final class CalendarSpec extends ObjectBehavior
 {
     function it_implements_a_date_time_provider(): void
     {
-        $this->shouldImplement(ShippingDateAssignerInterface::class);
+        $this->shouldImplement(DateTimeProvider::class);
     }
 
-    function it_provide_a_date(): void
+    function it_provides_a_date(): void
     {
-        $this->today()->shouldReturn(typeOf(new \DateTimeImmutable()));
+        $this->today()->shouldBeAnInstanceOf(\DateTimeImmutable::class);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,14 @@ public function __construct(string $projectDirectory)`
`27`	`27`
`28`	`28`	`public function today(): \DateTimeInterface`
`29`	`29`	`{`
`30`		`- /** @var resource $file */`
`31`		`- $file = fopen($this->projectDirectory . '/var/temporaryDate.txt', 'r');`
`32`		`- $dateTime = fgets($file);`
`33`		`- fclose($file);`
	`30`	`+ if (file_exists($this->projectDirectory . '/var/temporaryDate.txt')) {`
	`31`	`+ $file = fopen($this->projectDirectory . '/var/temporaryDate.txt', 'r');`
	`32`	`+ $dateTime = fgets($file);`
	`33`	`+ fclose($file);`
`34`	`34`
`35`		`- return new \DateTimeImmutable($dateTime);`
	`35`	`+ return new \DateTimeImmutable($dateTime);`
	`36`	`+ }`
	`37`	`+`
	`38`	`+ return new \DateTimeImmutable();`
`36`	`39`	`}`
`37`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,20 +11,20 @@`
`11`	`11`
`12`	`12`	`declare(strict_types=1);`
`13`	`13`
`14`		`-namespace Sylius\Bundle\ShippingBundle\spec\Provider;`
	`14`	`+namespace spec\Sylius\Bundle\ShippingBundle\Provider;`
`15`	`15`
`16`	`16`	`use PhpSpec\ObjectBehavior;`
`17`		`-use Sylius\Bundle\ShippingBundle\Assigner\ShippingDateAssignerInterface;`
	`17`	`+use Sylius\Bundle\ShippingBundle\Provider\DateTimeProvider;`
`18`	`18`
`19`	`19`	`final class CalendarSpec extends ObjectBehavior`
`20`	`20`	`{`
`21`	`21`	`function it_implements_a_date_time_provider(): void`
`22`	`22`	`{`
`23`		`- $this->shouldImplement(ShippingDateAssignerInterface::class);`
	`23`	`+ $this->shouldImplement(DateTimeProvider::class);`
`24`	`24`	`}`
`25`	`25`
`26`		`- function it_provide_a_date(): void`
	`26`	`+ function it_provides_a_date(): void`
`27`	`27`	`{`
`28`		`- $this->today()->shouldReturn(typeOf(new \DateTimeImmutable()));`
	`28`	`+ $this->today()->shouldBeAnInstanceOf(\DateTimeImmutable::class);`
`29`	`29`	`}`
`30`	`30`	`}`