Merge remote-tracking branch 'origin/MAGETWO-43331' into MAGETWO-43348

dkvashninbay · dkvashninbay · commit 8fd3a454e5b6 · 2015-09-30T17:11:07.000+03:00
diff --git a/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php b/app/code/Magento/Paypal/Controller/Transparent/RequestSecureToken.php
@@ -6,12 +6,14 @@
 namespace Magento\Paypal\Controller\Transparent;
 
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\Controller\Result\Json;
 use Magento\Framework\Controller\Result\JsonFactory;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\Session\Generic;
 use Magento\Framework\Session\SessionManager;
 use Magento\Paypal\Model\Payflow\Service\Request\SecureToken;
 use Magento\Paypal\Model\Payflow\Transparent;
+use Magento\Quote\Model\Quote;
 
 /**
  * Class RequestSecureToken
@@ -76,19 +78,43 @@ public function __construct(
      */
     public function execute()
     {
-        $this->sessionTransparent->setQuoteId($this->sessionManager->getQuote()->getId());
+        /** @var Quote $quote */
+        $quote = $this->sessionManager->getQuote();
 
-        $token = $this->secureTokenService->requestToken($this->sessionManager->getQuote());
+        if (!$quote or !$quote instanceof Quote) {
+            return $this->getErrorResponse();
+        }
 
-        $result = [];
-        $result[$this->transparent->getCode()]['fields'] = $token->getData();
-        $result['success'] = $token->getSecuretoken() ? true : false;
+        $this->sessionTransparent->setQuoteId($quote->getId());
+        try {
+            $token = $this->secureTokenService->requestToken($quote);
+            if (!$token->getData('securetoken')) {
+                throw new \LogicException();
+            }
 
-        if (!$result['success']) {
-            $result['error'] = true;
-            $result['error_messages'] = __('Secure Token Error. Try again.');
+            return $this->resultJsonFactory->create()->setData(
+                [
+                    $this->transparent->getCode() => ['fields' => $token->getData()],
+                    'success' => true,
+                    'error' => false
+                ]
+            );
+        } catch (\Exception $e) {
+            return $this->getErrorResponse();
         }
+    }
 
-        return $this->resultJsonFactory->create()->setData($result);
+    /**
+     * @return Json
+     */
+    private function getErrorResponse()
+    {
+        return $this->resultJsonFactory->create()->setData(
+            [
+                'success' => false,
+                'error' => true,
+                'error_messages' => __('Your payment has been declined. Please try again.')
+            ]
+        );
     }
 }
