diff options
| author | Go MAEDA <maeda@farend.jp> | 2024-07-03 09:40:48 +0000 |
|---|---|---|
| committer | Go MAEDA <maeda@farend.jp> | 2024-07-03 09:40:48 +0000 |
| commit | 713da39aa63e5a9027af0c6086daa9dba898e537 (patch) | |
| tree | feddcdfa0877e262fe6713d9cd0c50f683c55c6a /test/functional/timelog_controller_test.rb | |
| parent | cf103b5a99b1e039d28a7fc74c14c971a6b90e0d (diff) | |
| download | redmine-713da39aa63e5a9027af0c6086daa9dba898e537.tar.gz redmine-713da39aa63e5a9027af0c6086daa9dba898e537.zip | |
Merged r22902 from trunk to 5.0-stable (#40924).
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22904 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/timelog_controller_test.rb')
| -rw-r--r-- | test/functional/timelog_controller_test.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb index 2945db6a0..7b2eb3ade 100644 --- a/test/functional/timelog_controller_test.rb +++ b/test/functional/timelog_controller_test.rb @@ -714,12 +714,14 @@ class TimelogControllerTest < Redmine::ControllerTest def test_get_bulk_edit @request.session[:user_id] = 2 - get :bulk_edit, :params => {:ids => [1, 2]} + with_settings :timespan_format => 'minutes' do + get :bulk_edit, :params => {:ids => [1, 2]} + end assert_response :success assert_select 'ul#bulk-selection' do assert_select 'li', 2 - assert_select 'li a', :text => '03/23/2007 - eCookbook: 4.25 hours (John Smith)' + assert_select 'li a', :text => '03/23/2007 - eCookbook: 4:15 hours (John Smith)' end assert_select 'form#bulk_edit_form[action=?]', '/time_entries/bulk_update' do |