COMCL-706: Fix failing tests

compucorp · Aug 8, 2024 · 44e9918 · 44e9918
1 parent fba0f7e
commit 44e9918
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/CRM/Civicase/Hook/BuildForm/EnableCaseCategoryIconField.php b/CRM/Civicase/Hook/BuildForm/EnableCaseCategoryIconField.php
@@ -41,8 +41,7 @@ public function run(CRM_Core_Form &$form, $formName) {
    *   returns TRUE or FALSE.
    */
   private function shouldRun(CRM_Core_Form $form, $formName) {
-    $optionGroupName = $form->getVar('_gName');
-    return $formName == 'CRM_Admin_Form_Options' && $optionGroupName == 'case_type_categories';
+    return $formName == 'CRM_Admin_Form_Options' && $form->getVar('_gName') == 'case_type_categories';
   }
 
 }
diff --git a/CRM/Civicase/Service/CaseCategoryCustomDataType.php b/CRM/Civicase/Service/CaseCategoryCustomDataType.php
@@ -54,7 +54,7 @@ public function delete($caseTypeCategoryName) {
       return;
     }
 
-    CRM_Core_BAO_OptionValue::del($result['values'][0]['id']);
+    CRM_Core_BAO_OptionValue::deleteRecord(['id' => $result['values'][0]['id']]);
   }
 
   /**

diff --git a/CRM/Civicase/Service/CaseCategoryCustomFieldExtends.php b/CRM/Civicase/Service/CaseCategoryCustomFieldExtends.php
@@ -87,7 +87,7 @@ public function delete($entityValue) {
       return;
     }
 
-    CRM_Core_BAO_OptionValue::del($result['values'][0]['id']);
+    CRM_Core_BAO_OptionValue::deleteRecord(['id' => $result['values'][0]['id']]);
   }
 
   /**

diff --git a/tests/phpunit/CRM/Civicase/Hook/ValidateForm/SendBulkEmailTest.php b/tests/phpunit/CRM/Civicase/Hook/ValidateForm/SendBulkEmailTest.php
@@ -327,9 +327,9 @@ private function runHook(string $subject, string $body, array $cases, array $con
     $this->form->_contactIds = [];
     $this->form->_toContactEmails = [];
     $this->form->_contactDetails = [];
-    foreach ($contacts as $contact) {
+    foreach ($contacts as $k => $contact) {
       $this->form->_contactIds[] = $contact['id'];
-      $this->form->_toContactEmails[] = $contact['email'];
+      $this->form->_toContactEmails[] = $k . '::' . $contact['email'];
       $this->form->_contactDetails[$contact['id']] = [
         'email' => $contact['email'],
         'contact_id' => $contact['id'],