Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-04 00:09:00 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-04 00:09:00 +0300
commit71c9d577ad563572050335dc261ba7673e3e566f (patch)
treedcb4bb47b2d843de160feffe26dcefe20403f3fc /spec/controllers/concerns
parent63a015fd85ae35634eb882d0078e65d80300816c (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/concerns')
-rw-r--r--spec/controllers/concerns/confirm_email_warning_spec.rb10
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