From: eileenmcnaughton Date: Sat, 13 Jun 2015 20:13:55 +0000 (+0000) Subject: add extra tests to submit functions X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=55e55e846ff23f8c2039c75a5d6bfb3730533d1b;p=civicrm-core.git add extra tests to submit functions --- diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php index 2177d6ed58..1dda69199f 100644 --- a/CRM/Contribute/Form/Contribution.php +++ b/CRM/Contribute/Form/Contribution.php @@ -1362,6 +1362,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP $existingContribution = civicrm_api3('contribution', 'getsingle', array( 'id' => $params['id'], )); + $this->_id = $params['id']; } else { $existingContribution = array(); diff --git a/api/v3/FinancialTrxn.php b/api/v3/FinancialTrxn.php new file mode 100644 index 0000000000..9375c81298 --- /dev/null +++ b/api/v3/FinancialTrxn.php @@ -0,0 +1,67 @@ +assertEquals($note['note'], 'Super cool and interesting stuff'); } + /** + * Test the submit function on the contribution page. + */ + public function testSubmitUpdate() { + $form = new CRM_Contribute_Form_Contribution(); + + $form->testSubmit(array( + 'total_amount' => 50, + 'financial_type_id' => 1, + 'receive_date' => '04/21/2015', + 'receive_date_time' => '11:27PM', + 'contact_id' => $this->_individualId, + 'payment_instrument_id' => array_search('Check', $this->paymentInstruments), + 'contribution_status_id' => 1, + 'price_set_id' => 0, + ), + CRM_Core_Action::ADD); + $contribution = $this->callAPISuccessGetSingle('Contribution', array('contact_id' => $this->_individualId)); + $form->testSubmit(array( + 'total_amount' => 45, + 'net_amount' => 45, + 'financial_type_id' => 1, + 'receive_date' => '04/21/2015', + 'receive_date_time' => '11:27PM', + 'contact_id' => $this->_individualId, + 'payment_instrument_id' => array_search('Check', $this->paymentInstruments), + 'contribution_status_id' => 1, + 'price_set_id' => 0, + 'id' => $contribution['id'], + ), + CRM_Core_Action::UPDATE); + $this->callAPISuccessGetCount('Contribution', array('contact_id' => $this->_individualId), 1); + $financialTransactions = $this->callAPISuccess('FinancialTrxn', 'get', array('sequential' => TRUE)); + $this->assertEquals(2, $financialTransactions['count']); + $this->assertEquals(50, $financialTransactions['values'][0]['total_amount']); + $this->assertEquals(45, $financialTransactions['values'][1]['total_amount']); + $lineItem = $this->callAPISuccessGetSingle('LineItem', array()); + $this->assertEquals(45, $lineItem['line_total']); + } + + /** * Get parameters for credit card submit calls. * diff --git a/tests/phpunit/CRM/Member/Form/MembershipTest.php b/tests/phpunit/CRM/Member/Form/MembershipTest.php index 5632513b14..1a9b69f639 100644 --- a/tests/phpunit/CRM/Member/Form/MembershipTest.php +++ b/tests/phpunit/CRM/Member/Form/MembershipTest.php @@ -453,9 +453,8 @@ class CRM_Member_Form_MembershipTest extends CiviUnitTestCase { 'billing_country_id-5' => '1228', ); $form->submit($params); - // TODO: This will still fail right now. - //$this->callAPISuccessGetCount('Membership', array('contact_id' => $this->_individualId), 1); + $this->callAPISuccessGetCount('Membership', array('contact_id' => $this->_individualId), 1); } } -// class CRM_Member_Form_MembershipTest +