mirror of
https://github.com/woocommerce/woocommerce-paypal-payments.git
synced 2025-09-05 08:59:14 +08:00
Fix merge conflicts
This commit is contained in:
commit
9055c702e7
52 changed files with 4882 additions and 1004 deletions
|
@ -28,6 +28,7 @@ use Mockery;
|
|||
use Psr\Log\LoggerInterface;
|
||||
use WooCommerce\PayPalCommerce\Subscription\Helper\SubscriptionHelper;
|
||||
use WooCommerce\PayPalCommerce\TestCase;
|
||||
use WooCommerce\PayPalCommerce\WcGateway\FraudNet\FraudNet;
|
||||
use function Brain\Monkey\Functions\expect;
|
||||
use function Brain\Monkey\Functions\when;
|
||||
|
||||
|
@ -70,6 +71,8 @@ class OrderEndpointTest extends TestCase
|
|||
$headers->shouldReceive('getAll');
|
||||
$subscription_helper = Mockery::mock(SubscriptionHelper::class);
|
||||
|
||||
$fraudnet = Mockery::mock(FraudNet::class);
|
||||
|
||||
$testee = new OrderEndpoint(
|
||||
$host,
|
||||
$bearer,
|
||||
|
@ -78,7 +81,9 @@ class OrderEndpointTest extends TestCase
|
|||
$intent,
|
||||
$logger,
|
||||
$applicationContextRepository,
|
||||
$subscription_helper
|
||||
$subscription_helper,
|
||||
false,
|
||||
$fraudnet
|
||||
);
|
||||
|
||||
$rawResponse = [
|
||||
|
@ -120,13 +125,15 @@ class OrderEndpointTest extends TestCase
|
|||
$patchCollectionFactory = Mockery::mock(PatchCollectionFactory::class);
|
||||
$intent = 'CAPTURE';
|
||||
$logger = Mockery::mock(LoggerInterface::class);
|
||||
$logger->shouldReceive('log');
|
||||
$logger->shouldReceive('warning');
|
||||
$logger->shouldReceive('debug');
|
||||
$applicationContextRepository = Mockery::mock(ApplicationContextRepository::class);
|
||||
$headers = Mockery::mock(Requests_Utility_CaseInsensitiveDictionary::class);
|
||||
$headers->shouldReceive('getAll');
|
||||
$subscription_helper = Mockery::mock(SubscriptionHelper::class);
|
||||
|
||||
$fraudnet = Mockery::mock(FraudNet::class);
|
||||
|
||||
$testee = new OrderEndpoint(
|
||||
$host,
|
||||
$bearer,
|
||||
|
@ -135,7 +142,9 @@ class OrderEndpointTest extends TestCase
|
|||
$intent,
|
||||
$logger,
|
||||
$applicationContextRepository,
|
||||
$subscription_helper
|
||||
$subscription_helper,
|
||||
false,
|
||||
$fraudnet
|
||||
);
|
||||
|
||||
$rawResponse = [
|
||||
|
@ -175,6 +184,8 @@ class OrderEndpointTest extends TestCase
|
|||
$applicationContextRepository = Mockery::mock(ApplicationContextRepository::class);
|
||||
$subscription_helper = Mockery::mock(SubscriptionHelper::class);
|
||||
|
||||
$fraudnet = Mockery::mock(FraudNet::class);
|
||||
|
||||
$testee = new OrderEndpoint(
|
||||
$host,
|
||||
$bearer,
|
||||
|
@ -183,7 +194,9 @@ class OrderEndpointTest extends TestCase
|
|||
$intent,
|
||||
$logger,
|
||||
$applicationContextRepository,
|
||||
$subscription_helper
|
||||
$subscription_helper,
|
||||
false,
|
||||
$fraudnet
|
||||
);
|
||||
|
||||
expect('wp_remote_get')->andReturn($rawResponse);
|
||||
|
@ -237,6 +250,8 @@ class OrderEndpointTest extends TestCase
|
|||
$applicationContextRepository = Mockery::mock(ApplicationContextRepository::class);
|
||||
$subscription_helper = Mockery::mock(SubscriptionHelper::class);
|
||||
|
||||
$fraudnet = Mockery::mock(FraudNet::class);
|
||||
|
||||
$testee = new OrderEndpoint(
|
||||
$host,
|
||||
$bearer,
|
||||
|
@ -245,7 +260,9 @@ class OrderEndpointTest extends TestCase
|
|||
$intent,
|
||||
$logger,
|
||||
$applicationContextRepository,
|
||||
$subscription_helper
|
||||
$subscription_helper,
|
||||
false,
|
||||
$fraudnet
|
||||
);
|
||||
|
||||
expect('wp_remote_get')
|
||||
|
@ -302,6 +319,8 @@ class OrderEndpointTest extends TestCase
|
|||
$applicationContextRepository = Mockery::mock(ApplicationContextRepository::class);
|
||||
$subscription_helper = Mockery::mock(SubscriptionHelper::class);
|
||||
|
||||
$fraudnet = Mockery::mock(FraudNet::class);
|
||||
|
||||
$testee = new OrderEndpoint(
|
||||
$host,
|
||||
$bearer,
|
||||
|
@ -310,7 +329,9 @@ class OrderEndpointTest extends TestCase
|
|||
$intent,
|
||||
$logger,
|
||||
$applicationContextRepository,
|
||||
$subscription_helper
|
||||
$subscription_helper,
|
||||
false,
|
||||
$fraudnet
|
||||
);
|
||||
|
||||
$result = $testee->capture($orderToCapture);
|
||||
|
@ -343,6 +364,8 @@ class OrderEndpointTest extends TestCase
|
|||
$applicationContextRepository = Mockery::mock(ApplicationContextRepository::class);
|
||||
$subscription_helper = Mockery::mock(SubscriptionHelper::class);
|
||||
|
||||
$fraudnet = Mockery::mock(FraudNet::class);
|
||||
|
||||
$testee = new OrderEndpoint(
|
||||
$host,
|
||||
$bearer,
|
||||
|
@ -351,7 +374,9 @@ class OrderEndpointTest extends TestCase
|
|||
$intent,
|
||||
$logger,
|
||||
$applicationContextRepository,
|
||||
$subscription_helper
|
||||
$subscription_helper,
|
||||
false,
|
||||
$fraudnet
|
||||
);
|
||||
$headers = Mockery::mock(Requests_Utility_CaseInsensitiveDictionary::class);
|
||||
$headers->shouldReceive('getAll');
|
||||
|
@ -391,6 +416,8 @@ class OrderEndpointTest extends TestCase
|
|||
$applicationContextRepository = Mockery::mock(ApplicationContextRepository::class);
|
||||
$subscription_helper = Mockery::mock(SubscriptionHelper::class);
|
||||
|
||||
$fraudnet = Mockery::mock(FraudNet::class);
|
||||
|
||||
$testee = new OrderEndpoint(
|
||||
$host,
|
||||
$bearer,
|
||||
|
@ -399,7 +426,9 @@ class OrderEndpointTest extends TestCase
|
|||
$intent,
|
||||
$logger,
|
||||
$applicationContextRepository,
|
||||
$subscription_helper
|
||||
$subscription_helper,
|
||||
false,
|
||||
$fraudnet
|
||||
);
|
||||
|
||||
$headers = Mockery::mock(Requests_Utility_CaseInsensitiveDictionary::class);
|
||||
|
@ -441,6 +470,8 @@ class OrderEndpointTest extends TestCase
|
|||
$applicationContextRepository = Mockery::mock(ApplicationContextRepository::class);
|
||||
$subscription_helper = Mockery::mock(SubscriptionHelper::class);
|
||||
|
||||
$fraudnet = Mockery::mock(FraudNet::class);
|
||||
|
||||
$testee = Mockery::mock(
|
||||
OrderEndpoint::class,
|
||||
[
|
||||
|
@ -452,6 +483,8 @@ class OrderEndpointTest extends TestCase
|
|||
$logger,
|
||||
$applicationContextRepository,
|
||||
$subscription_helper,
|
||||
false,
|
||||
$fraudnet
|
||||
]
|
||||
)->makePartial();
|
||||
$orderToExpect = Mockery::mock(Order::class);
|
||||
|
@ -517,6 +550,8 @@ class OrderEndpointTest extends TestCase
|
|||
$applicationContextRepository = Mockery::mock(ApplicationContextRepository::class);
|
||||
$subscription_helper = Mockery::mock(SubscriptionHelper::class);
|
||||
|
||||
$fraudnet = Mockery::mock(FraudNet::class);
|
||||
|
||||
$testee = Mockery::mock(
|
||||
OrderEndpoint::class,
|
||||
[
|
||||
|
@ -528,6 +563,8 @@ class OrderEndpointTest extends TestCase
|
|||
$logger,
|
||||
$applicationContextRepository,
|
||||
$subscription_helper,
|
||||
false,
|
||||
$fraudnet
|
||||
]
|
||||
)->makePartial();
|
||||
$testee
|
||||
|
@ -615,6 +652,8 @@ class OrderEndpointTest extends TestCase
|
|||
$applicationContextRepository = Mockery::mock(ApplicationContextRepository::class);
|
||||
$subscription_helper = Mockery::mock(SubscriptionHelper::class);
|
||||
|
||||
$fraudnet = Mockery::mock(FraudNet::class);
|
||||
|
||||
$testee = new OrderEndpoint(
|
||||
$host,
|
||||
$bearer,
|
||||
|
@ -623,7 +662,9 @@ class OrderEndpointTest extends TestCase
|
|||
$intent,
|
||||
$logger,
|
||||
$applicationContextRepository,
|
||||
$subscription_helper
|
||||
$subscription_helper,
|
||||
false,
|
||||
$fraudnet
|
||||
);
|
||||
|
||||
expect('wp_remote_get')
|
||||
|
@ -707,6 +748,8 @@ class OrderEndpointTest extends TestCase
|
|||
$applicationContextRepository = Mockery::mock(ApplicationContextRepository::class);
|
||||
$subscription_helper = Mockery::mock(SubscriptionHelper::class);
|
||||
|
||||
$fraudnet = Mockery::mock(FraudNet::class);
|
||||
|
||||
$testee = Mockery::mock(
|
||||
OrderEndpoint::class,
|
||||
[
|
||||
|
@ -717,7 +760,9 @@ class OrderEndpointTest extends TestCase
|
|||
$intent,
|
||||
$logger,
|
||||
$applicationContextRepository,
|
||||
$subscription_helper
|
||||
$subscription_helper,
|
||||
false,
|
||||
$fraudnet
|
||||
]
|
||||
)->makePartial();
|
||||
|
||||
|
@ -778,6 +823,8 @@ class OrderEndpointTest extends TestCase
|
|||
$applicationContextRepository = Mockery::mock(ApplicationContextRepository::class);
|
||||
$subscription_helper = Mockery::mock(SubscriptionHelper::class);
|
||||
|
||||
$fraudnet = Mockery::mock(FraudNet::class);
|
||||
|
||||
$testee = new OrderEndpoint(
|
||||
$host,
|
||||
$bearer,
|
||||
|
@ -786,7 +833,9 @@ class OrderEndpointTest extends TestCase
|
|||
$intent,
|
||||
$logger,
|
||||
$applicationContextRepository,
|
||||
$subscription_helper
|
||||
$subscription_helper,
|
||||
false,
|
||||
$fraudnet
|
||||
);
|
||||
|
||||
$result = $testee->patch_order_with($orderToUpdate, $orderToCompare);
|
||||
|
@ -838,6 +887,8 @@ class OrderEndpointTest extends TestCase
|
|||
$subscription_helper = Mockery::mock(SubscriptionHelper::class);
|
||||
$subscription_helper->shouldReceive('cart_contains_subscription')->andReturn(true);
|
||||
|
||||
$fraudnet = Mockery::mock(FraudNet::class);
|
||||
|
||||
$testee = new OrderEndpoint(
|
||||
$host,
|
||||
$bearer,
|
||||
|
@ -846,7 +897,9 @@ class OrderEndpointTest extends TestCase
|
|||
$intent,
|
||||
$logger,
|
||||
$applicationContextRepository,
|
||||
$subscription_helper
|
||||
$subscription_helper,
|
||||
false,
|
||||
$fraudnet
|
||||
);
|
||||
|
||||
$purchaseUnit = Mockery::mock(PurchaseUnit::class, ['contains_physical_goods' => false]);
|
||||
|
@ -937,6 +990,8 @@ class OrderEndpointTest extends TestCase
|
|||
$subscription_helper = Mockery::mock(SubscriptionHelper::class);
|
||||
$subscription_helper->shouldReceive('cart_contains_subscription')->andReturn(true);
|
||||
|
||||
$fraudnet = Mockery::mock(FraudNet::class);
|
||||
|
||||
$testee = new OrderEndpoint(
|
||||
$host,
|
||||
$bearer,
|
||||
|
@ -945,7 +1000,9 @@ class OrderEndpointTest extends TestCase
|
|||
$intent,
|
||||
$logger,
|
||||
$applicationContextRepository,
|
||||
$subscription_helper
|
||||
$subscription_helper,
|
||||
false,
|
||||
$fraudnet
|
||||
);
|
||||
|
||||
$purchaseUnit = Mockery::mock(PurchaseUnit::class, ['contains_physical_goods' => true]);
|
||||
|
@ -1013,6 +1070,8 @@ class OrderEndpointTest extends TestCase
|
|||
$subscription_helper = Mockery::mock(SubscriptionHelper::class);
|
||||
$subscription_helper->shouldReceive('cart_contains_subscription')->andReturn(true);
|
||||
|
||||
$fraudnet = Mockery::mock(FraudNet::class);
|
||||
|
||||
$testee = new OrderEndpoint(
|
||||
$host,
|
||||
$bearer,
|
||||
|
@ -1021,7 +1080,9 @@ class OrderEndpointTest extends TestCase
|
|||
$intent,
|
||||
$logger,
|
||||
$applicationContextRepository,
|
||||
$subscription_helper
|
||||
$subscription_helper,
|
||||
false,
|
||||
$fraudnet
|
||||
);
|
||||
|
||||
$purchaseUnit = Mockery::mock(PurchaseUnit::class, ['contains_physical_goods' => false]);
|
||||
|
@ -1100,6 +1161,8 @@ class OrderEndpointTest extends TestCase
|
|||
$subscription_helper = Mockery::mock(SubscriptionHelper::class);
|
||||
$subscription_helper->shouldReceive('cart_contains_subscription')->andReturn(true);
|
||||
|
||||
$fraudnet = Mockery::mock(FraudNet::class);
|
||||
|
||||
$testee = new OrderEndpoint(
|
||||
$host,
|
||||
$bearer,
|
||||
|
@ -1108,7 +1171,9 @@ class OrderEndpointTest extends TestCase
|
|||
$intent,
|
||||
$logger,
|
||||
$applicationContextRepository,
|
||||
$subscription_helper
|
||||
$subscription_helper,
|
||||
false,
|
||||
$fraudnet
|
||||
);
|
||||
|
||||
$purchaseUnit = Mockery::mock(PurchaseUnit::class, ['contains_physical_goods' => true]);
|
||||
|
|
|
@ -14,7 +14,7 @@ use WooCommerce\PayPalCommerce\ApiClient\Entity\Token;
|
|||
use WooCommerce\PayPalCommerce\ApiClient\Exception\PayPalApiException;
|
||||
use WooCommerce\PayPalCommerce\ApiClient\Factory\OrderFactory;
|
||||
use WooCommerce\PayPalCommerce\TestCase;
|
||||
use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayUponInvoice\FraudNet;
|
||||
use WooCommerce\PayPalCommerce\WcGateway\FraudNet\FraudNet;
|
||||
use WooCommerce\PayPalCommerce\WcGateway\Gateway\PayUponInvoice\PaymentSource;
|
||||
use function Brain\Monkey\Functions\expect;
|
||||
use function Brain\Monkey\Functions\when;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue