From 1db7bae7bdce3ea933dc61c0bff4014413faf94c Mon Sep 17 00:00:00 2001 From: Marius BALTEANU Date: Sun, 9 Feb 2020 16:20:07 +0200 Subject: [PATCH 2/2] Reorder and rename test added in 32959 --- test/functional/timelog_controller_test.rb | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb index b194495b5..f385136a1 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -208,6 +208,21 @@ class TimelogControllerTest < Redmine::ControllerTest end end + def test_get_edit_for_other_user + Role.find_by_name('Manager').add_permission! :log_time_for_other_users + @request.session[:user_id] = 2 + + get :edit, :params => { + :id => 1 + } + + assert_response :success + + assert_select 'select[name=?]', 'time_entry[user_id]' do + assert_select 'option[value="2"][selected=selected]' + end + end + def test_post_create @request.session[:user_id] = 3 assert_difference 'TimeEntry.count' do @@ -1500,19 +1515,4 @@ class TimelogControllerTest < Redmine::ControllerTest assert_response :success assert_select "td.issue_cf_#{field.id}", :text => 'This is a long text' end - - def test_edit_for_other_user - Role.find_by_name('Manager').add_permission! :log_time_for_other_users - @request.session[:user_id] = 2 - - get :edit, :params => { - :id => 1 - } - - assert_response :success - - assert_select 'select[name=?]', 'time_entry[user_id]' do - assert_select 'option[value="2"][selected=selected]' - end - end end -- 2.22.0