summaryrefslogtreecommitdiffstats
path: root/test/integration
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-01-17 14:14:12 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-01-17 14:14:12 +0000
commite3618bdbecd9b5d86eb6d2c8c256ba3fcdf05189 (patch)
tree3b54c10eecece6cc2674491a76a4e5e932d82d1e /test/integration
parent7f29c2fd88f271ac59f1c10b90942fec57b35ae2 (diff)
downloadredmine-e3618bdbecd9b5d86eb6d2c8c256ba3fcdf05189.tar.gz
redmine-e3618bdbecd9b5d86eb6d2c8c256ba3fcdf05189.zip
Add support for multiple email addresses per user (#4244).
git-svn-id: http://svn.redmine.org/redmine/trunk@13886 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/integration')
-rw-r--r--test/integration/account_test.rb2
-rw-r--r--test/integration/api_test/users_test.rb2
-rw-r--r--test/integration/issues_test.rb2
-rw-r--r--test/integration/users_test.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb
index bf458b734..7f2f0e4ff 100644
--- a/test/integration/account_test.rb
+++ b/test/integration/account_test.rb
@@ -18,7 +18,7 @@
require File.expand_path('../../test_helper', __FILE__)
class AccountTest < Redmine::IntegrationTest
- fixtures :users, :roles
+ fixtures :users, :email_addresses, :roles
def test_login
get "/my/page"
diff --git a/test/integration/api_test/users_test.rb b/test/integration/api_test/users_test.rb
index f1a0e1055..d8d78ad0e 100644
--- a/test/integration/api_test/users_test.rb
+++ b/test/integration/api_test/users_test.rb
@@ -18,7 +18,7 @@
require File.expand_path('../../../test_helper', __FILE__)
class Redmine::ApiTest::UsersTest < Redmine::ApiTest::Base
- fixtures :users, :members, :member_roles, :roles, :projects
+ fixtures :users, :email_addresses, :members, :member_roles, :roles, :projects
test "GET /users.xml should return users" do
get '/users.xml', {}, credentials('admin')
diff --git a/test/integration/issues_test.rb b/test/integration/issues_test.rb
index d26281172..981fdb760 100644
--- a/test/integration/issues_test.rb
+++ b/test/integration/issues_test.rb
@@ -19,7 +19,7 @@ require File.expand_path('../../test_helper', __FILE__)
class IssuesTest < Redmine::IntegrationTest
fixtures :projects,
- :users,
+ :users, :email_addresses,
:roles,
:members,
:member_roles,
diff --git a/test/integration/users_test.rb b/test/integration/users_test.rb
index ea7f06c12..1ae2f27d6 100644
--- a/test/integration/users_test.rb
+++ b/test/integration/users_test.rb
@@ -18,7 +18,7 @@
require File.expand_path('../../test_helper', __FILE__)
class UsersTest < Redmine::IntegrationTest
- fixtures :users
+ fixtures :users, :email_addresses
def test_destroy_should_not_accept_get_requests
assert_no_difference 'User.count' do