From 6765505b2d0dd14014988b9b15096a33f5b9b2d1 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Wed, 9 Jan 2019 14:26:56 +0000 Subject: [PATCH] Add missing fixtures to several tests (#30276). Patch by Yuichi HARADA. git-svn-id: http://svn.redmine.org/redmine/trunk@17780 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/functional/calendars_controller_test.rb | 3 ++- test/functional/gantts_controller_test.rb | 3 ++- test/functional/news_controller_test.rb | 2 +- test/functional/settings_controller_test.rb | 2 +- test/functional/welcome_controller_test.rb | 2 +- test/unit/custom_field_test.rb | 2 +- test/unit/journal_observer_test.rb | 2 +- .../lib/redmine/field_format/version_field_format_test.rb | 3 ++- test/unit/project_copy_test.rb | 2 +- test/unit/repository_test.rb | 4 +++- 10 files changed, 15 insertions(+), 10 deletions(-) diff --git a/test/functional/calendars_controller_test.rb b/test/functional/calendars_controller_test.rb index a1036441d..7e1cd4413 100644 --- a/test/functional/calendars_controller_test.rb +++ b/test/functional/calendars_controller_test.rb @@ -30,7 +30,8 @@ class CalendarsControllerTest < Redmine::ControllerTest :issue_relations, :issue_categories, :enumerations, - :queries + :queries, + :users, :email_addresses def test_show with_settings :gravatar_enabled => '1' do diff --git a/test/functional/gantts_controller_test.rb b/test/functional/gantts_controller_test.rb index 2ca34aef0..cf11f9d66 100644 --- a/test/functional/gantts_controller_test.rb +++ b/test/functional/gantts_controller_test.rb @@ -25,7 +25,8 @@ class GanttsControllerTest < Redmine::ControllerTest :member_roles, :members, :enabled_modules, - :versions + :versions, + :email_addresses def test_gantt_should_work i2 = Issue.find(2) diff --git a/test/functional/news_controller_test.rb b/test/functional/news_controller_test.rb index 90a5a1112..951405763 100644 --- a/test/functional/news_controller_test.rb +++ b/test/functional/news_controller_test.rb @@ -20,7 +20,7 @@ require File.expand_path('../../test_helper', __FILE__) class NewsControllerTest < Redmine::ControllerTest fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles, :enabled_modules, :news, :comments, - :attachments + :attachments, :user_preferences def setup User.current = nil diff --git a/test/functional/settings_controller_test.rb b/test/functional/settings_controller_test.rb index 4c1019191..2215aa385 100644 --- a/test/functional/settings_controller_test.rb +++ b/test/functional/settings_controller_test.rb @@ -19,7 +19,7 @@ require File.expand_path('../../test_helper', __FILE__) class SettingsControllerTest < Redmine::ControllerTest fixtures :projects, :trackers, :issue_statuses, :issues, - :users + :users, :email_addresses def setup User.current = nil diff --git a/test/functional/welcome_controller_test.rb b/test/functional/welcome_controller_test.rb index 38533edac..8f486c219 100644 --- a/test/functional/welcome_controller_test.rb +++ b/test/functional/welcome_controller_test.rb @@ -18,7 +18,7 @@ require File.expand_path('../../test_helper', __FILE__) class WelcomeControllerTest < Redmine::ControllerTest - fixtures :projects, :news, :users, :members + fixtures :projects, :news, :users, :members, :roles, :member_roles, :enabled_modules def setup Setting.default_language = 'en' diff --git a/test/unit/custom_field_test.rb b/test/unit/custom_field_test.rb index ab6e09887..89b53caeb 100644 --- a/test/unit/custom_field_test.rb +++ b/test/unit/custom_field_test.rb @@ -20,7 +20,7 @@ require File.expand_path('../../test_helper', __FILE__) class CustomFieldTest < ActiveSupport::TestCase fixtures :custom_fields, :roles, :projects, :trackers, :issue_statuses, - :issues + :issues, :users def setup User.current = nil diff --git a/test/unit/journal_observer_test.rb b/test/unit/journal_observer_test.rb index a03fa402b..d3fb735c7 100644 --- a/test/unit/journal_observer_test.rb +++ b/test/unit/journal_observer_test.rb @@ -20,7 +20,7 @@ require File.expand_path('../../test_helper', __FILE__) class JournalObserverTest < ActiveSupport::TestCase fixtures :issues, :issue_statuses, :journals, :journal_details, :projects, :projects_trackers, :trackers, :enabled_modules, :enumerations, - :users, :email_addresses, :roles + :users, :email_addresses, :roles, :members, :member_roles def setup User.current = nil diff --git a/test/unit/lib/redmine/field_format/version_field_format_test.rb b/test/unit/lib/redmine/field_format/version_field_format_test.rb index 9543d8444..2984624d6 100644 --- a/test/unit/lib/redmine/field_format/version_field_format_test.rb +++ b/test/unit/lib/redmine/field_format/version_field_format_test.rb @@ -22,7 +22,8 @@ class Redmine::VersionFieldFormatTest < ActionView::TestCase fixtures :projects, :versions, :trackers, :roles, :users, :members, :member_roles, :issue_statuses, :issue_categories, :issue_relations, :workflows, - :enumerations, :custom_fields, :custom_fields_trackers + :enumerations, :custom_fields, :custom_fields_trackers, + :enabled_modules def setup super diff --git a/test/unit/project_copy_test.rb b/test/unit/project_copy_test.rb index efe3c6dde..19bb13a25 100644 --- a/test/unit/project_copy_test.rb +++ b/test/unit/project_copy_test.rb @@ -36,7 +36,7 @@ class ProjectCopyTest < ActiveSupport::TestCase :boards, :messages, :repositories, :news, :comments, - :documents + :documents, :attachments def setup User.current = nil diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb index 65295e38f..da89f91f6 100644 --- a/test/unit/repository_test.rb +++ b/test/unit/repository_test.rb @@ -33,7 +33,9 @@ class RepositoryTest < ActiveSupport::TestCase :members, :member_roles, :roles, - :enumerations + :enumerations, + :user_preferences, + :watchers include Redmine::I18n -- 2.39.5