Skip to content

Commit 3bba3d7

Browse files
committed
ACP2E-1120: extend new statuses that can apply for new placed order with free payment
1 parent 24c9d60 commit 3bba3d7

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

app/code/Magento/Checkout/Test/Mftf/Test/AdminCheckZeroSubtotalOrderWithGeneratedInvoiceTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383

8484
<!-- Assert invoice in invoices grid -->
8585
<actionGroup ref="FilterInvoiceGridByOrderIdWithCleanFiltersActionGroup" stepKey="filterInvoiceGridByOrderId">
86-
<argument name="orderId" value="$orderNumber"/>
86+
<argument name="orderId" value="$grabOrderNumber"/>
8787
</actionGroup>
8888
<click selector="{{AdminInvoicesGridSection.firstRow}}" stepKey="opeCreatedInvoice"/>
8989
<waitForPageLoad stepKey="waitForInvoiceDetailsPageToLoad"/>

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,20 @@ protected function setUp(): void
7979
/**
8080
* @param string $orderStatus
8181
* @param string $paymentAction
82+
* @param mixed $result
8283
*
8384
* @return void
8485
* @dataProvider getConfigPaymentActionProvider
8586
*/
86-
public function testGetConfigPaymentAction($orderStatus, $paymentAction): void
87+
public function testGetConfigPaymentAction($orderStatus, $paymentAction, $result): void
8788
{
8889

8990
if ($orderStatus != 'pending') {
9091
$this->scopeConfig
9192
->method('getValue')
9293
->willReturnOnConsecutiveCalls($orderStatus, $paymentAction);
9394
}
94-
$this->assertEquals($paymentAction, $this->methodFree->getConfigPaymentAction());
95+
$this->assertEquals($result, $this->methodFree->getConfigPaymentAction());
9596
}
9697

9798
/**
@@ -149,10 +150,8 @@ public function getIsAvailableProvider(): array
149150
public function getConfigPaymentActionProvider(): array
150151
{
151152
return [
152-
['pending', null],
153-
['new', null],
154-
['processing', null],
155-
['processing', 'payment_action']
153+
['pending', 'action', null],
154+
['processing', 'payment_action', 'payment_action']
156155
];
157156
}
158157
}

0 commit comments

Comments
 (0)