ACP2E-1120: extend new statuses that can apply for new placed order with free payment

Author: alzota

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

@@ -101,10 +101,10 @@ public function __construct(
     public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
     {
         return parent::isAvailable(
-                $quote
-            ) && null !== $quote && $this->priceCurrency->round(
-                $quote->getGrandTotal()
-            ) == 0;
+            $quote
+        ) && null !== $quote && $this->priceCurrency->round(
+            $quote->getGrandTotal()
+        ) == 0;
     }
 
     /**

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

@@ -18,7 +18,6 @@
 use Magento\Payment\Model\Method\Free;
 use Magento\Payment\Model\Method\Logger;
 use Magento\Quote\Model\Quote;
-use Magento\Sales\Model\Order\Config;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -43,11 +42,6 @@ class FreeTest extends TestCase
      */
     protected $currencyPrice;
 
-    /**
-     * @var MockObject
-     */
-    protected $configMock;
-
     /**
      * @inheritdoc
      */
@@ -70,8 +64,6 @@ protected function setUp(): void
             ->setConstructorArgs([$this->getMockForAbstractClass(LoggerInterface::class)])
             ->getMock();
 
-        $this->configMock = $this->createMock(Config::class);
-
         $this->methodFree = new Free(
             $context,
             $registry,
@@ -80,33 +72,26 @@ protected function setUp(): void
             $paymentData,
             $this->scopeConfig,
             $loggerMock,
-            $this->currencyPrice,
-            null,
-            null,
-            [],
-            $this->configMock
+            $this->currencyPrice
         );
     }
 
     /**
      * @param string $orderStatus
      * @param string $paymentAction
      * @param mixed $result
-     * @param array $stateStatuses
      *
      * @return void
      * @dataProvider getConfigPaymentActionProvider
      */
     public function testGetConfigPaymentAction($orderStatus, $paymentAction, $result, $stateStatuses): void
     {
-        $this->configMock
-            ->method('getStateStatuses')
-            ->with('new')
-            ->willReturn($stateStatuses);
-        $this->scopeConfig
-            ->method('getValue')
-            ->withConsecutive(['payment/free/order_status'], ['payment/free/'.$paymentAction])
-            ->willReturnOnConsecutiveCalls($orderStatus, $result);
+
+        if ($orderStatus != 'pending') {
+            $this->scopeConfig
+                ->method('getValue')
+                ->willReturnOnConsecutiveCalls($orderStatus, $result);
+        }
         $this->assertEquals($result, $this->methodFree->getConfigPaymentAction());
     }
 
@@ -165,12 +150,10 @@ public function getIsAvailableProvider(): array
     public function getConfigPaymentActionProvider(): array
     {
         return [
-            ['pending', 'payment_action', null, ['pending' => 'Pending']],
-            ['new', 'payment_action', null, ['pending' => 'Pending', 'new' => 'New']],
-            ['new', 'payment_action', 'payment_action', ['pending' => 'Pending']],
-            ['processing', 'payment_action', 'payment_action', ['pending' => 'Pending']],
-            ['processing', 'payment_action', null, ['pending' => 'Pending', 'processing' => 'Processing']],
-            ['processing', 'payment_action', 'payment_action', ['pending' => 'Pending', 'processing' => 'Processing']]
+            ['pending', 'payment_action', null],
+            ['new', 'payment_action', null],
+            ['processing', 'payment_action', null],
+            ['processing', 'payment_action', 'payment_action']
         ];
     }
 }