summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-08-31 03:38:55 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-08-31 03:38:55 +0000
commit6ce8c55a5cf9ad043291ee5ec639e8a9e8a35c24 (patch)
tree3335a1c3626fae002e0ab4441ae6f9b2536bb02a
parent7cc8aa756df5c7df750fee2bd14224e8fa1367cf (diff)
downloadredmine-6ce8c55a5cf9ad043291ee5ec639e8a9e8a35c24.tar.gz
redmine-6ce8c55a5cf9ad043291ee5ec639e8a9e8a35c24.zip
Merged r14410 from trunk to 3.1-stable (#11253, #20456)
Asserts that spent time is preloaded. git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14537 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--test/functional/issues_controller_test.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 6d106e88b..f642d582d 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -851,11 +851,13 @@ class IssuesControllerTest < ActionController::TestCase
end
def test_index_with_spent_hours_column
+ Issue.expects(:load_visible_spent_hours).once
get :index, :set_filter => 1, :c => %w(subject spent_hours)
assert_select 'table.issues tr#issue-3 td.spent_hours', :text => '1.00'
end
def test_index_with_total_spent_hours_column
+ Issue.expects(:load_visible_total_spent_hours).once
get :index, :set_filter => 1, :c => %w(subject total_spent_hours)
assert_select 'table.issues tr#issue-3 td.total_spent_hours', :text => '1.00'
end