Use 'user' as internal field instead of user_id because the column accepts also user login as value, not only the id (#22913).

Patch by Marius BALTEANU.


git-svn-id: http://svn.redmine.org/redmine/trunk@19523 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 2 insertions, 2 deletions

diff --git a/test/unit/time_entry_import_test.rb b/test/unit/time_entry_import_test.rb
index d84de22f4..c974707b0 100644
--- a/test/unit/time_entry_import_test.rb
+++ b/test/unit/time_entry_import_test.rb
@@ -140,7 +140,7 @@ class TimeEntryImportTest < ActiveSupport::TestCase
   def test_maps_user_to_column_value
     User.current = User.find(1)
     import = generate_import_with_mapping
-    import.mapping.merge!('user_id' => 'value:1')
+    import.mapping.merge!('user' => 'value:1')
     import.save!
     first, second, third, fourth = new_records(TimeEntry, 4) { import.run }
 
@@ -185,7 +185,7 @@ class TimeEntryImportTest < ActiveSupport::TestCase
         'spent_on'   => '2',
         'hours'      => '3',
         'comments'   => '4',
-        'user_id'    => '7'
+        'user'       => '7'
       }
     }
     import.save!