summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2020-04-15 14:24:04 +0000
committerGo MAEDA <maeda@farend.jp>2020-04-15 14:24:04 +0000
commit8eeafcdd5ec0690cb8ce15addc3ec16721b1874e (patch)
tree99df92ec3f40319574af558988b569e80f9b8b70 /test
parentbea335bec72599624bb7ee678707633868e3af12 (diff)
downloadredmine-8eeafcdd5ec0690cb8ce15addc3ec16721b1874e.tar.gz
redmine-8eeafcdd5ec0690cb8ce15addc3ec16721b1874e.zip
Merged r19702 and r19703 from trunk to 4.1-stable (#33273).
git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@19704 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
-rw-r--r--test/functional/issues_controller_test.rb16
1 files changed, 16 insertions, 0 deletions
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index dee8060ec..c6adfbc10 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1720,6 +1720,22 @@ class IssuesControllerTest < Redmine::ControllerTest
end
end
+ def test_index_should_respect_timespan_format
+ with_settings :timespan_format => 'minutes' do
+ get(
+ :index,
+ :params => {
+ :set_filter => 1,
+ :c => %w(estimated_hours total_estimated_hours spent_hours total_spent_hours)
+ }
+ )
+ assert_select 'table.issues tr#issue-1 td.estimated_hours', :text => '200:00'
+ assert_select 'table.issues tr#issue-1 td.total_estimated_hours', :text => '200:00'
+ assert_select 'table.issues tr#issue-1 td.spent_hours', :text => '154:15'
+ assert_select 'table.issues tr#issue-1 td.total_spent_hours', :text => '154:15'
+ end
+ end
+
def test_show_by_anonymous
get :show, :params => {
:id => 1