Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-14 17:26:06 +01:00
Code Issues Packages Projects Releases Activity

Don't use User.current in TimeEntryImport model but #user instead (#32774).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@19678 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2020-04-05 19:28:37 +00:00
parent 31c8e71d8e
commit 192263b856
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/unit/time_entry_import_test.rb
View File

@@ -127,7 +127,8 @@ class TimeEntryImportTest < ActiveSupport::TestCase
end
def test_maps_user_id_for_user_with_permissions
User.current = User.find(1)
Role.find_by_name('Manager').add_permission! :log_time_for_other_users
import = generate_import_with_mapping
first, second, third, fourth = new_records(TimeEntry, 4) { import.run }
@@ -138,16 +139,17 @@ class TimeEntryImportTest < ActiveSupport::TestCase
end
def test_maps_user_to_column_value
User.current = User.find(1)
Role.find_by_name('Manager').add_permission! :log_time_for_other_users
import = generate_import_with_mapping
import.mapping.merge!('user' => 'value:1')
import.mapping.merge!('user' => 'value:3')
import.save!
first, second, third, fourth = new_records(TimeEntry, 4) { import.run }
assert_equal 1, first.user_id
assert_equal 1, second.user_id
assert_equal 1, third.user_id
assert_equal 1, fourth.user_id
assert_equal 3, first.user_id
assert_equal 3, second.user_id
assert_equal 3, third.user_id
assert_equal 3, fourth.user_id
end
def test_maps_user_id_for_user_without_permissions