Katie Horn has submitted this change and it was merged.
Change subject: Fix unit tests
......................................................................
Fix unit tests
TODO: the recurring GC charge test is important, but we're skipping
for now because it makes real API calls. Rewrite to take advantage
of DonationInterface test fixtures.
Bug: T86686
Change-Id: I5edb2710b5e0c97a23c58ed984e9e37010a4c4ae
---
M sites/all/modules/recurring_globalcollect/tests/RecurringGlobalcollectTest.php
M sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
2 files changed, 8 insertions(+), 3 deletions(-)
Approvals:
Katie Horn: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalcollectTest.php
b/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalcollectTest.php
index 1e1ef58..bfeb4bc 100644
---
a/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalcollectTest.php
+++
b/sites/all/modules/recurring_globalcollect/tests/RecurringGlobalcollectTest.php
@@ -43,6 +43,9 @@
}
function testCharge() {
+ // FIXME: don't make real API calls, rely on DI test fixture responses
instead.
+ $this->markTestSkipped( 'Makes API calls.' );
+
$result = recurring_globalcollect_charge( $this->contribution_recur_id
);
$this->assertEquals( 'completed', $result['status'] );
diff --git a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
index f3125fd..999aa40 100644
--- a/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
+++ b/sites/all/modules/wmf_civicrm/tests/phpunit/ImportMessageTest.php
@@ -26,6 +26,8 @@
$this->contact_id = $api->id;
$this->recur_amount = '1.23';
+ $this->trxn_id = mt_rand();
+ $this->time = time();
$contribution_params = array(
'contact_id' => $this->contact_id,
@@ -34,13 +36,13 @@
'frequency_unit' => 'month',
'frequency_interval' => '1',
'installments' => '0',
- 'start_date' => wmf_common_date_unix_to_civicrm( time() ),
- 'create_date' => wmf_common_date_unix_to_civicrm( time() ),
+ 'start_date' => wmf_common_date_unix_to_civicrm( $this->time ),
+ 'create_date' => wmf_common_date_unix_to_civicrm( $this->time ),
'cancel_date' => null,
'processor_id' => 1,
'cycle_day' => '1',
'next_sched_contribution' => null,
- 'trxn_id' => 'RECURRING TEST_GATEWAY 123-1 ' . time(),
+ 'trxn_id' => "RECURRING TEST_GATEWAY {$this->trxn_id}-1
{$this->time}",
'version' => 3,
);
--
To view, visit https://gerrit.wikimedia.org/r/184720
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5edb2710b5e0c97a23c58ed984e9e37010a4c4ae
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: Ssmith <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
