summaryrefslogtreecommitdiff
path: root/spec/controllers/application_controller_spec.rb
diff options
context:
space:
mode:
authorTiago Botelho <tiagonbotelho@hotmail.com>2017-09-13 12:18:15 +0100
committerDouwe Maan <douwe@selenight.nl>2017-11-20 18:02:41 +0100
commit053a1988467acecfdc941f13f183d28fb0a11f1c (patch)
tree5208f0b550a6016ecf7f771699892a33f42936a5 /spec/controllers/application_controller_spec.rb
parent7a61a8e09bcab5e0cb37ddb13900a5c07ef18918 (diff)
downloadgitlab-ce-053a1988467acecfdc941f13f183d28fb0a11f1c.tar.gz
Impersonation no longer gets stuck on password change.
Diffstat (limited to 'spec/controllers/application_controller_spec.rb')
-rw-r--r--spec/controllers/application_controller_spec.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index b73ca0c2346..768c7e99c96 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -6,6 +6,10 @@ describe ApplicationController do
describe '#check_password_expiration' do
let(:controller) { described_class.new }
+ before do
+ allow(controller).to receive(:session).and_return({})
+ end
+
it 'redirects if the user is over their password expiry' do
user.password_expires_at = Time.new(2002)