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

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 6d106e88b3ad53a2b89ba400d50ffa4916561f12..f642d582d4e2910e2926eadb13b8a2d04646debf 100644 (file)
--- 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