Fix custom group test

diff --git a/api/v3/Generic.php b/api/v3/Generic.php
index 233a8e776583392daf392bbb3549447897a84cc2..77713a3e420bd8aeed391816b77d1b7451c5a4c2 100644 (file)
--- a/api/v3/Generic.php
+++ b/api/v3/Generic.php
@@ -233,7 +233,7 @@ function civicrm_api3_generic_getoptions($apiRequest) {
  * @param array $fieldsToResolve anny field resolutions specifically requested
  */
 function _civicrm_api3_generic_get_metadata_options(&$metadata, $entity, $fieldname, $fieldSpec, $fieldsToResolve){
-  if(empty($fieldSpec['pseudoconstant'])) {
+  if(empty($fieldSpec['pseudoconstant']) && empty($fieldSpec['enumValues'])) {
     return;
   }
 

diff --git a/tests/phpunit/api/v3/CustomGroupTest.php b/tests/phpunit/api/v3/CustomGroupTest.php
index 6871cd67202fd7566c26bfa23c585113a068c253..648f00392633a9af000977249507433964566a3c 100644 (file)
--- a/tests/phpunit/api/v3/CustomGroupTest.php
+++ b/tests/phpunit/api/v3/CustomGroupTest.php
@@ -180,23 +180,22 @@ class api_v3_CustomGroupTest extends CiviUnitTestCase {
     $this->assertNotNull($result['id'], 'In line ' . __LINE__);
     $this->assertEquals($result['values'][$result['id']]['extends'], 'Individual', 'In line ' . __LINE__);
   }
+
   /**
    * check with valid array
    */
   function testCustomGroupGetFields() {
     $params = array(
-        'version' => $this->_apiversion,
+      'version' => $this->_apiversion,
+      'options' => array('get_options' => 'style'),
     );
 
     $result = civicrm_api('custom_group', 'getfields', $params);
     $this->assertAPISuccess($result);
-    $this->assertArrayKeyExists('options', $result['values'], ' check that options are rendered for fieldtype enum');
     $this->assertEquals('Tab', $result['values']['style']['options'][0]);
     $this->assertEquals('Inline', $result['values']['style']['options'][1]);
-
   }
 
-
   /**
    * check with extends array length greater than 1
    */