diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-03-21 10:05:11 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-03-21 10:05:11 +0000 |
| commit | ab4916b01aa2901fa35d846598b266846b65dd8c (patch) | |
| tree | b9147d0a783108b472e60d5a6422aee8db211063 | |
| parent | f5668d06500d8437f9744ed64835de5c23346ce0 (diff) | |
| download | redmine-ab4916b01aa2901fa35d846598b266846b65dd8c.tar.gz redmine-ab4916b01aa2901fa35d846598b266846b65dd8c.zip | |
Fixed test failures (#19163).
git-svn-id: http://svn.redmine.org/redmine/trunk@14153 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | test/fixtures/custom_fields_trackers.yml | 3 | ||||
| -rw-r--r-- | test/functional/issues_controller_test.rb | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/test/fixtures/custom_fields_trackers.yml b/test/fixtures/custom_fields_trackers.yml index 2a7a07381..fc01b117e 100644 --- a/test/fixtures/custom_fields_trackers.yml +++ b/test/fixtures/custom_fields_trackers.yml @@ -26,3 +26,6 @@ custom_fields_trackers_008: custom_fields_trackers_009: custom_field_id: 8 tracker_id: 3 +custom_fields_trackers_010: + custom_field_id: 9 + tracker_id: 1 diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index cab533138..7685dc127 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -3389,7 +3389,7 @@ class IssuesControllerTest < ActionController::TestCase def test_get_bulk_edit @request.session[:user_id] = 2 - get :bulk_edit, :ids => [1, 2] + get :bulk_edit, :ids => [1, 3] assert_response :success assert_template 'bulk_edit' @@ -3440,7 +3440,7 @@ class IssuesControllerTest < ActionController::TestCase end def test_get_bulk_edit_with_user_custom_field - field = IssueCustomField.create!(:name => 'Tester', :field_format => 'user', :is_for_all => true) + field = IssueCustomField.create!(:name => 'Tester', :field_format => 'user', :is_for_all => true, :tracker_ids => [1,2,3]) @request.session[:user_id] = 2 get :bulk_edit, :ids => [1, 2] @@ -3453,7 +3453,7 @@ class IssuesControllerTest < ActionController::TestCase end def test_get_bulk_edit_with_version_custom_field - field = IssueCustomField.create!(:name => 'Affected version', :field_format => 'version', :is_for_all => true) + field = IssueCustomField.create!(:name => 'Affected version', :field_format => 'version', :is_for_all => true, :tracker_ids => [1,2,3]) @request.session[:user_id] = 2 get :bulk_edit, :ids => [1, 2] @@ -3470,7 +3470,7 @@ class IssuesControllerTest < ActionController::TestCase field.update_attribute :multiple, true @request.session[:user_id] = 2 - get :bulk_edit, :ids => [1, 2] + get :bulk_edit, :ids => [1, 3] assert_response :success assert_template 'bulk_edit' |