summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMarius Balteanu <marius.balteanu@zitec.com>2024-11-13 07:16:14 +0000
committerMarius Balteanu <marius.balteanu@zitec.com>2024-11-13 07:16:14 +0000
commit7415e3d2406da96656aea5b58477a8137fd2727c (patch)
treee6608a4f8c61c560e1c128f62ce9cae21a44a654 /test
parenta9b1e6ca383b2f523731535773dbb006203e7716 (diff)
downloadredmine-7415e3d2406da96656aea5b58477a8137fd2727c.tar.gz
redmine-7415e3d2406da96656aea5b58477a8137fd2727c.zip
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
Diffstat (limited to 'test')
-rw-r--r--test/integration/api_test/users_test.rb2
-rw-r--r--test/unit/changeset_test.rb3
-rw-r--r--test/unit/lib/redmine/field_format/numeric_format_test.rb2
3 files changed, 4 insertions, 3 deletions
diff --git a/test/integration/api_test/users_test.rb b/test/integration/api_test/users_test.rb
index 27772be29..e977379c0 100644
--- 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 655282189..af7e31531 100644
--- 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 4e074feea..a3a30cf40 100644
--- 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