summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-05-07 21:32:23 +0000
committerStan Hu <stanhu@gmail.com>2017-05-07 21:32:23 +0000
commit5527342330ab72c6e9061f1736c953208c508823 (patch)
tree6e2ee8dea85cd094507b13e54f91551801e1f2b1
parent8cd578a7da7c06588babe61e9bd1a2ed0c6ef2d7 (diff)
parentb1f753f7f252945708aa9e7f2f6c0f140ab09ed8 (diff)
downloadgitlab-ce-5527342330ab72c6e9061f1736c953208c508823.tar.gz
Merge branch 'correctly-stub-application-settings-in_signup_spec' into 'master'
Correctly stub application settings in signup_spec.rb See merge request !11151
-rw-r--r--spec/features/signup_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/signup_spec.rb b/spec/features/signup_spec.rb
index 9fde8d6e5cf..d7b6dda4946 100644
--- a/spec/features/signup_spec.rb
+++ b/spec/features/signup_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
feature 'Signup', feature: true do
describe 'signup with no errors' do
context "when sending confirmation email" do
- before { allow_any_instance_of(ApplicationSetting).to receive(:send_user_confirmation_email).and_return(true) }
+ before { stub_application_setting(send_user_confirmation_email: true) }
it 'creates the user account and sends a confirmation email' do
user = build(:user)
@@ -23,7 +23,7 @@ feature 'Signup', feature: true do
end
context "when not sending confirmation email" do
- before { allow_any_instance_of(ApplicationSetting).to receive(:send_user_confirmation_email).and_return(false) }
+ before { stub_application_setting(send_user_confirmation_email: false) }
it 'creates the user account and goes to dashboard' do
user = build(:user)