diff --git a/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php b/app/code/Magento/Paypal/Model/Payflow/Service/Request/SecureToken.php
@@ -54,7 +54,8 @@ public function __construct(
      *
      * @param Quote $quote
      *
-     * @return Object
+     * @return DataObject
+     * @throws \Exception
      */
     public function requestToken(Quote $quote)
     {
diff --git a/app/code/Magento/Paypal/Model/Payflowpro.php b/app/code/Magento/Paypal/Model/Payflowpro.php
@@ -608,7 +608,7 @@ protected function _buildPlaceRequest(DataObject $payment, $amount)
     /**
      * Return request object with basic information for gateway request
      *
-     * @return Object
+     * @return DataObject
      */
     public function buildBasicRequest()
     {
diff --git a/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php b/app/code/Magento/Paypal/Test/Unit/Controller/Transparent/RequestSecureTokenTest.php
@@ -98,32 +98,29 @@ protected function setUp()
         );
     }
 
-    /**
-     * Run test execute method
-     *
-     * @param array $result
-     * @param array $resultExpectation
-     *
-     * @dataProvider executeDataProvider
-     */
-    public function testExecute(array $result, array $resultExpectation)
+    public function testExecuteSuccess()
     {
         $quoteId = 99;
+        $tokenFields = ['fields-1', 'fields-2', 'fields-3'];
+        $secureToken = 'token_hash';
+        $resultExpectation = [
+            'transparent' => [
+                'fields' => ['fields-1', 'fields-2', 'fields-3']
+            ],
+            'success' => true,
+            'error' => false
+        ];
 
         $quoteMock = $this->getMockBuilder('Magento\Quote\Model\Quote')
             ->disableOriginalConstructor()
             ->getMock();
         $tokenMock = $this->getMockBuilder('Magento\Framework\DataObject')
-            ->setMethods(['getData', 'getSecuretoken'])
             ->disableOriginalConstructor()
             ->getMock();
         $jsonMock = $this->getMockBuilder('Magento\Framework\Controller\Result\Json')
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->transparentMock->expects($this->once())
-            ->method('getCode')
-            ->willReturn('transparent');
         $this->sessionManagerMock->expects($this->atLeastOnce())
             ->method('getQuote')
             ->willReturn($quoteMock);
@@ -140,12 +137,14 @@ public function testExecute(array $result, array $resultExpectation)
         $this->transparentMock->expects($this->once())
             ->method('getCode')
             ->willReturn('transparent');
-        $tokenMock->expects($this->once())
+        $tokenMock->expects($this->atLeastOnce())
             ->method('getData')
-            ->willReturn($result['transparent']['fields']);
-        $tokenMock->expects($this->once())
-            ->method('getSecuretoken')
-            ->willReturn($result['success']);
+            ->willReturnMap(
+                [
+                    ['', null, $tokenFields],
+                    ['securetoken', null, $secureToken]
+                ]
+            );
         $this->resultJsonFactoryMock->expects($this->once())
             ->method('create')
             ->willReturn($jsonMock);
@@ -157,42 +156,71 @@ public function testExecute(array $result, array $resultExpectation)
         $this->assertEquals($jsonMock, $this->controller->execute());
     }
 
-    /**
-     * @return array
-     */
-    public function executeDataProvider()
+    public function testExecuteTokenRequestException()
     {
-        return [
-            [
-                'result' => [
-                    'transparent' => [
-                        'fields' => ['fields-1', 'fields-2', 'fields-3']
-                    ],
-                    'success' => 1
-                ],
-                'result_expectation' => [
-                    'transparent' => [
-                        'fields' => ['fields-1', 'fields-2', 'fields-3']
-                    ],
-                    'success' => true
-                ]
-            ],
-            [
-                'result' => [
-                    'transparent' => [
-                        'fields' => ['fields-1', 'fields-2', 'fields-3']
-                    ],
-                    'success' => null,
-                ],
-                'result_expectation' => [
-                    'transparent' => [
-                        'fields' => ['fields-1', 'fields-2', 'fields-3']
-                    ],
-                    'success' => false,
-                    'error' => true,
-                    'error_messages' => __('Secure Token Error. Try again.')
-                ]
-            ]
+        $quoteId = 99;
+        $resultExpectation = [
+            'success' => false,
+            'error' => true,
+            'error_messages' => __('Your payment has been declined. Please try again.')
         ];
+
+        $quoteMock = $this->getMockBuilder('Magento\Quote\Model\Quote')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $jsonMock = $this->getMockBuilder('Magento\Framework\Controller\Result\Json')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->sessionManagerMock->expects($this->atLeastOnce())
+            ->method('getQuote')
+            ->willReturn($quoteMock);
+        $quoteMock->expects($this->once())
+            ->method('getId')
+            ->willReturn($quoteId);
+        $this->sessionTransparentMock->expects($this->once())
+            ->method('setQuoteId')
+            ->with($quoteId);
+        $this->secureTokenServiceMock->expects($this->once())
+            ->method('requestToken')
+            ->with($quoteMock)
+            ->willThrowException(new \Exception());
+        $this->resultJsonFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($jsonMock);
+        $jsonMock->expects($this->once())
+            ->method('setData')
+            ->with($resultExpectation)
+            ->willReturnSelf();
+
+        $this->assertEquals($jsonMock, $this->controller->execute());
     }
+
+    public function testExecuteEmptyQuoteError()
+    {
+        $resultExpectation = [
+            'success' => false,
+            'error' => true,
+            'error_messages' => __('Your payment has been declined. Please try again.')
+        ];
+
+        $quoteMock = null;
+        $jsonMock = $this->getMockBuilder('Magento\Framework\Controller\Result\Json')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->sessionManagerMock->expects($this->atLeastOnce())
+            ->method('getQuote')
+            ->willReturn($quoteMock);
+        $this->resultJsonFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($jsonMock);
+        $jsonMock->expects($this->once())
+            ->method('setData')
+            ->with($resultExpectation)
+            ->willReturnSelf();
+
+        $this->assertEquals($jsonMock, $this->controller->execute());
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@ public function __construct(`
`54`	`54`	`*`
`55`	`55`	`* @param Quote $quote`
`56`	`56`	`*`
`57`		`- * @return Object`
	`57`	`+ * @return DataObject`
	`58`	`+ * @throws \Exception`
`58`	`59`	`*/`
`59`	`60`	`public function requestToken(Quote $quote)`
`60`	`61`	`{`
Original file line number	Diff line number	Diff line change
`@@ -608,7 +608,7 @@ protected function _buildPlaceRequest(DataObject $payment, $amount)`
`608`	`608`	`/**`
`609`	`609`	`* Return request object with basic information for gateway request`
`610`	`610`	`*`
`611`		`- * @return Object`
	`611`	`+ * @return DataObject`
`612`	`612`	`*/`
`613`	`613`	`public function buildBasicRequest()`
`614`	`614`	`{`