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

Author: YevSent

app/code/Magento/Payment/Model/Method/Adapter.php

@@ -419,7 +419,7 @@ public function validate()
      */
     public function fetchTransactionInfo(InfoInterface $payment, $transactionId)
     {
-        $this->executeCommand(
+        return $this->executeCommand(
             'fetch_transaction_information',
             ['payment' => $payment, 'transactionId' => $transactionId]
         );

app/code/Magento/Payment/Test/Unit/Model/Method/AdapterTest.php

@@ -105,6 +105,45 @@ protected function setUp()
         );
     }
 
+    public function testFetchTransactionInfo()
+    {
+        $transactionId = 10555;
+        $transactionInfo = ['test_key' => 'test_value'];
+
+        $valueHandler = $this->getMockForAbstractClass(ValueHandlerInterface::class);
+        $command = $this->getMockForAbstractClass(CommandInterface::class);
+
+        /** @var  InfoInterface|MockObject $paymentInfo */
+        $paymentInfo = $this->getMockForAbstractClass(InfoInterface::class);
+        $paymentDO = $this->getMockForAbstractClass(PaymentDataObjectInterface::class);
+
+        $this->valueHandlerPool->method('get')
+            ->with('can_fetch_transaction_information')
+            ->willReturn($valueHandler);
+        $valueHandler->expects($this->atLeastOnce())
+            ->method('handle')
+            ->with(['field' => 'can_fetch_transaction_information'])
+            ->willReturn(true);
+
+        $this->paymentDataObjectFactory->method('create')
+            ->with($paymentInfo)
+            ->willReturn($paymentDO);
+
+        $this->commandPool->method('get')
+            ->with('fetch_transaction_information')
+            ->willReturn($command);
+        $command->expects($this->atLeastOnce())
+            ->method('execute')
+            ->with(['transactionId' => $transactionId, 'payment' => $paymentDO])
+            ->willReturn($transactionInfo);
+
+        $this->assertEquals(
+            $transactionInfo,
+            $this->adapter->fetchTransactionInfo($paymentInfo, $transactionId)
+        );
+
+    }
+
     /**
      * @covers \Magento\Payment\Model\Method\Adapter::isAvailable
      */