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

Update to Redmine SVN revision 13367 on 2.5-stable branch
author Chris Cannam
date Tue, 09 Sep 2014 09:29:00 +0100
parents e248c7af89ec
children
comparison
equal deleted inserted replaced
1516:b450a9d58aed 1517:dffacf8a6908
93 Issue.delete_all 93 Issue.delete_all
94 TimeEntry.delete_all 94 TimeEntry.delete_all
95 p1 = Project.generate! 95 p1 = Project.generate!
96 p2 = Project.generate! 96 p2 = Project.generate!
97 user = User.generate! 97 user = User.generate!
98 User.add_to_project(user, p1, Role.find_all_by_id(1,3)) 98 User.add_to_project(user, p1, Role.where(:id => [1, 3]).all)
99 User.add_to_project(user, p2, Role.find_all_by_id(3)) 99 User.add_to_project(user, p2, Role.where(:id => 3).all)
100 TimeEntry.generate!(:issue => Issue.generate!(:project => p1, :tracker_id => 1, :custom_field_values => {@field2.id => 'ValueA'})) 100 TimeEntry.generate!(
101 TimeEntry.generate!(:issue => Issue.generate!(:project => p2, :tracker_id => 1, :custom_field_values => {@field2.id => 'ValueB'})) 101 :issue => Issue.generate!(:project => p1, :tracker_id => 1,
102 TimeEntry.generate!(:issue => Issue.generate!(:project => p1, :tracker_id => 1, :custom_field_values => {@field2.id => 'ValueC'})) 102 :custom_field_values => {@field2.id => 'ValueA'}))
103 103 TimeEntry.generate!(
104 :issue => Issue.generate!(:project => p2, :tracker_id => 1,
105 :custom_field_values => {@field2.id => 'ValueB'}))
106 TimeEntry.generate!(
107 :issue => Issue.generate!(:project => p1, :tracker_id => 1,
108 :custom_field_values => {@field2.id => 'ValueC'}))
104 @request.session[:user_id] = user.id 109 @request.session[:user_id] = user.id
105 get :index, :c => ["hours", "issue.cf_#{@field2.id}"] 110 get :index, :c => ["hours", "issue.cf_#{@field2.id}"]
106 assert_select 'td', :text => 'ValueA' 111 assert_select 'td', :text => 'ValueA'
107 assert_select 'td', :text => 'ValueB', :count => 0 112 assert_select 'td', :text => 'ValueB', :count => 0
108 assert_select 'td', :text => 'ValueC' 113 assert_select 'td', :text => 'ValueC'