diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
| commit | 2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch) | |
| tree | 7a733c1cc51448ab69b3f892285305dbfb0ae15e /test/functional/timelog_custom_fields_visibility_test.rb | |
| parent | a6ec78a4dc658e3517ed682792016b6530458696 (diff) | |
| download | redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip | |
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/timelog_custom_fields_visibility_test.rb')
| -rw-r--r-- | test/functional/timelog_custom_fields_visibility_test.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/functional/timelog_custom_fields_visibility_test.rb b/test/functional/timelog_custom_fields_visibility_test.rb index 8f474c1d6..a5648de78 100644 --- a/test/functional/timelog_custom_fields_visibility_test.rb +++ b/test/functional/timelog_custom_fields_visibility_test.rb @@ -95,8 +95,8 @@ class TimelogCustomFieldsVisibilityTest < ActionController::TestCase p1 = Project.generate! p2 = Project.generate! user = User.generate! - User.add_to_project(user, p1, Role.where(:id => [1, 3]).all) - User.add_to_project(user, p2, Role.where(:id => 3).all) + User.add_to_project(user, p1, Role.where(:id => [1, 3]).to_a) + User.add_to_project(user, p2, Role.where(:id => 3).to_a) TimeEntry.generate!( :issue => Issue.generate!(:project => p1, :tracker_id => 1, :custom_field_values => {@field2.id => 'ValueA'})) @@ -108,9 +108,9 @@ class TimelogCustomFieldsVisibilityTest < ActionController::TestCase :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' + assert_select 'td', {:text => 'ValueA'}, "ValueA not found in:\n#{response.body}" assert_select 'td', :text => 'ValueB', :count => 0 - assert_select 'td', :text => 'ValueC' + assert_select 'td', {:text => 'ValueC'}, "ValueC not found in:\n#{response.body}" get :index, :set_filter => '1', "issue.cf_#{@field2.id}" => '*' assert_equal %w(ValueA ValueC), assigns(:entries).map{|i| i.issue.custom_field_value(@field2)}.sort |