PCHR-4478: Jenkins error fixes

Author: ajesamson

com.civicrm.hrjobroles/tests/phpunit/CRM/Hrjobroles/Import/Parser/HrJobRolesTest.php

@@ -122,7 +122,7 @@ public function testImportFunderByIDAndPercent() {
     // create contact
     $contactParams = ['first_name'=>'walter', 'last_name'=>'white'];
     $contactID = $this->createContact($contactParams);
-    $funderId = $this->createFunder('Test Funder');
+    $funderOptionValue = $this->createFunder('Test Funder');
 
     // create contract
     $contract = $this->createJobContract($contactID, date('Y-m-d', strtotime('-14 days')));
@@ -135,7 +135,7 @@ public function testImportFunderByIDAndPercent() {
       'hrjc_region' => 'south amman',
       'hrjc_role_department' => 'amman devs',
       'hrjc_level_type' => 'guru',
-      'funder' => $funderId,
+      'funder' => $funderOptionValue['name'],
       'hrjc_funder_val_type' => '%',
       'hrjc_role_percent_pay_funder' => '30'
     ];
@@ -144,7 +144,7 @@ public function testImportFunderByIDAndPercent() {
 
     $roleEntity = $this->findRole(['title' => $importParams['title']]);
     $this->assertEquals($importParams['title'], $roleEntity->title);
-    $this->assertEquals($importParams['funder'], $roleEntity->funder);
+    $this->assertEquals($funderOptionValue['value'], $roleEntity->funder);
     $this->assertEquals(1, $roleEntity->funder_val_type);
     $this->assertEquals($importParams['hrjc_role_percent_pay_funder'], $roleEntity->percent_pay_funder);
   }
@@ -153,7 +153,7 @@ public function testImportFunderByIDAndAmount() {
     // create contact
     $contactParams = ['first_name'=>'walter', 'last_name'=>'white'];
     $contactID = $this->createContact($contactParams);
-    $funderId = $this->createFunder('Test Funder');
+    $funderOptionValue = $this->createFunder('Test Funder');
 
     // create contract
     $contract = $this->createJobContract($contactID, date('Y-m-d', strtotime('-14 days')));
@@ -166,7 +166,7 @@ public function testImportFunderByIDAndAmount() {
       'hrjc_region' => 'south amman',
       'hrjc_role_department' => 'amman devs',
       'hrjc_level_type' => 'guru',
-      'funder' => $funderId,
+      'funder' => $funderOptionValue['name'],
       'hrjc_funder_val_type' => 'fixed',
       'hrjc_role_amount_pay_funder' => '30'
     ];
@@ -175,7 +175,7 @@ public function testImportFunderByIDAndAmount() {
 
     $roleEntity = $this->findRole(['title' => $importParams['title']]);
     $this->assertEquals($importParams['title'], $roleEntity->title);
-    $this->assertEquals($importParams['funder'], $roleEntity->funder);
+    $this->assertEquals($funderOptionValue['value'], $roleEntity->funder);
     $this->assertEquals(0, $roleEntity->funder_val_type);
     $this->assertEquals($importParams['hrjc_role_amount_pay_funder'], $roleEntity->amount_pay_funder);
   }
@@ -188,6 +188,7 @@ public function testImportFunderByDisplayNameAndAmount() {
       'display_name' => 'walter white'
     ];
     $contactID = $this->createContact($contactParams);
+    $funderOptionValue = $this->createFunder('Test Funder');
 
     // create contract
     $contract = $this->createJobContract($contactID, date('Y-m-d', strtotime('-14 days')));
@@ -200,7 +201,7 @@ public function testImportFunderByDisplayNameAndAmount() {
       'hrjc_region' => 'south amman',
       'hrjc_role_department' => 'amman devs',
       'hrjc_level_type' => 'guru',
-      'funder' => $contactParams['display_name'],
+      'funder' => $funderOptionValue['name'],
       'hrjc_funder_val_type' => 'fixed',
       'hrjc_role_amount_pay_funder' => '30'
     ];
@@ -209,7 +210,7 @@ public function testImportFunderByDisplayNameAndAmount() {
 
     $roleEntity = $this->findRole(['title' => $importParams['title']]);
     $this->assertEquals($importParams['title'], $roleEntity->title);
-    $this->assertEquals($contactID, $roleEntity->funder);
+    $this->assertEquals($funderOptionValue['value'], $roleEntity->funder);
     $this->assertEquals(0, $roleEntity->funder_val_type);
     $this->assertEquals($importParams['hrjc_role_amount_pay_funder'], $roleEntity->amount_pay_funder);
   }

com.civicrm.hrjobroles/tests/phpunit/HrJobRolesTestTrait.php

@@ -28,7 +28,8 @@ public function createSampleOptionGroupsAndValues()  {
       'hrjc_region' => 'south amman',
       'hrjc_department' => 'amman devs',
       'hrjc_level_type' => 'guru',
-      'cost_centres' => 'abdali'
+      'cost_centres' => 'abdali',
+      'hrjc_funder' => 'funder'
     ];
 
     $optionGroupsList = array_keys($optionGroupsValuesList);
@@ -98,7 +99,7 @@ protected function createFunder($funder) {
       'label' => $funder,
     ]);
 
-    return $result['id'];
+    return array_shift($result['values']);
   }
 
   /**