Merge r23246 from trunk to 6.1-stable (#41623).

git-svn-id: https://svn.redmine.org/redmine/branches/6.0-stable@23266 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/test/integration/api_test/users_test.rb b/test/integration/api_test/users_test.rb
index 27772be29b4d32affe9fb575c4e19404df51d4f0..e977379c0823aebdf585a53187f0e11393f3a924 100644 (file)
--- a/test/integration/api_test/users_test.rb
+++ b/test/integration/api_test/users_test.rb
@@ -20,7 +20,7 @@
 require_relative '../../test_helper'
 
 class Redmine::ApiTest::UsersTest < Redmine::ApiTest::Base
-  fixtures :users, :groups_users, :email_addresses, :members, :member_roles, :roles, :projects
+  fixtures :users, :groups_users, :email_addresses, :members, :member_roles, :roles, :projects, :auth_sources
 
   test "GET /users.xml should return users" do
     users = User.active.order('login')

diff --git a/test/unit/changeset_test.rb b/test/unit/changeset_test.rb
index 6552821892bd0c201a1b5d026c9602f3c1bd2d69..af7e315314acaa496e9e87d2aabd524f1593a2b7 100644 (file)
--- a/test/unit/changeset_test.rb
+++ b/test/unit/changeset_test.rb
@@ -20,8 +20,9 @@
 require_relative '../test_helper'
 
 class ChangesetTest < ActiveSupport::TestCase
-  fixtures :projects, :repositories,
+  fixtures :projects, :repositories, :versions,
            :issues, :issue_statuses, :issue_categories,
+           :watchers,
            :journals, :journal_details,
            :workflows,
            :changesets, :changes,

diff --git a/test/unit/lib/redmine/field_format/numeric_format_test.rb b/test/unit/lib/redmine/field_format/numeric_format_test.rb
index 4e074feea02107f66ebb42a7730041825869ab9c..a3a30cf4084a50fa73f0d9092e23e4ed8608bf93 100644 (file)
--- a/test/unit/lib/redmine/field_format/numeric_format_test.rb
+++ b/test/unit/lib/redmine/field_format/numeric_format_test.rb
@@ -23,7 +23,7 @@ require 'redmine/field_format'
 class Redmine::NumericFieldFormatTest < ActionView::TestCase
   fixtures :projects, :users, :issue_statuses, :enumerations,
            :trackers, :projects_trackers, :roles, :member_roles,
-           :members, :enabled_modules
+           :members, :enabled_modules, :issues
 
   def setup
     User.current = nil