jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/373690 )
Change subject: Clean up duplicate curlWrapper stuff
......................................................................
Clean up duplicate curlWrapper stuff
Change-Id: Ifedea390459b70b788f0e964d54d675b0a8e65e5
---
M PaymentProviders/Ingenico/Tests/phpunit/ApiTest.php
M PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php
M PaymentProviders/Ingenico/Tests/phpunit/IdealStatusProviderTest.php
M Tests/BaseSmashPigUnitTestCase.php
4 files changed, 2 insertions(+), 22 deletions(-)
Approvals:
Mepps: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PaymentProviders/Ingenico/Tests/phpunit/ApiTest.php
b/PaymentProviders/Ingenico/Tests/phpunit/ApiTest.php
index d956a8a..2e7df16 100644
--- a/PaymentProviders/Ingenico/Tests/phpunit/ApiTest.php
+++ b/PaymentProviders/Ingenico/Tests/phpunit/ApiTest.php
@@ -3,7 +3,6 @@
namespace SmashPig\PaymentProviders\Ingenico\Tests;
use DateTime;
-use PHPUnit_Framework_MockObject_MockObject;
use SmashPig\PaymentProviders\Ingenico\Api;
use SmashPig\PaymentProviders\Ingenico\Authenticator;
use SmashPig\Tests\BaseSmashPigUnitTestCase;
@@ -12,11 +11,6 @@
* @group Ingenico
*/
class ApiTest extends BaseSmashPigUnitTestCase {
-
- /**
- * @var PHPUnit_Framework_MockObject_MockObject
- */
- protected $curlWrapper;
/**
* @var Authenticator
diff --git
a/PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php
b/PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php
index 749f2e9..60377b8 100644
--- a/PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php
+++ b/PaymentProviders/Ingenico/Tests/phpunit/BankPaymentProviderTest.php
@@ -1,7 +1,6 @@
<?php
namespace SmashPig\PaymentProviders\Ingenico\Tests;
-use PHPUnit_Framework_MockObject_MockObject;
use Psr\Cache\CacheItemPoolInterface;
use SmashPig\Core\Cache\HashCacheItem;
use SmashPig\Core\Context;
@@ -12,11 +11,6 @@
* @group Ingenico
*/
class BankPaymentProviderTest extends BaseSmashPigUnitTestCase {
-
- /**
- * @var PHPUnit_Framework_MockObject_MockObject
- */
- protected $curlWrapper;
/**
* @var BankPaymentProvider
diff --git
a/PaymentProviders/Ingenico/Tests/phpunit/IdealStatusProviderTest.php
b/PaymentProviders/Ingenico/Tests/phpunit/IdealStatusProviderTest.php
index 7248aab..b1a6b49 100644
--- a/PaymentProviders/Ingenico/Tests/phpunit/IdealStatusProviderTest.php
+++ b/PaymentProviders/Ingenico/Tests/phpunit/IdealStatusProviderTest.php
@@ -1,10 +1,8 @@
<?php
namespace SmashPig\PaymentProviders\Ingenico\Tests;
-use PHPUnit_Framework_MockObject_MockObject;
use Psr\Cache\CacheItemPoolInterface;
use SmashPig\Core\Context;
-use SmashPig\Core\Http\CurlWrapper;
use SmashPig\PaymentProviders\Ingenico\IdealStatusProvider;
use SmashPig\Tests\BaseSmashPigUnitTestCase;
@@ -12,11 +10,6 @@
* @group Ingenico
*/
class IdealStatusProviderTest extends BaseSmashPigUnitTestCase {
-
- /**
- * @var PHPUnit_Framework_MockObject_MockObject
- */
- protected $curlWrapper;
/**
* @var IdealStatusProvider
diff --git a/Tests/BaseSmashPigUnitTestCase.php
b/Tests/BaseSmashPigUnitTestCase.php
index c6e8756..9bd861c 100644
--- a/Tests/BaseSmashPigUnitTestCase.php
+++ b/Tests/BaseSmashPigUnitTestCase.php
@@ -1,9 +1,10 @@
<?php
namespace SmashPig\Tests;
+use PHPUnit_Framework_MockObject_MockObject;
+use PHPUnit_Framework_TestCase;
use SmashPig\Core\Context;
use SmashPig\Core\Http\CurlWrapper;
-use PHPUnit_Framework_TestCase;
class BaseSmashPigUnitTestCase extends PHPUnit_Framework_TestCase {
/**
@@ -16,8 +17,6 @@
$globalConfig = TestingGlobalConfiguration::create();
TestingContext::init( $globalConfig );
$this->curlWrapper = $this->getMock(
'\SmashPig\Core\Http\CurlWrapper' );
- // TODO: create tables for all dbs/queues.
- // Standard issue CurlWrapper mock would be nice too
}
public function tearDown() {
--
To view, visit https://gerrit.wikimedia.org/r/373690
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifedea390459b70b788f0e964d54d675b0a8e65e5
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/SmashPig
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: Eileen <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: Mepps <[email protected]>
Gerrit-Reviewer: XenoRyet <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
