1 files changed, 8 insertions, 5 deletions
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index b73ca0c2346..fe95d1ef9cd 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)
 
@@ -37,14 +41,13 @@ describe ApplicationController do
       controller.send(:check_password_expiration)
     end
 
-    it 'redirects if the user is over their password expiry and sign-in is disabled' do
-      stub_application_setting(password_authentication_enabled: false)
+    it 'does not redirect if the user is over their password expiry but password authentication is disabled for the web interface' do
+      stub_application_setting(password_authentication_enabled_for_web: false)
+      stub_application_setting(password_authentication_enabled_for_git: false)
       user.password_expires_at = Time.new(2002)
 
-      expect(user.ldap_user?).to be_falsey
       allow(controller).to receive(:current_user).and_return(user)
-      expect(controller).to receive(:redirect_to)
-      expect(controller).to receive(:new_profile_password_path)
+      expect(controller).not_to receive(:redirect_to)
 
       controller.send(:check_password_expiration)
     end