woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-05 08:59:14 +08:00
Code Issues Projects Packages Wiki Activity Actions 7

Fix merge conflicts

Browse source
This commit is contained in:
dinamiko 2021-10-20 15:01:53 +02:00
commit e3a793e3e5
12 changed files with 236 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/PHPUnit/ApiClient/Endpoint/OrderEndpointTest.php
View file

@ -912,6 +912,7 @@ class OrderEndpointTest extends TestCase
$purchaseUnit
->expects('to_array')
->andReturn(['singlePurchaseUnit']);
$purchaseUnit->expects('shipping')->andReturn(true);
expect('wp_remote_get')
->andReturnUsing(
@ -1014,6 +1015,7 @@ class OrderEndpointTest extends TestCase
$purchaseUnit
->expects('to_array')
->andReturn(['singlePurchaseUnit']);
$purchaseUnit->expects('shipping')->andReturn(true);
expect('wp_remote_get')
->andReturnUsing(
@ -1090,6 +1092,7 @@ class OrderEndpointTest extends TestCase
$purchaseUnit
->expects('to_array')
->andReturn(['singlePurchaseUnit']);
$purchaseUnit->expects('shipping')->andReturn(true);
expect('wp_remote_get')
->andReturnUsing(
@ -1174,6 +1177,7 @@ class OrderEndpointTest extends TestCase
$purchaseUnit
->expects('to_array')
->andReturn(['singlePurchaseUnit']);
$purchaseUnit->expects('shipping')->andReturn(true);
expect('wp_remote_get')
->andReturnUsing(

3
tests/PHPUnit/WcGateway/Gateway/WcGatewayTest.php
View file

@ -8,6 +8,9 @@ use Psr\Container\ContainerInterface;
use Psr\Log\LoggerInterface;
use WooCommerce\PayPalCommerce\ApiClient\Endpoint\OrderEndpoint;
use WooCommerce\PayPalCommerce\ApiClient\Endpoint\PaymentsEndpoint;
use Psr\Log\NullLogger;
use WooCommerce\PayPalCommerce\ApiClient\Entity\Capture;
use WooCommerce\PayPalCommerce\ApiClient\Entity\CaptureStatus;
use WooCommerce\PayPalCommerce\Onboarding\Environment;
use WooCommerce\PayPalCommerce\Onboarding\State;
use WooCommerce\PayPalCommerce\Session\SessionHandler;

3
tests/PHPUnit/WcGateway/Processor/OrderProcessorTest.php
View file

@ -159,7 +159,8 @@ class OrderProcessorTest extends TestCase
$wcOrder
->expects('update_status')
->with('on-hold', 'Awaiting payment.');
$wcOrder->expects('set_transaction_id')
->with($transactionId);
$this->assertTrue($testee->process($wcOrder));
}