diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-13 12:08:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-13 12:08:20 +0300 |
commit | 2d8c28f1d32709280506507f3b6e6d2da7440da9 (patch) | |
tree | 9ed8319e6cdddd1e03493b82c552ec8df590027f /spec/features/users | |
parent | 99bb3eedd09ba55be5934da8138e2678a3e1be4d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/users')
-rw-r--r-- | spec/features/users/login_spec.rb | 4 | ||||
-rw-r--r-- | spec/features/users/signup_spec.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/features/users/login_spec.rb b/spec/features/users/login_spec.rb index e6b9e77ce73..105e9f97989 100644 --- a/spec/features/users/login_spec.rb +++ b/spec/features/users/login_spec.rb @@ -103,7 +103,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions, feature_category: :system_ let(:alert_message) { "To continue, you need to select the link in the confirmation email we sent to verify your email address. If you didn't get our email, select Resend confirmation email" } before do - stub_application_setting(send_user_confirmation_email: true) + stub_application_setting_enum('email_confirmation_setting', 'hard') allow(User).to receive(:allow_unconfirmed_access_for).and_return grace_period stub_feature_flags(identity_verification: false) end @@ -953,7 +953,7 @@ RSpec.describe 'Login', :clean_gitlab_redis_sessions, feature_category: :system_ let(:alert_message) { "To continue, you need to select the link in the confirmation email we sent to verify your email address. If you didn't get our email, select Resend confirmation email" } before do - stub_application_setting(send_user_confirmation_email: true) + stub_application_setting_enum('email_confirmation_setting', 'hard') stub_feature_flags(soft_email_confirmation: true) stub_feature_flags(identity_verification: false) allow(User).to receive(:allow_unconfirmed_access_for).and_return grace_period diff --git a/spec/features/users/signup_spec.rb b/spec/features/users/signup_spec.rb index 6171aa3a058..1057ae48c7d 100644 --- a/spec/features/users/signup_spec.rb +++ b/spec/features/users/signup_spec.rb @@ -197,7 +197,7 @@ RSpec.describe 'Signup', feature_category: :users do context 'with no errors' do context 'when sending confirmation email' do before do - stub_application_setting(send_user_confirmation_email: true) + stub_application_setting_enum('email_confirmation_setting', 'hard') end context 'when soft email confirmation is not enabled' do @@ -239,7 +239,7 @@ RSpec.describe 'Signup', feature_category: :users do context "when not sending confirmation email" do before do - stub_application_setting(send_user_confirmation_email: false) + stub_application_setting_enum('email_confirmation_setting', 'off') end it 'creates the user account and goes to dashboard' do |