jenkins-bot has submitted this change and it was merged.
Change subject: New testing configuration helper for queue and database
......................................................................
New testing configuration helper for queue and database
Change-Id: Ib1b2f97d910c42287cc7deb571531b36871180c1
---
M sites/all/modules/queue2civicrm/queue2civicrm.info
A sites/all/modules/queue2civicrm/tests/data/config_queue_and_db.yaml
A
sites/all/modules/queue2civicrm/tests/includes/TestingSmashPigDbQueueConfiguration.php
M sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
M sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
5 files changed, 41 insertions(+), 4 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/sites/all/modules/queue2civicrm/queue2civicrm.info
b/sites/all/modules/queue2civicrm/queue2civicrm.info
index 8df0403..7649385 100644
--- a/sites/all/modules/queue2civicrm/queue2civicrm.info
+++ b/sites/all/modules/queue2civicrm/queue2civicrm.info
@@ -9,3 +9,4 @@
files[] = Stomp.php
files[] = tests/includes/Message.php
files[] = tests/includes/MessageSource.php
+files[] = tests/includes/TestingSmashPigDbQueueConfiguration.php
diff --git
a/sites/all/modules/queue2civicrm/tests/data/config_queue_and_db.yaml
b/sites/all/modules/queue2civicrm/tests/data/config_queue_and_db.yaml
new file mode 100644
index 0000000..73ec87f
--- /dev/null
+++ b/sites/all/modules/queue2civicrm/tests/data/config_queue_and_db.yaml
@@ -0,0 +1,22 @@
+default:
+ data-store:
+ test:
+ class: PHPQueue\Backend\PDO
+ constructor-parameters:
+ -
+ connection_string: 'sqlite::memory:'
+
+ damaged-db:
+ class: PDO
+ constructor-parameters:
+ - 'sqlite::memory:'
+
+ fredge-db:
+ class: PDO
+ constructor-parameters:
+ - 'sqlite::memory:'
+
+ pending-db:
+ class: PDO
+ constructor-parameters:
+ - 'sqlite::memory:'
diff --git
a/sites/all/modules/queue2civicrm/tests/includes/TestingSmashPigDbQueueConfiguration.php
b/sites/all/modules/queue2civicrm/tests/includes/TestingSmashPigDbQueueConfiguration.php
new file mode 100644
index 0000000..c929760
--- /dev/null
+++
b/sites/all/modules/queue2civicrm/tests/includes/TestingSmashPigDbQueueConfiguration.php
@@ -0,0 +1,16 @@
+<?php
+
+use SmashPig\Core\DataStores\PendingDatabase;
+use SmashPig\Tests\TestingConfiguration;
+
+class TestingSmashPigDbQueueConfiguration {
+ public static function instance() {
+ $config = TestingConfiguration::loadConfigWithFileOverrides(
array(
+ __DIR__ . '/../data/config_queue_and_db.yaml',
+ ) );
+
+ PendingDatabase::get()->createTable();
+
+ return $config;
+ }
+}
diff --git
a/sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
b/sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
index b87535a..5005d6a 100644
--- a/sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
+++ b/sites/all/modules/queue2civicrm/tests/phpunit/BannerHistoryTest.php
@@ -3,7 +3,6 @@
use SmashPig\Core\Context;
use SmashPig\Core\QueueConsumers\BaseQueueConsumer;
-use SmashPig\Tests\QueueTestConfiguration;
/**
* @group Queue2Civicrm
@@ -17,7 +16,7 @@
public function setUp() {
parent::setUp();
- $config = QueueTestConfiguration::instance();
+ $config = TestingSmashPigDbQueueConfiguration::instance();
Context::initWithLogger( $config );
$queue = BaseQueueConsumer::getQueue( 'test' );
$queue->createTable( 'test' );
diff --git
a/sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
b/sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
index 1e7dc17..6e2e3f5 100644
--- a/sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
+++ b/sites/all/modules/queue2civicrm/tests/phpunit/PaymentsInitQueueTest.php
@@ -2,7 +2,6 @@
use queue2civicrm\fredge\PaymentsInitQueueConsumer;
use SmashPig\Core\Context;
use SmashPig\Core\QueueConsumers\BaseQueueConsumer;
-use SmashPig\Tests\QueueTestConfiguration;
/**
* @group Queue2Civicrm
@@ -16,7 +15,7 @@
public function setUp() {
parent::setUp();
- $config = QueueTestConfiguration::instance();
+ $config = TestingSmashPigDbQueueConfiguration::instance();
Context::initWithLogger( $config );
$queue = BaseQueueConsumer::getQueue( 'test' );
$queue->createTable( 'test' );
--
To view, visit https://gerrit.wikimedia.org/r/310915
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1b2f97d910c42287cc7deb571531b36871180c1
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
Gerrit-Reviewer: Cdentinger <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
