Merge branch 'MAGETWO-87832' into MPI-PR-2.2.5

Author: YevSent

app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php

@@ -5,13 +5,12 @@
  */
 namespace Magento\Paypal\Model\Payflow\Service\Request;
 
-use Magento\Framework\Math\Random;
 use Magento\Framework\DataObject;
+use Magento\Framework\Math\Random;
 use Magento\Framework\UrlInterface;
 use Magento\Paypal\Model\Payflow\Transparent;
 use Magento\Paypal\Model\Payflowpro;
 use Magento\Quote\Model\Quote;
-use Magento\Sales\Model\Order\Payment;
 
 /**
  * Class SecureToken
@@ -59,6 +58,7 @@ public function __construct(
      */
     public function requestToken(Quote $quote)
     {
+        $this->transparent->setStore($quote->getStoreId());
         $request = $this->transparent->buildBasicRequest();
 
         $request->setTrxtype(Payflowpro::TRXTYPE_AUTH_ONLY);

app/code/Magento/Paypal/Model/Payflowlink.php

@@ -12,6 +12,7 @@
 use Magento\Payment\Model\Method\ConfigInterfaceFactory;
 use Magento\Paypal\Model\Payflow\Service\Response\Handler\HandlerInterface;
 use Magento\Sales\Api\Data\OrderPaymentInterface;
+use Magento\Sales\Model\Order;
 use Magento\Sales\Model\Order\Email\Sender\OrderSender;
 
 /**
@@ -241,11 +242,13 @@ public function initialize($paymentAction, $stateObject)
             case \Magento\Paypal\Model\Config::PAYMENT_ACTION_AUTH:
             case \Magento\Paypal\Model\Config::PAYMENT_ACTION_SALE:
                 $payment = $this->getInfoInstance();
+                /** @var Order $order */
                 $order = $payment->getOrder();
                 $order->setCanSendNewEmailFlag(false);
                 $payment->setAmountAuthorized($order->getTotalDue());
                 $payment->setBaseAmountAuthorized($order->getBaseTotalDue());
                 $this->_generateSecureSilentPostHash($payment);
+                $this->setStore($order->getStoreId());
                 $request = $this->_buildTokenRequest($payment);
                 $response = $this->postRequest($request, $this->getConfig());
                 $this->_processTokenErrors($response, $payment);

app/code/Magento/Paypal/Test/Unit/Model/Payflow/Service/Request/SecureTokenTest.php

@@ -5,78 +5,93 @@
  */
 namespace Magento\Paypal\Test\Unit\Model\Payflow\Service\Request;
 
-use Magento\Framework\Math\Random;
 use Magento\Framework\DataObject;
+use Magento\Framework\Math\Random;
 use Magento\Framework\UrlInterface;
 use Magento\Paypal\Model\Payflow\Service\Request\SecureToken;
 use Magento\Paypal\Model\Payflow\Transparent;
+use Magento\Paypal\Model\PayflowConfig;
+use Magento\Quote\Model\Quote;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
 
-/**
- * Test class for \Magento\Paypal\Model\Payflow\Service\Request\SecureToken
- */
 class SecureTokenTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var SecureToken
      */
-    protected $model;
+    private $service;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|Transparent
+     * @var Transparent|MockObject
      */
-    protected $transparent;
+    private $transparent;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|Random
+     * @var Random|MockObject
      */
-    protected $mathRandom;
+    private $mathRandom;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|UrlInterface
+     * @inheritdoc
      */
-    protected $url;
-
     protected function setUp()
     {
-        $this->url = $this->createMock(\Magento\Framework\UrlInterface::class);
-        $this->mathRandom = $this->createMock(\Magento\Framework\Math\Random::class);
-        $this->transparent = $this->createMock(\Magento\Paypal\Model\Payflow\Transparent::class);
+        $url = $this->getMockForAbstractClass(UrlInterface::class);
+        $this->mathRandom = $this->getMockBuilder(Random::class)
+            ->getMock();
+        $this->transparent = $this->getMockBuilder(Transparent::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
-        $this->model = new SecureToken(
-            $this->url,
+        $this->service = new SecureToken(
+            $url,
             $this->mathRandom,
             $this->transparent
         );
     }
 
     public function testRequestToken()
     {
-        $request = new DataObject();
+        $storeId = 1;
         $secureTokenID = 'Sdj46hDokds09c8k2klaGJdKLl032ekR';
+        $response = new DataObject([
+            'result' => '0',
+            'respmsg' => 'Approved',
+            'securetoken' => '80IgSbabyj0CtBDWHZZeQN3',
+            'securetokenid' => $secureTokenID,
+            'result_code' => '0',
+        ]);
 
-        $this->transparent->expects($this->once())
-            ->method('buildBasicRequest')
-            ->willReturn($request);
-        $this->transparent->expects($this->once())
-            ->method('fillCustomerContacts');
-        $this->transparent->expects($this->once())
-            ->method('getConfig')
-            ->willReturn($this->createMock(\Magento\Paypal\Model\PayflowConfig::class));
-        $this->transparent->expects($this->once())
-            ->method('postRequest')
-            ->willReturn(new DataObject());
+        $quote = $this->getMockBuilder(Quote::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $quote->method('getStoreId')
+            ->willReturn($storeId);
 
-        $this->mathRandom->expects($this->once())
-            ->method('getUniqueHash')
-            ->willReturn($secureTokenID);
+        $this->transparent->expects(self::once())
+            ->method('setStore')
+            ->with($storeId);
 
-        $this->url->expects($this->exactly(3))
-            ->method('getUrl');
+        $this->transparent->method('buildBasicRequest')
+            ->willReturn(new DataObject());
 
-        $quote = $this->createMock(\Magento\Quote\Model\Quote::class);
+        $config = $this->getMockBuilder(PayflowConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->transparent->method('getConfig')
+            ->willReturn($config);
+        $this->transparent->method('postRequest')
+            ->with(self::callback(function ($request) use ($secureTokenID) {
+                self::assertEquals($secureTokenID, $request->getSecuretokenid(), '{Secure Token} should match.');
+                return true;
+            }))
+            ->willReturn($response);
+
+        $this->mathRandom->method('getUniqueHash')
+            ->willReturn($secureTokenID);
 
-        $this->model->requestToken($quote);
+        $actual = $this->service->requestToken($quote);
 
-        $this->assertEquals($secureTokenID, $request->getSecuretokenid());
+        self::assertEquals($secureTokenID, $actual->getSecuretokenid());
     }
 }