Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/317030
Change subject: Merge branch 'master' into deployment ...................................................................... Merge branch 'master' into deployment 1517d6a Fix validation, minor cleanup Change-Id: Ia0d06aa0a086dce47e6802f48d0ecfcc20254787 --- D PaymentProviders/PayPal/Tests/config_test.yaml D PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php 2 files changed, 0 insertions(+), 173 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/SmashPig refs/changes/30/317030/1 diff --git a/PaymentProviders/PayPal/Tests/config_test.yaml b/PaymentProviders/PayPal/Tests/config_test.yaml deleted file mode 100644 index 41e7931..0000000 --- a/PaymentProviders/PayPal/Tests/config_test.yaml +++ /dev/null @@ -1,47 +0,0 @@ -<<<<<<< HEAD (5db130 Merge branch 'master' into deployment) -======= -paypal: - api: - class: SmashPig\PaymentProviders\PayPal\Tests\MockPayPalPaymentsAPI - - data-store: - verified: - class: PHPQueue\Backend\PDO - constructor-parameters: - - - connection_string: 'sqlite::memory:' - queue: verified - - jobs-paypal: - class: PHPQueue\Backend\PDO - constructor-parameters: - - - connection_string: 'sqlite::memory:' - queue: jobs-paypal - - recurring: - class: PHPQueue\Backend\PDO - constructor-parameters: - - - connection_string: 'sqlite::memory:' - queue: recurring - - refund: - class: PHPQueue\Backend\PDO - constructor-parameters: - - - connection_string: 'sqlite::memory:' - queue: refund - - no-op: - class: PHPQueue\Backend\PDO - constructor-parameters: - - - connection_string: 'sqlite::memory:' - queue: no-op - - pending-db: - class: PDO - constructor-parameters: - - 'sqlite::memory:' ->>>>>>> BRANCH (1517d6 Fix validation, minor cleanup) diff --git a/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php b/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php deleted file mode 100644 index 9f7958a..0000000 --- a/PaymentProviders/PayPal/Tests/phpunit/CaptureIncomingMessageTest.php +++ /dev/null @@ -1,126 +0,0 @@ -<<<<<<< HEAD (5db130 Merge branch 'master' into deployment) -======= -<?php -namespace SmashPig\PaymentProviders\PayPal\Tests; - -use SmashPig\Core\Configuration; -use SmashPig\Core\Context; -use SmashPig\PaymentProviders\PayPal\Listener; -use SmashPig\Tests\BaseSmashPigUnitTestCase; -use SmashPig\Core\Http\Response; -use SmashPig\Core\Http\Request; -use SmashPig\Core\DataStores\KeyedOpaqueStorableObject; - -/** - * Test the IPN listener which receives messages, stores and processes them. - */ -class CaptureIncomingMessageTest extends BaseSmashPigUnitTestCase { - - /** - * @var Configuration - */ - public $config; - - static $fail_verification = false; - - // filename and the queue it should get dropped in - static $message_data = array( - 'web_accept.json' => 'verified', - 'subscr_signup.json' => 'recurring', - 'subscr_payment.json' => 'recurring', - 'refund.json' => 'refund', - // this should not actually get written to - 'chargeback_settlement.json' => 'no-op' - ); - - static $messages = array(); - - public function setUp() { - parent::setUp(); - $this->config = PayPalTestConfiguration::get(); - - // php-queue\PDO complains about pop() from non-existent table - $this->config->object( 'data-store/jobs-paypal' ) - ->createTable( 'jobs-paypal' ); - - Context::initWithLogger( $this->config ); - foreach ( self::$message_data as $file => $type ) { - self::$messages[] = array( - 'type' => $type, - 'payload' => json_decode( - file_get_contents( __DIR__ . '/../Data/' . $file ), - true - ) - ); - } - } - - private function capture( $msg ) { - $request = new Request( $msg ); - $response = new Response; - $listener = new Listener; - $listener->execute( $request, $response ); - } - - public function testCapture() { - foreach ( self::$messages as $msg ) { - - $this->capture( $msg['payload'] ); - - $jobQueue = $this->config->object( 'data-store/jobs-paypal' ); - $jobMessage = $jobQueue->pop(); - - $this->assertEquals( $jobMessage['php-message-class'], - 'SmashPig\PaymentProviders\PayPal\Job' ); - - $this->assertEquals( $jobMessage['payload'], $msg['payload'] ); - } - } - - public function testBlankMessage() { - $this->capture( array() ); - $jobQueue = $this->config->object( 'data-store/jobs-paypal' ); - $this->assertNull( $jobQueue->pop() ); - } - - public function testConsume() { - foreach ( self::$messages as $msg ) { - $this->capture( $msg['payload'] ); - - $jobQueue = $this->config->object( 'data-store/jobs-paypal' ); - $jobMessage = $jobQueue->pop(); - - $job = KeyedOpaqueStorableObject::fromJsonProxy( - $jobMessage['php-message-class'], - json_encode( $jobMessage ) - ); - - $job->execute(); - - $queue = $this->config->object( 'data-store/' . $msg['type'] ); - $queue->createTable( $msg['type'] ); - $message = $queue->pop(); - - if ( $job->is_reject() ) { - $this->assertEmpty( $message ); - } else { - $this->assertNotEmpty( $message ); - if ( isset( $message['contribution_tracking_id'] ) ) { - $this->assertEquals( $message['contribution_tracking_id'], $message['order_id'] ); - } - } - - } - } - - /** - * @expectedException \SmashPig\Core\Listeners\ListenerSecurityException - */ - public function testFailedVerification() { - self::$fail_verification = true; - $jobMessage = array( 'txn_type' => 'fail' ); - $this->capture( $jobMessage ); - } - -} ->>>>>>> BRANCH (1517d6 Fix validation, minor cleanup) -- To view, visit https://gerrit.wikimedia.org/r/317030 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia0d06aa0a086dce47e6802f48d0ecfcc20254787 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/SmashPig Gerrit-Branch: deployment Gerrit-Owner: Ejegg <eeggles...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits