Fix random test failure, assertion must be made against displayed values.

IssuesControllerTest#test_index_sort_by_spent_hours_should_sort_by_visible_spent_hours
Expected: [3.0, 0.0, 0.0]
  Actual: [3.0, 4.0, 0.0]

git-svn-id: http://svn.redmine.org/redmine/trunk@17672 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 92440f57360e2292a8e00e67d0bc27e38650e819..872db7a1daedf67bcb26195e647ee32b5440497c 100644 (file)
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -978,13 +978,13 @@ class IssuesControllerTest < Redmine::ControllerTest
 
     get :index, :params => {:sort => "spent_hours:desc", :c => ['subject','spent_hours']}
     assert_response :success
-    assert_equal [4.0, 3.0, 0.0], issues_in_list.map(&:spent_hours)[0..2]
+    assert_equal ['4.00', '3.00', '0.00'], columns_values_in_list('spent_hours')[0..2]
 
     Project.find(3).disable_module!(:time_tracking)
 
     get :index, :params => {:sort => "spent_hours:desc", :c => ['subject','spent_hours']}
     assert_response :success
-    assert_equal [3.0, 0.0, 0.0], issues_in_list.map(&:spent_hours)[0..2]
+    assert_equal ['3.00', '0.00', '0.00'], columns_values_in_list('spent_hours')[0..2]
   end
 
   def test_index_sort_by_total_spent_hours

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 6dcdb7a7c6ed40f0a8a2c774f64339c450b5f8c3..796daf268e2d7ff1efbf485613bb29c2cceaada3 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -312,7 +312,12 @@ module Redmine
     def columns_in_list
       css_select('table.list thead th:not(.checkbox)').map(&:text).select(&:present?)
     end
-  
+
+    # Returns the values that are displayed in tds with the given css class
+    def columns_values_in_list(css_class)
+      css_select("table.list tbody td.#{css_class}").map(&:text)
+    end
+
     # Verifies that the query filters match the expected filters
     def assert_query_filters(expected_filters)
       response.body =~ /initFilters\(\);\s*((addFilter\(.+\);\s*)*)/