From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Tue, 3 Jun 2014 20:06:57 +0000 (+1200)
Subject: Syntax conformance test fixes
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b06d9acdfbc2d1928bda08e3823b9628d4f756bd;p=civicrm-core.git

Syntax conformance test fixes
---

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'];
       }