dev/core#4726 Ensure that quickform mapper default value is set correctly for do_not_...

Fix test failure

diff --git a/CRM/Import/ImportProcessor.php b/CRM/Import/ImportProcessor.php
index fbbe9d85ee42c9a4565d71c9bb69da505a90ea9d..4938dff9b742f38c03e4e382aef0629c5526cafb 100644 (file)
--- a/CRM/Import/ImportProcessor.php
+++ b/CRM/Import/ImportProcessor.php
@@ -583,11 +583,6 @@ class CRM_Import_ImportProcessor {
   public function getSavedQuickformDefaultsForColumn($column) {
     $fieldMapping = [];
 
-    // $sel1 is either unmapped, a relationship or a target field.
-    if ($this->getFieldName($column) === 'do_not_import') {
-      return $fieldMapping;
-    }
-
     if ($this->getValidRelationshipKey($column)) {
       $fieldMapping[] = $this->getValidRelationshipKey($column);
     }

diff --git a/tests/phpunit/CRM/Contact/Import/Form/MapFieldTest.php b/tests/phpunit/CRM/Contact/Import/Form/MapFieldTest.php
index 7e7e72495f0c8a57dcb68bee3b9e96c044c57c8c..7af3de10c927119319500b31494a1b5edf007373 100644 (file)
--- a/tests/phpunit/CRM/Contact/Import/Form/MapFieldTest.php
+++ b/tests/phpunit/CRM/Contact/Import/Form/MapFieldTest.php
@@ -261,7 +261,7 @@ class CRM_Contact_Import_Form_MapFieldTest extends CiviUnitTestCase {
       [
         ['name' => 'do_not_import', 'contact_type' => 'Individual', 'column_number' => 0],
         "swapOptions(document.forms.MapField, 'mapper[0]', 0, 4, 'hs_mapper_0_');\n",
-        ['mapper[0]' => []],
+        ['mapper[0]' => ['do_not_import']],
       ],
     ];
   }