From b06d9acdfbc2d1928bda08e3823b9628d4f756bd Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 4 Jun 2014 08:06:57 +1200 Subject: [PATCH] Syntax conformance test fixes --- tests/phpunit/api/v3/SyntaxConformanceTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php index b065ddc659..13dc3b441b 100644 --- a/tests/phpunit/api/v3/SyntaxConformanceTest.php +++ b/tests/phpunit/api/v3/SyntaxConformanceTest.php @@ -431,6 +431,7 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase { 'pledge_contribution_page_id', 'pledge_status_id', 'pledge_campaign_id', + 'pledge_financial_type_id', ) ), 'PaymentProcessorType' => array( @@ -975,7 +976,7 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase { 'id' => $entity['id'], $field => isset($entity[$field]) ? $entity[$field] : NULL, ); - if(isset($updateParams['financial_type_id'])) { + if(isset($updateParams['financial_type_id']) && $entityName != 'Product') { //api has special handling on these 2 fields for backward compatibility reasons $entity['contribution_type_id'] = $updateParams['financial_type_id']; } -- 2.25.1