Merge branch 'ACP2E-2841' of https://github.com/adobe-commerce-tier-4/magento2ce into 2.4-develop

Author: thiaramus

app/code/Magento/Paypal/Model/Payflow/Transparent.php

@@ -389,20 +389,6 @@ public function denyPayment(InfoInterface $payment)
         return true;
     }
 
-    /**
-     * @inheritDoc
-     */
-    public function fetchTransactionInfo(InfoInterface $payment, $transactionId)
-    {
-        $result = parent::fetchTransactionInfo($payment, $transactionId);
-        $this->_canFetchTransactionInfo = false;
-        if ($payment->getIsTransactionApproved()) {
-            $this->acceptPayment($payment);
-        }
-
-        return $result;
-    }
-
     /**
      * Marks payment as fraudulent.
      *

app/code/Magento/Paypal/Test/Unit/Model/Payflow/TransparentTest.php

@@ -125,15 +125,21 @@ public function testCaptureCorrectId(string $parentTransactionId)
         $gatewayToken = 'gateway_token';
         $this->payment->expects($this->once())->method('getParentTransactionId')->willReturn($parentTransactionId);
         $this->payment->expects($this->exactly($setParentTransactionIdCalls))->method('setParentTransactionId');
-        $this->payment->expects($this->exactly($setAdditionalInformationCalls))->method('setAdditionalInformation')->with(Payflowpro::PNREF, $gatewayToken);
+        $this->payment->expects($this->exactly($setAdditionalInformationCalls))
+            ->method('setAdditionalInformation')
+            ->with(Payflowpro::PNREF, $gatewayToken);
         $this->payment->expects($this->exactly(4))->method('getAdditionalInformation')->withConsecutive(
             ['result_code'],
             [Payflowpro::PNREF],
             [Payflowpro::PNREF],
             [Payflowpro::PNREF],
         )->willReturn(0, '', Payflowpro::PNREF, Payflowpro::PNREF);
-        $this->paymentExtensionAttributes->expects($this->once())->method('getVaultPaymentToken')->willReturn($this->paymentToken);
-        $this->paymentToken->expects($this->exactly($getGatewayTokenCalls))->method('getGatewayToken')->willReturn($gatewayToken);
+        $this->paymentExtensionAttributes->expects($this->once())
+            ->method('getVaultPaymentToken')
+            ->willReturn($this->paymentToken);
+        $this->paymentToken->expects($this->exactly($getGatewayTokenCalls))
+            ->method('getGatewayToken')
+            ->willReturn($gatewayToken);
 
         $this->subject->capture($this->payment, 100);
     }
@@ -235,7 +241,7 @@ private function getPaymentConfigInterfaceFactory()
             ->disableOriginalConstructor()
             ->getMock();
         $this->paymentConfig = $this->getMockBuilder(PaymentConfigInterface::class)
-            ->setMethods(['setStoreId', 'setMethodInstance', 'setMethod', 'getBuildNotationCode'])
+            ->addMethods(['setStoreId', 'setMethodInstance', 'setMethod', 'getBuildNotationCode', 'getPaymentAction'])
             ->getMockForAbstractClass();
 
         $paymentConfigInterfaceFactory->method('create')->willReturn($this->paymentConfig);
@@ -345,6 +351,23 @@ private function initPayment()
     {
         $this->payment = $this->getMockBuilder(Payment::class)
             ->disableOriginalConstructor()
+            ->addMethods(['getIsTransactionApproved'])
+            ->onlyMethods(
+                [
+                    'setTransactionId',
+                    'setIsTransactionClosed',
+                    'getCcExpYear',
+                    'getCcExpMonth',
+                    'getExtensionAttributes',
+                    'getOrder',
+                    'authorize',
+                    'canFetchTransactionInfo',
+                    'getParentTransactionId',
+                    'setParentTransactionId',
+                    'setAdditionalInformation',
+                    'getAdditionalInformation'
+                ]
+            )
             ->getMock();
         $this->order = $this->getMockBuilder(Order::class)
             ->disableOriginalConstructor()
@@ -360,7 +383,16 @@ private function initPayment()
         $this->payment->method('getCcExpYear')->willReturn('2019');
         $this->payment->method('getCcExpMonth')->willReturn('05');
         $this->payment->method('getExtensionAttributes')->willReturn($this->paymentExtensionAttributes);
+        $this->payment->method('getIsTransactionApproved')->willReturn(true);
 
         return $this->payment;
     }
+
+    public function testFetchTransactionInfo()
+    {
+        $this->payment->method('canFetchTransactionInfo')->willReturn(false);
+        $this->paymentConfig->method('getPaymentAction')->willReturn('authorize');
+        $this->payment->expects($this->never())->method('authorize');
+        $this->subject->fetchTransactionInfo($this->payment, '123');
+    }
 }