diff test/functional/timelog_custom_fields_visibility_test.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch

--- a/test/functional/timelog_custom_fields_visibility_test.rb	Tue Sep 09 09:28:31 2014 +0100
+++ b/test/functional/timelog_custom_fields_visibility_test.rb	Tue Sep 09 09:29:00 2014 +0100
@@ -95,12 +95,17 @@
     p1 = Project.generate!
     p2 = Project.generate!
     user = User.generate!
-    User.add_to_project(user, p1, Role.find_all_by_id(1,3))
-    User.add_to_project(user, p2, Role.find_all_by_id(3))
-    TimeEntry.generate!(:issue => Issue.generate!(:project => p1, :tracker_id => 1, :custom_field_values => {@field2.id => 'ValueA'}))
-    TimeEntry.generate!(:issue => Issue.generate!(:project => p2, :tracker_id => 1, :custom_field_values => {@field2.id => 'ValueB'}))
-    TimeEntry.generate!(:issue => Issue.generate!(:project => p1, :tracker_id => 1, :custom_field_values => {@field2.id => 'ValueC'}))
-
+    User.add_to_project(user, p1, Role.where(:id => [1, 3]).all)
+    User.add_to_project(user, p2, Role.where(:id => 3).all)
+    TimeEntry.generate!(
+      :issue => Issue.generate!(:project => p1, :tracker_id => 1,
+                                :custom_field_values => {@field2.id => 'ValueA'}))
+    TimeEntry.generate!(
+      :issue => Issue.generate!(:project => p2, :tracker_id => 1,
+                                :custom_field_values => {@field2.id => 'ValueB'}))
+    TimeEntry.generate!(
+      :issue => Issue.generate!(:project => p1, :tracker_id => 1,
+                                :custom_field_values => {@field2.id => 'ValueC'}))
     @request.session[:user_id] = user.id
     get :index, :c => ["hours", "issue.cf_#{@field2.id}"]
     assert_select 'td', :text => 'ValueA'