Fix test to not do weird form-trait sharing thing
authorEileen McNaughton <emcnaughton@wikimedia.org>
Thu, 7 Dec 2023 03:10:14 +0000 (16:10 +1300)
committerEileen McNaughton <emcnaughton@wikimedia.org>
Thu, 7 Dec 2023 03:10:14 +0000 (16:10 +1300)
tests/phpunit/CRM/Contact/Import/Form/MapFieldTest.php

index 7af3de10c927119319500b31494a1b5edf007373..cfb65ddad97388a35f39a8071041d52ce2f1fe1f 100644 (file)
@@ -26,7 +26,6 @@ use Civi\Api4\UserJob;
  */
 class CRM_Contact_Import_Form_MapFieldTest extends CiviUnitTestCase {
 
-  use CRM_Contact_Import_MetadataTrait;
   use CRMTraits_Custom_CustomDataTrait;
 
   /**
@@ -208,9 +207,11 @@ class CRM_Contact_Import_Form_MapFieldTest extends CiviUnitTestCase {
   public function testLoadSavedMappingDirect(): void {
     $mapping = $this->storeComplexMapping();
     $this->setUpMapFieldForm();
+    $parser = new CRM_Contact_Import_Parser_Contact();
+    $parser->setUserJobID($this->form->getUserJobID());
     $processor = new CRM_Import_ImportProcessor();
     $processor->setMappingID($mapping['id']);
-    $processor->setMetadata($this->getContactImportMetadata());
+    $processor->setMetadata($parser->getFieldsMetadata());
     $this->assertEquals(3, $processor->getPhoneOrIMTypeID(10));
     $this->assertEquals(3, $processor->getPhoneTypeID(10));
     $this->assertEquals(1, $processor->getLocationTypeID(10));
@@ -335,7 +336,9 @@ class CRM_Contact_Import_Form_MapFieldTest extends CiviUnitTestCase {
     $processor = new CRM_Import_ImportProcessor();
     $processor->setMappingID($mappingID);
     $processor->setFormName('document.forms.MapField');
-    $processor->setMetadata($this->getContactImportMetadata());
+    $parser = new CRM_Contact_Import_Parser_Contact();
+    $parser->setUserJobID($this->form->getUserJobID());
+    $processor->setMetadata($parser->getFieldsMetadata());
     $processor->setContactType('Individual');
 
     $defaults = [];