Merge remote-tracking branch 'remotes/origin/feature/direct-flow' into feature/CMP-85_implement-elv-direct-flow

Author: Ivan Tagil

Test/Integration/Controller/RedirectTest.php

@@ -25,7 +25,6 @@ public function testDoesRedirectsToCartWhenNoOrderIsFound()
     }
 
     /**
-     *
      * @magentoDataFixture Magento/Sales/_files/order.php
      */
     public function testRedirectsToCartOnException()
@@ -51,7 +50,6 @@ public function testRedirectsToCartOnException()
     }
 
     /**
-     *
      * @magentoDataFixture Magento/Sales/_files/order.php
      */
     public function testRedirect()

Test/Integration/Service/OrderServiceTest.php

@@ -20,6 +20,7 @@
 use CM\Payments\Service\Order\Request\Part\Country;
 use CM\Payments\Service\Order\Request\Part\Currency;
 use CM\Payments\Service\Order\Request\Part\Email;
+use CM\Payments\Service\Order\Request\Part\Expiry;
 use CM\Payments\Service\Order\Request\Part\Language;
 use CM\Payments\Service\Order\Request\Part\OrderId;
 use CM\Payments\Service\Order\Request\Part\PaymentProfile;
@@ -199,6 +200,7 @@ protected function setUp(): void
                 $this->objectManager->create(PaymentProfile::class),
                 $this->objectManager->create(Email::class),
                 $this->objectManager->create(ReturnUrls::class),
+                $this->objectManager->create(Expiry::class),
             ],
             'quoteRequestParts' => [
                 $this->objectManager->create(QuoteOrderId::class),
@@ -209,6 +211,7 @@ protected function setUp(): void
                 $this->objectManager->create(QuotePaymentProfile::class),
                 $this->objectManager->create(QuoteEmail::class),
                 $this->objectManager->create(QuoteReturnUrls::class),
+                $this->objectManager->create(Expiry::class),
             ]
         ]);
 

Test/Unit/Service/OrderRequestBuilderTest.php

@@ -14,14 +14,14 @@
 use CM\Payments\Service\Order\Request\Part\Amount;
 use CM\Payments\Service\Order\Request\Part\Country;
 use CM\Payments\Service\Order\Request\Part\Currency;
+use CM\Payments\Service\Order\Request\Part\Email;
 use CM\Payments\Service\Order\Request\Part\Expiry;
 use CM\Payments\Service\Order\Request\Part\Language;
 use CM\Payments\Service\Order\Request\Part\OrderId;
 use CM\Payments\Service\Order\Request\Part\PaymentProfile;
 use CM\Payments\Service\Order\Request\Part\ReturnUrls;
-use CM\Payments\Service\Order\Request\Part\Email;
-use CM\Payments\Service\Quote\Request\Part\OrderId as QuoteOrderId;
 use CM\Payments\Service\OrderRequestBuilder;
+use CM\Payments\Service\Quote\Request\Part\OrderId as QuoteOrderId;
 use CM\Payments\Test\Unit\UnitTestCase;
 use Magento\Framework\Locale\ResolverInterface;
 use Magento\Framework\Math\Random;
@@ -57,7 +57,7 @@ public function testCreateOrderRequestBuilder()
     {
         $this->resolverMock->method('emulate')->willReturn('nl_NL');
         $this->urlMock->method('getUrl')->willReturn('testurl');
-        $orderMock = $this->getOrderMock();
+        $orderMock = $this->getOrderMock('cm_payments_creditcard');
         $orderRequest = $this->orderRequestBuilder->create($orderMock);
 
         $this->assertSame('000000001', $orderRequest->getPayload()['order_reference']);
@@ -66,10 +66,32 @@ public function testCreateOrderRequestBuilder()
         $this->assertSame('nl', $orderRequest->getPayload()['language']);
     }
 
+    public function testCreateOrderRequestBuilderWithExpiryDate()
+    {
+        $this->resolverMock->method('emulate')->willReturn('nl_NL');
+        $this->urlMock->method('getUrl')->willReturn('testurl');
+
+        $this->configMock->method('getOrderExpiryUnit')->willReturn('DAYS');
+        $this->configMock->method('getOrderExpiryDuration')->willReturn('1');
+
+        $orderMock = $this->getOrderMock('cm_payments_paypal');
+        $orderRequest = $this->orderRequestBuilder->create($orderMock);
+
+        $expectedResult = [
+            'expire_after' => [
+                'unit' => 'DAYS',
+                'duration' => '1'
+            ]
+        ];
+
+        $this->assertSame($expectedResult, $orderRequest->getPayload()['expiry']);
+    }
+
     /**
+     * @param string $paymentMethod
      * @return OrderInterface
      */
-    private function getOrderMock(): OrderInterface
+    private function getOrderMock(string $paymentMethod): OrderInterface
     {
         $shippingAddressMock = $this->createConfiguredMock(
             OrderAddressInterface::class,
@@ -82,7 +104,7 @@ private function getOrderMock(): OrderInterface
         $orderMock = $this->createMock(Order::class);
 
         $paymentMock = $this->createMock(OrderPaymentInterface::class);
-        $paymentMock->method('getMethod')->willReturn('cm_payments_creditcard');
+        $paymentMock->method('getMethod')->willReturn($paymentMethod);
 
         $orderMock->method('getEntityId')->willReturn('1');
         $orderMock->method('getIncrementId')->willReturn('000000001');
@@ -118,7 +140,7 @@ protected function setUp(): void
         $mathRandomMock = $this->getMockBuilder(Random::class)
             ->disableOriginalConstructor()
             ->getMock();
-        
+
         $orderRequestParts = [
             new OrderId(),
             new Amount(),