From 903d0d389fb39dbc261b888fe46b9c808bc27038 Mon Sep 17 00:00:00 2001 From: monishdeb Date: Tue, 6 Jan 2015 23:13:48 +0530 Subject: [PATCH] test break fixes --- CRM/Contact/BAO/Query.php | 3 ++- tests/phpunit/api/v3/UtilsTest.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php index 5cab9eedff..fe19b6b943 100644 --- a/CRM/Contact/BAO/Query.php +++ b/CRM/Contact/BAO/Query.php @@ -613,7 +613,8 @@ class CRM_Contact_BAO_Query { (substr($name, 0, 12) == 'participant_') || (substr($name, 0, 7) == 'pledge_') || (substr($name, 0, 5) == 'case_') || - (substr($name, 0, 13) == 'contribution_' && strpos($name, 'source') === FALSE) || + (substr($name, 0, 13) == 'contribution_' && + (strpos($name, 'source') !== FALSE || strpos($name, 'recur') !== FALSE)) || (substr($name, 0, 8) == 'payment_') ) { continue; diff --git a/tests/phpunit/api/v3/UtilsTest.php b/tests/phpunit/api/v3/UtilsTest.php index ccf59b074e..a0086acdc0 100644 --- a/tests/phpunit/api/v3/UtilsTest.php +++ b/tests/phpunit/api/v3/UtilsTest.php @@ -259,7 +259,8 @@ class api_v3_UtilsTest extends CiviUnitTestCase { ); $fields = civicrm_api3('Membership', 'getfields', array('action' => 'get')); _civicrm_api3_validate_fields('Membership', 'get', $params, $fields['values']); - $this->assertEquals('20101220000000', $params['start_date'], 'in line ' . __LINE__); + $this->assertEquals('2010-12-20', $params['start_date']); + $this->assertEquals('20101220000000', $params['membership_start_date'], 'in line ' . __LINE__); $this->assertEquals('', $params['end_date']); $this->assertEquals('20101220000000', $params['join_date'], 'join_date not set in line ' . __LINE__); } -- 2.25.1