summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-08-10 19:23:45 +0000
committerRémy Coutable <remy@rymai.me>2017-08-10 19:23:45 +0000
commita16ace9285ac2f937b244f82f066b18e4ea613bb (patch)
treef356f6ed3b4a49e48791acf0255c7cda7c6f6504
parent3a9f210b5ce44f1a464e765ff6e95c1eac5363d8 (diff)
parent76544283ea342cc82f15afb89c7c5a12eb6bfd8f (diff)
downloadgitlab-ce-a16ace9285ac2f937b244f82f066b18e4ea613bb.tar.gz
Merge branch 'rs-fix-stubbed-user-factory' into 'master'
Manually assign `notification_email` in the User factory when stubbed See merge request !13395
-rw-r--r--spec/factories/users.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/factories/users.rb b/spec/factories/users.rb
index e60fe713bc3..0486a413fb2 100644
--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -8,6 +8,10 @@ FactoryGirl.define do
confirmation_token { nil }
can_create_group true
+ after(:stub) do |user|
+ user.notification_email = user.email
+ end
+
before(:create) do |user|
user.ensure_rss_token
end