From d235daf61be88e4c204bec514c103b349afe785f Mon Sep 17 00:00:00 2001 From: Mattias Michaux Date: Mon, 16 May 2016 21:28:20 +0200 Subject: [PATCH] First fixes for changed/incorrect error message. --- tests/phpunit/api/v3/ACLPermissionTest.php | 2 +- tests/phpunit/api/v3/APITest.php | 2 +- tests/phpunit/api/v3/FinancialTypeACLTest.php | 2 +- tests/phpunit/api/v3/MembershipStatusTest.php | 2 +- tests/phpunit/api/v3/PaymentTest.php | 6 +++--- tests/phpunit/api/v3/ProfileTest.php | 4 ++-- tests/phpunit/api/v3/RelationshipTest.php | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/phpunit/api/v3/ACLPermissionTest.php b/tests/phpunit/api/v3/ACLPermissionTest.php index 5f79cf65ce..64179682de 100644 --- a/tests/phpunit/api/v3/ACLPermissionTest.php +++ b/tests/phpunit/api/v3/ACLPermissionTest.php @@ -289,7 +289,7 @@ class api_v3_ACLPermissionTest extends CiviUnitTestCase { 'api.pledge.get' => 1, 'sequential' => 1, ), - 'Error in call to pledge_get : API permission check failed for pledge/get call; missing permission: access CiviCRM.' + 'Error in call to Pledge_get : API permission check failed for Pledge/get call; insufficient permission: require access CiviCRM and access CiviPledge' ); } diff --git a/tests/phpunit/api/v3/APITest.php b/tests/phpunit/api/v3/APITest.php index be854d6c59..8bcbea43a7 100644 --- a/tests/phpunit/api/v3/APITest.php +++ b/tests/phpunit/api/v3/APITest.php @@ -74,7 +74,7 @@ class api_v3_APITest extends CiviUnitTestCase { 'RandomFile', 'get', array(), - 'API (RandomFile,get) does not exist (join the API team and implement it!)' + 'API (RandomFile, get) does not exist (join the API team and implement it!)' ); } diff --git a/tests/phpunit/api/v3/FinancialTypeACLTest.php b/tests/phpunit/api/v3/FinancialTypeACLTest.php index 939d5c5209..abe128b1f5 100644 --- a/tests/phpunit/api/v3/FinancialTypeACLTest.php +++ b/tests/phpunit/api/v3/FinancialTypeACLTest.php @@ -262,7 +262,7 @@ class api_v3_FinancialTypeACLTest extends CiviUnitTestCase { 'add contributions of type Donation', 'delete contributions of type Donation', ); - $contribution = $this->callAPIFailure('contribution', 'create', $params, 'You do not have permission to create this line item'); + $contribution = $this->callAPIFailure('contribution', 'create', $params, 'Error in call to LineItem_create : You do not have permission to create this line item'); // Check that the entire contribution has rolled back. $contribution = $this->callAPISuccess('contribution', 'get', array()); diff --git a/tests/phpunit/api/v3/MembershipStatusTest.php b/tests/phpunit/api/v3/MembershipStatusTest.php index 92353d9ff9..92436627fa 100644 --- a/tests/phpunit/api/v3/MembershipStatusTest.php +++ b/tests/phpunit/api/v3/MembershipStatusTest.php @@ -99,7 +99,7 @@ class api_v3_MembershipStatusTest extends CiviUnitTestCase { public function testCreateWithMissingRequired() { $params = array('title' => 'Does not make sense'); - $result = $this->callAPIFailure('membership_status', 'create', $params); + $this->callAPIFailure('membership_status', 'create', $params, 'Mandatory key(s) missing from params array: name'); } public function testCreate() { diff --git a/tests/phpunit/api/v3/PaymentTest.php b/tests/phpunit/api/v3/PaymentTest.php index 0ee80805e4..78f1fa7b38 100644 --- a/tests/phpunit/api/v3/PaymentTest.php +++ b/tests/phpunit/api/v3/PaymentTest.php @@ -310,7 +310,7 @@ class api_v3_PaymentTest extends CiviUnitTestCase { 'id' => $payment['id'], 'check_permissions' => TRUE, ); - $payment = $this->callAPIFailure('payment', 'cancel', $cancelParams, 'API permission check failed for Payment/get call; insufficient permission: require access CiviCRM and edit contributions'); + $payment = $this->callAPIFailure('payment', 'cancel', $cancelParams, 'API permission check failed for Payment/cancel call; insufficient permission: require access CiviCRM and edit contributions'); array_push(CRM_Core_Config::singleton()->userPermissionClass->permissions, 'access CiviCRM', 'edit contributions'); @@ -346,7 +346,7 @@ class api_v3_PaymentTest extends CiviUnitTestCase { 'id' => $payment['id'], 'check_permissions' => TRUE, ); - $payment = $this->callAPIFailure('payment', 'delete', $deleteParams, 'API permission check failed for Payment/get call; insufficient permission: require access CiviCRM and delete in CiviContribute'); + $payment = $this->callAPIFailure('payment', 'delete', $deleteParams, 'API permission check failed for Payment/delete call; insufficient permission: require access CiviCRM and delete in CiviContribute'); array_push(CRM_Core_Config::singleton()->userPermissionClass->permissions, 'access CiviCRM', 'delete in CiviContribute'); $this->callAPIAndDocument('payment', 'delete', $deleteParams, __FUNCTION__, __FILE__); @@ -402,7 +402,7 @@ class api_v3_PaymentTest extends CiviUnitTestCase { 'id' => $payment['id'], 'check_permissions' => TRUE, ); - $payment = $this->callAPIFailure('payment', 'create', $params, 'API permission check failed for Payment/get call; insufficient permission: require access CiviCRM and edit contributions'); + $payment = $this->callAPIFailure('payment', 'create', $params, 'API permission check failed for Payment/create call; insufficient permission: require access CiviCRM and edit contributions'); array_push(CRM_Core_Config::singleton()->userPermissionClass->permissions, 'access CiviCRM', 'edit contributions'); $payment = $this->callAPIAndDocument('payment', 'create', $params, __FUNCTION__, __FILE__, 'Update Payment', 'UpdatePayment'); diff --git a/tests/phpunit/api/v3/ProfileTest.php b/tests/phpunit/api/v3/ProfileTest.php index 1269a38038..c8d92d8547 100644 --- a/tests/phpunit/api/v3/ProfileTest.php +++ b/tests/phpunit/api/v3/ProfileTest.php @@ -416,8 +416,8 @@ class api_v3_ProfileTest extends CiviUnitTestCase { $updateParams ); - $result = $this->callAPIFailure('profile', 'submit', $params, - "Missing required parameters for profile id $this->_profileID: email-Primary" + $this->callAPIFailure('profile', 'submit', $params, + "Mandatory key(s) missing from params array: email-primary" ); } diff --git a/tests/phpunit/api/v3/RelationshipTest.php b/tests/phpunit/api/v3/RelationshipTest.php index 9b2595ff7a..aadfa70850 100644 --- a/tests/phpunit/api/v3/RelationshipTest.php +++ b/tests/phpunit/api/v3/RelationshipTest.php @@ -203,7 +203,7 @@ class api_v3_RelationshipTest extends CiviUnitTestCase { 'start_date' => '2008-12-20', 'is_active' => 1, ); - $this->callAPIFailure('relationship', 'create', $params, 'Relationship already exists'); + $this->callAPIFailure('relationship', 'create', $params, 'Duplicate Relationship'); $params['id'] = $relationship['id']; $this->callAPISuccess('relationship', 'delete', $params); -- 2.25.1