diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-03 21:09:00 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-03 21:09:00 +0000 |
commit | 71c9d577ad563572050335dc261ba7673e3e566f (patch) | |
tree | dcb4bb47b2d843de160feffe26dcefe20403f3fc /spec/controllers/concerns/confirm_email_warning_spec.rb | |
parent | 63a015fd85ae35634eb882d0078e65d80300816c (diff) | |
download | gitlab-ce-71c9d577ad563572050335dc261ba7673e3e566f.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/concerns/confirm_email_warning_spec.rb')
-rw-r--r-- | spec/controllers/concerns/confirm_email_warning_spec.rb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/spec/controllers/concerns/confirm_email_warning_spec.rb b/spec/controllers/concerns/confirm_email_warning_spec.rb index 56a6efab8ed..93e3423261c 100644 --- a/spec/controllers/concerns/confirm_email_warning_spec.rb +++ b/spec/controllers/concerns/confirm_email_warning_spec.rb @@ -5,7 +5,6 @@ require 'spec_helper' describe ConfirmEmailWarning do before do stub_feature_flags(soft_email_confirmation: true) - allow(User).to receive(:allow_unconfirmed_access_for).and_return 2.days end controller(ApplicationController) do @@ -52,15 +51,6 @@ describe ConfirmEmailWarning do context 'with an unconfirmed user' do let(:user) { create(:user, confirmed_at: nil) } - context 'when executing a peek request' do - before do - request.path = '/-/peek' - get :index - end - - it { is_expected.not_to set_confirm_warning_for(user.email) } - end - context 'when executing a json request' do before do get :index, format: :json |