Fix ContributionTest

fuzionnz · Jun 13, 2013 · 5319181 · 5319181
1 parent 0376409
commit 5319181
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/api/v3/Contribution.php b/api/v3/Contribution.php
@@ -94,6 +94,7 @@ function civicrm_api3_contribution_create(&$params) {
 function _civicrm_api3_contribution_create_spec(&$params) {
   $params['contact_id']['api.required'] = 1;
   $params['total_amount']['api.required'] = 1;
+  $params['payment_instrument_id']['api.aliases'] = array('payment_instrument');
   $params['payment_processor'] = array(
     'name' => 'payment_processor',
     'title' => 'Payment Processor ID',

diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php
@@ -543,20 +543,26 @@ function testCreateContributionOffline() {
    */
   function testCreateContributionWithPaymentInstrument() {
     $params = $this->_params + array('payment_instrument' => 'EFT');
-    $contribution =  civicrm_api('contribution','create',$params);
-    $contribution = civicrm_api('contribution','get',array('version'=> 3, 'sequential' => 1, 'id' => $contribution['id']));
+    $contribution = $this->callAPISuccess('contribution', 'create', $params);
+    $contribution = $this->callAPISuccess('contribution','get', array(
+      'sequential' => 1,
+      'id' => $contribution['id']
+    ));
     $this->assertArrayHasKey('payment_instrument', $contribution['values'][0]);
-    $eftTypeId = CRM_Core_OptionGroup::getValue('payment_instrument', 'EFT');
-    $this->assertEquals('EFT',$contribution['values'][0]['payment_instrument']);
-    $contribution = civicrm_api('contribution', 'update', array('id' => $contribution['id'], 'version' => $this->_apiversion, 'payment_instrument' => 'Credit Card'));
-    $this->assertAPISuccess($contribution);
+    $this->assertEquals('EFT', $contribution['values'][0]['payment_instrument']);
+
+    $this->callAPISuccess('contribution', 'create', array('id' => $contribution['id'], 'payment_instrument' => 'Credit Card'));
+    $contribution = $this->callAPISuccess('contribution','get', array(
+      'sequential' => 1,
+      'id' => $contribution['id']
+    ));
+    $this->assertArrayHasKey('payment_instrument', $contribution['values'][0]);
+    $this->assertEquals('Credit Card', $contribution['values'][0]['payment_instrument']);
   }
 
   function testGetContributionByPaymentInstrument() {
-    $eftTypeId = CRM_Core_OptionGroup::getValue('payment_instrument', 'EFT');
-    $cashTypeId = CRM_Core_OptionGroup::getValue('payment_instrument', 'Cash');
     $params = $this->_params + array('payment_instrument' => 'EFT');
-    $params2 = $this->_params + array('payment_instrument' => 'Cash',);
+    $params2 = $this->_params + array('payment_instrument' => 'Cash');
     civicrm_api('contribution','create',$params);
     $contribution = civicrm_api('contribution','create',$params2);
     $this->assertAPISuccess($contribution);
@@ -574,8 +580,8 @@ function testGetContributionByPaymentInstrument() {
     $this->assertEquals(1,$contribution['count']);
     $contribution = civicrm_api('contribution','get',array('version'=> 3, 'sequential' => 1, 'payment_instrument' => 'EFT'));
     $this->assertArrayHasKey('payment_instrument', $contribution['values'][0]);
-    $this->assertEquals('EFT',$contribution['values'][0]['payment_instrument']);
-    $this->assertEquals(1,$contribution['count']);
+    $this->assertEquals('EFT', $contribution['values'][0]['payment_instrument']);
+    $this->assertEquals(1, $contribution['count']);
     $contribution = civicrm_api('contribution', 'update', array('id' => $contribution['id'], 'version' => $this->_apiversion, 'payment_instrument' => 'Credit Card'));
     $this->assertAPISuccess($contribution);
     $contribution = civicrm_api('contribution','get',array('version'=> 3, 'sequential' => 1, 'id' => $contribution['id'], ));