Merge remote-tracking branch 'origin/MAGETWO-47123' into MPI-BUGFIXES

Author: viktym

app/code/Magento/Sales/Model/Order/Payment.php

@@ -759,7 +759,7 @@ public function registerRefundNotification($amount)
             true
         )->setAutomaticallyCreated(
             true
-        )->register()->addComment(
+        )->addComment(
             __('The credit memo has been created automatically.')
         );
         $creditmemo->save();

app/code/Magento/Sales/Test/Unit/Model/Order/PaymentTest.php

@@ -20,6 +20,7 @@ class PaymentTest extends \PHPUnit_Framework_TestCase
     const TRANSACTION_ID = 'ewr34fM49V0';
 
     private $mockContext;
+    
     /**
      * @var Payment
      */
@@ -858,7 +859,6 @@ public function testUpdateOnlineTransactionApproved()
         $this->mockInvoice($this->transactionId);
         $this->mockResultTrueMethods($this->transactionId, $baseGrandTotal, $message);
 
-
         $this->orderMock->expects($this->once())
             ->method('getStoreId')
             ->willReturn($storeId);
@@ -1339,7 +1339,6 @@ public function testRegisterRefundNotification()
             ->willReturn($this->creditMemoMock);
         $this->creditMemoMock->expects($this->once())->method('setPaymentRefundDisallowed')->willReturnSelf();
         $this->creditMemoMock->expects($this->once())->method('setAutomaticallyCreated')->willReturnSelf();
-        $this->creditMemoMock->expects($this->once())->method('register')->willReturnSelf();
         $this->creditMemoMock->expects($this->once())->method('addComment')->willReturnSelf();
         $this->creditMemoMock->expects($this->once())->method('save')->willReturnSelf();
         $this->orderMock->expects($this->once())->method('getBaseCurrency')->willReturn($this->currencyMock);