Merge branch 'trunk' into PCP-195-plugin-conflict-blocking-line-it

This commit is contained in:
emilicastells 2021-08-13 16:50:35 +02:00
commit 69b46c33d4
No known key found for this signature in database
GPG key ID: 1520C07081754570
4 changed files with 16 additions and 2 deletions

View file

@ -94,7 +94,7 @@ class IdentityTokenTest extends TestCase
$this->bearer
->expects('bearer')->andReturn($token);
expect('wp_remote_get')->andReturn();
expect('wp_remote_get')->andReturn(['body' => '',]);
expect('is_wp_error')->andReturn(false);
expect('wp_remote_retrieve_response_code')->andReturn(500);
$this->logger->shouldReceive('log');

View file

@ -169,6 +169,7 @@ class WcGatewayTest extends TestCase
$subscriptionHelper = Mockery::mock(SubscriptionHelper::class);
$subscriptionHelper->shouldReceive('has_subscription')->with($orderId)->andReturn(true);
$subscriptionHelper->shouldReceive('is_subscription_change_payment')->andReturn(true);
$wcOrder->shouldReceive('update_status')->andReturn(true);
$testee = new PayPalGateway(
$settingsRenderer,