CRM-15168 fix test to cope with problems with getactions

diff --git a/api/v3/MessageTemplate.php b/api/v3/MessageTemplate.php
index 809db8fcbe79e444557ce3131e83f4b1159ff367..6dd039d72c96df783698751eb7f64cf5de8f3e0e 100644 (file)
--- a/api/v3/MessageTemplate.php
+++ b/api/v3/MessageTemplate.php
@@ -105,13 +105,12 @@ function civicrm_api3_message_template_send($params) {
  * @param array $params array or parameters determined by getfields
  */
 function _civicrm_api3_message_template_send_spec(&$params) {
-  $required = array(
-    'messageTemplateID',
-    'contactId',
-    'toEmail',
-    'toName',
-  );
-  foreach ($required as $value) {
-    $params[$value]['api.required'] = 1;
-  }
+  $params['messageTemplateID']['api.required'] = 1;
+  $params['messageTemplateID']['title'] = 'Message Template ID';
+  $params['contactId']['api.required'] = 1;
+  $params['contactId']['title'] = 'Contact ID';
+  $params['toEmail']['api.required'] = 1;
+  $params['toEmail']['title'] = 'To Email';
+  $params['toName']['api.required'] = 1;
+  $params['toName']['title'] = 'To Name';
 }

diff --git a/tests/phpunit/api/v3/SyntaxConformanceTest.php b/tests/phpunit/api/v3/SyntaxConformanceTest.php
index 97f1145a1d2b3369cb9120ce02110d694dca6cdb..b79acae7ff86b9452fe1251ea25e8cea87f45021 100644 (file)
--- a/tests/phpunit/api/v3/SyntaxConformanceTest.php
+++ b/tests/phpunit/api/v3/SyntaxConformanceTest.php
@@ -1136,9 +1136,13 @@ class api_v3_SyntaxConformanceTest extends CiviUnitTestCase {
     }
     $actions =  $this->callAPISuccess($entity, 'getactions', array());
     foreach ($actions['values'] as $action) {
+      if (substr($action, -7) == '_create'  || substr($action, -4) == '_get' || substr($action, -7) == '_delete') {
+        //getactions can't distinguish between contribution_page.create & contribution_page.create
+        continue;
+      }
       $fields = $this->callAPISuccess($entity, 'getfields', array('action' => $action));
       if (!empty($ids) && in_array($action, array('create', 'get'))) {
-          $this->assertArrayHasKey('custom_' . $ids['custom_field_id'], $fields['values']);
+        $this->assertArrayHasKey('custom_' . $ids['custom_field_id'], $fields['values']);
       }
 
       foreach ($fields['values'] as $fieldName => $fieldSpec) {