Merge remote-tracking branch 'remotes/origin/MAGETWO-67632' into MPI-PR-Bugfixes

Author: YevSent

app/code/Magento/Paypal/Model/Api/Nvp.php

@@ -914,15 +914,15 @@ public function getIsFraudDetected()
     }
 
     /**
-     * Made additional request to paypal to get autharization id
+     * Made additional request to PayPal to get authorization id
      *
      * @return void
      */
     public function callDoReauthorization()
     {
-        $request = $this->_export($this->_doReauthorizationRequest);
+        $request = $this->_exportToRequest($this->_doReauthorizationRequest);
         $response = $this->call('DoReauthorization', $request);
-        $this->_import($response, $this->_doReauthorizationResponse);
+        $this->_importFromResponse($this->_doReauthorizationResponse, $response);
     }
 
     /**

app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php

@@ -9,6 +9,7 @@
 namespace Magento\Paypal\Test\Unit\Model\Api;
 
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Paypal\Model\Info;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -211,6 +212,42 @@ public function testCallGetExpressCheckoutDetails()
         $this->assertEquals('testSTATE', $address->getRegion());
     }
 
+    /**
+     * Tests that callDoReauthorization method is called without errors and
+     * needed data is imported from response.
+     */
+    public function testCallDoReauthorization()
+    {
+        $authorizationId = 555;
+        $paymentStatus = 'Completed';
+        $pendingReason = 'none';
+        $protectionEligibility = 'Eligible';
+        $protectionEligibilityType = 'ItemNotReceivedEligible';
+
+        $this->curl->expects($this->once())
+            ->method('read')
+            ->willReturn(
+                "\r\n" . 'ACK=Success'
+                . '&AUTHORIZATIONID=' . $authorizationId
+                . '&PAYMENTSTATUS=' . $paymentStatus
+                . '&PENDINGREASON=' . $pendingReason
+                . '&PROTECTIONELIGIBILITY=' . $protectionEligibility
+                . '&PROTECTIONELIGIBILITYTYPE=' . $protectionEligibilityType
+            );
+
+        $this->model->callDoReauthorization();
+
+        $expectedImportedData = [
+            'authorization_id' => $authorizationId,
+            'payment_status' => Info::PAYMENTSTATUS_COMPLETED,
+            'pending_reason' => $pendingReason,
+            'protection_eligibility' => $protectionEligibility
+        ];
+
+        $this->assertNotContains($protectionEligibilityType, $this->model->getData());
+        $this->assertEquals($expectedImportedData, $this->model->getData());
+    }
+
     public function testGetDebugReplacePrivateDataKeys()
     {
         $debugReplacePrivateDataKeys = $this->_invokeNvpProperty($this->model, '_debugReplacePrivateDataKeys');