Merged r13860 (#18782).

git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13868 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-01-10 21:12:42 +00:00
parent 0c78d2cd8c
commit a673d1f553

View File

@@ -60,13 +60,13 @@ class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
:field_format => 'string',
:name => 'Field1',
:is_for_all => true,
:trackers => Tracker.find_all_by_id([1, 2])
:trackers => Tracker.where(:id => [1, 2])
)
field2 = IssueCustomField.create!(
:field_format => 'string',
:name => 'Field2',
:is_for_all => true,
:trackers => Tracker.find_all_by_id(2)
:trackers => Tracker.where(:id => 2)
)
Role.non_member.add_permission! :add_issues
@@ -188,7 +188,7 @@ class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
:field_format => 'string',
:name => 'Form update CF',
:is_for_all => true,
:trackers => Tracker.find_all_by_name('Feature request')
:trackers => Tracker.where(:name => 'Feature request')
)
Role.non_member.add_permission! :edit_issues