woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-08-31 06:52:50 +08:00
Code Issues Projects Packages Wiki Activity Actions

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(