1 files changed, 19 insertions, 63 deletions
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 334f9b4ae30..ca4c38d4663 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -5407,43 +5407,11 @@ RSpec.describe User do
   end
 
   describe '#password_expired_if_applicable?' do
-    let(:user) { build(:user, password_expires_at: password_expires_at, password_automatically_set: set_automatically?) }
+    let(:user) { build(:user, password_expires_at: password_expires_at) }
 
     subject { user.password_expired_if_applicable? }
 
-    context 'when user is not ldap user' do
-      context 'when user has password set automatically' do
-        let(:set_automatically?) { true }
-
-        context 'when password_expires_at is not set' do
-          let(:password_expires_at) {}
-
-          it 'returns false' do
-            is_expected.to be_falsey
-          end
-        end
-
-        context 'when password_expires_at is in the past' do
-          let(:password_expires_at) { 1.minute.ago }
-
-          it 'returns true' do
-            is_expected.to be_truthy
-          end
-        end
-
-        context 'when password_expires_at is in the future' do
-          let(:password_expires_at) { 1.minute.from_now }
-
-          it 'returns false' do
-            is_expected.to be_falsey
-          end
-        end
-      end
-    end
-
-    context 'when user has password not set automatically' do
-      let(:set_automatically?) { false }
-
+    shared_examples 'password expired not applicable' do
       context 'when password_expires_at is not set' do
         let(:password_expires_at) {}
 
@@ -5469,13 +5437,7 @@ RSpec.describe User do
       end
     end
 
-    context 'when user is ldap user' do
-      let(:user) { build(:user, password_expires_at: password_expires_at) }
-
-      before do
-        allow(user).to receive(:ldap_user?).and_return(true)
-      end
-
+    context 'with a regular user' do
       context 'when password_expires_at is not set' do
         let(:password_expires_at) {}
 
@@ -5487,8 +5449,8 @@ RSpec.describe User do
       context 'when password_expires_at is in the past' do
         let(:password_expires_at) { 1.minute.ago }
 
-        it 'returns false' do
-          is_expected.to be_falsey
+        it 'returns true' do
+          is_expected.to be_truthy
         end
       end
 
@@ -5501,32 +5463,26 @@ RSpec.describe User do
       end
     end
 
-    context 'when user is a project bot' do
-      let(:user) { build(:user, :project_bot, password_expires_at: password_expires_at) }
-
-      context 'when password_expires_at is not set' do
-        let(:password_expires_at) {}
-
-        it 'returns false' do
-          is_expected.to be_falsey
-        end
+    context 'when user is a bot' do
+      before do
+        allow(user).to receive(:bot?).and_return(true)
       end
 
-      context 'when password_expires_at is in the past' do
-        let(:password_expires_at) { 1.minute.ago }
+      it_behaves_like 'password expired not applicable'
+    end
 
-        it 'returns false' do
-          is_expected.to be_falsey
-        end
-      end
+    context 'when password_automatically_set is true' do
+      let(:user) { create(:omniauth_user, provider: 'ldap')}
 
-      context 'when password_expires_at is in the future' do
-        let(:password_expires_at) { 1.minute.from_now }
+      it_behaves_like 'password expired not applicable'
+    end
 
-        it 'returns false' do
-          is_expected.to be_falsey
-        end
+    context 'when allow_password_authentication is false' do
+      before do
+        allow(user).to receive(:allow_password_authentication?).and_return(false)
       end
+
+      it_behaves_like 'password expired not applicable'
     end
   end