Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix contribution page pledge tests to create valid contributions #20404

Merged
merged 1 commit into from
May 24, 2021
Merged

Fix contribution page pledge tests to create valid contributions #20404

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 19 additions & 23 deletions tests/phpunit/api/v3/ContributionPageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1752,9 +1752,7 @@ protected function setupPaymentProcessor() {
*
* @throws \CRM_Core_Exception
*/
public function testSubmitPledgePaymentPaymentProcessorRecurFuturePayment() {
// Need to work on valid financials on this test.
$this->isValidateFinancialsOnPostAssert = FALSE;
public function testSubmitPledgePaymentPaymentProcessorRecurFuturePayment(): void {
$this->params['adjust_recur_start_date'] = TRUE;
$this->params['is_pay_later'] = FALSE;
$this->setUpContributionPage();
Expand All @@ -1765,7 +1763,7 @@ public function testSubmitPledgePaymentPaymentProcessorRecurFuturePayment() {

$submitParams = [
'id' => (int) $this->_ids['contribution_page'],
'amount' => 100,
'price_' . $this->_ids['price_field'][0] => $this->_ids['price_field_value'][0],
'billing_first_name' => 'Billy',
'billing_middle_name' => 'Goat',
'billing_last_name' => 'Gruff',
Expand All @@ -1782,7 +1780,7 @@ public function testSubmitPledgePaymentPaymentProcessorRecurFuturePayment() {
'pledge_block_id' => (int) $this->_ids['pledge_block_id'],
];

$this->callAPIAndDocument('contribution_page', 'submit', $submitParams, __FUNCTION__, __FILE__, 'submit contribution page', NULL);
$this->callAPIAndDocument('contribution_page', 'submit', $submitParams, __FUNCTION__, __FILE__, 'submit contribution page');

// Check if contribution created.
$contribution = $this->callAPISuccess('contribution', 'getsingle', [
Expand All @@ -1795,26 +1793,26 @@ public function testSubmitPledgePaymentPaymentProcessorRecurFuturePayment() {

// Check if pledge created.
$pledge = $this->callAPISuccess('pledge', 'getsingle', []);
$this->assertEquals(date('Ymd', strtotime($pledge['pledge_start_date'])), date('Ymd', strtotime("+1 month")));
$this->assertEquals($pledge['pledge_amount'], 300.00);
$this->assertEquals(date('Ymd', strtotime($pledge['pledge_start_date'])), date('Ymd', strtotime('+1 month')));
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The configured value just happens to be 30 rather than 300 - change tests to match

$this->assertEquals(30.00, $pledge['pledge_amount']);

// Check if pledge payments created.
$params = [
'pledge_id' => $pledge['id'],
];
$pledgePayment = $this->callAPISuccess('pledge_payment', 'get', $params);
$this->assertEquals($pledgePayment['count'], 3);
$this->assertEquals(date('Ymd', strtotime($pledgePayment['values'][1]['scheduled_date'])), date('Ymd', strtotime("+1 month")));
$this->assertEquals($pledgePayment['values'][1]['scheduled_amount'], 100.00);
$this->assertEquals(3, $pledgePayment['count']);
$this->assertEquals(date('Ymd', strtotime($pledgePayment['values'][1]['scheduled_date'])), date('Ymd', strtotime('+1 month')));
$this->assertEquals(10.00, $pledgePayment['values'][1]['scheduled_amount']);
// Will be pending when actual payment processor is used (dummy processor does not support future payments).
$this->assertEquals($pledgePayment['values'][1]['status_id'], 1);
$this->assertEquals(1, $pledgePayment['values'][1]['status_id']);

// Check contribution recur record.
$recur = $this->callAPISuccess('contribution_recur', 'getsingle', ['id' => $contribution['contribution_recur_id']]);
$this->assertEquals(date('Ymd', strtotime($recur['start_date'])), date('Ymd', strtotime("+1 month")));
$this->assertEquals($recur['amount'], 100.00);
$this->assertEquals(date('Ymd', strtotime($recur['start_date'])), date('Ymd', strtotime('+1 month')));
$this->assertEquals(10.00, $recur['amount']);
// In progress status.
$this->assertEquals($recur['contribution_status_id'], 5);
$this->assertEquals(5, $recur['contribution_status_id']);
}

/**
Expand All @@ -1825,16 +1823,15 @@ public function testSubmitPledgePaymentPaymentProcessorRecurFuturePayment() {
* @throws \CRM_Core_Exception
*/
public function testSubmitPledgePayment(): void {
// Need to work on valid financials on this test.
$this->isValidateFinancialsOnPostAssert = FALSE;
$this->testSubmitPledgePaymentPaymentProcessorRecurFuturePayment();
$pledge = $this->callAPISuccess('pledge', 'getsingle', []);
$pledge = $this->callAPISuccess('Pledge', 'getsingle', []);
$params = [
'pledge_id' => $pledge['id'],
];
$submitParams = [
'id' => (int) $pledge['pledge_contribution_page_id'],
'pledge_amount' => [2 => 1],
'price_' . $this->_ids['price_field'][0] => $this->_ids['price_field_value'][0],
'billing_first_name' => 'Billy',
'billing_middle_name' => 'Goat',
'billing_last_name' => 'Gruff',
Expand All @@ -1847,27 +1844,26 @@ public function testSubmitPledgePayment(): void {
'pledge_id' => $pledge['id'],
'cid' => $pledge['contact_id'],
'contact_id' => $pledge['contact_id'],
'amount' => 100.00,
'is_pledge' => TRUE,
'pledge_block_id' => $this->_ids['pledge_block_id'],
];
$pledgePayment = $this->callAPISuccess('pledge_payment', 'get', $params);
$this->assertEquals(2, $pledgePayment['values'][2]['status_id']);

$this->callAPIAndDocument('contribution_page', 'submit', $submitParams, __FUNCTION__, __FILE__, 'submit contribution page', NULL);
$this->callAPIAndDocument('contribution_page', 'submit', $submitParams, __FUNCTION__, __FILE__, 'submit contribution page');

// Check if contribution created.
$contribution = $this->callAPISuccess('contribution', 'getsingle', [
$contribution = $this->callAPISuccess('Contribution', 'getsingle', [
'contribution_page_id' => $pledge['pledge_contribution_page_id'],
'contribution_status_id' => 'Completed',
'contact_id' => $pledge['contact_id'],
'contribution_recur_id' => ['IS NULL' => 1],
]);

$this->assertEquals(100.00, $contribution['total_amount']);
$pledgePayment = $this->callAPISuccess('pledge_payment', 'get', $params)['values'];
$this->assertEquals(10.00, $contribution['total_amount']);
$pledgePayment = $this->callAPISuccess('PledgePayment', 'get', $params)['values'];
$this->assertEquals(1, $pledgePayment[2]['status_id'], 'This pledge payment should have been completed');
$this->assertEquals($contribution['id'], $pledgePayment[2]['contribution_id']);
$this->assertEquals($pledgePayment[2]['contribution_id'], $contribution['id']);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eileenmcnaughton wasn't this around the right way before?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah maybe - can I fix that as a follow up?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as long as you promise to do so

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added it into #20402

}

/**
Expand Down