1 files changed, 6 insertions, 12 deletions
diff --git a/spec/policies/global_policy_spec.rb b/spec/policies/global_policy_spec.rb
index 122612df355..ca9a5b1853c 100644
--- a/spec/policies/global_policy_spec.rb
+++ b/spec/policies/global_policy_spec.rb
@@ -249,15 +249,13 @@ RSpec.describe GlobalPolicy do
 
     context 'user with expired password' do
       before do
-        current_user.update!(password_expires_at: 2.minutes.ago, password_automatically_set: true)
+        current_user.update!(password_expires_at: 2.minutes.ago)
       end
 
       it { is_expected.not_to be_allowed(:access_api) }
 
       context 'when user is using ldap' do
-        before do
-          allow(current_user).to receive(:ldap_user?).and_return(true)
-        end
+        let(:current_user) { create(:omniauth_user, provider: 'ldap', password_expires_at: 2.minutes.ago) }
 
         it { is_expected.to be_allowed(:access_api) }
       end
@@ -445,15 +443,13 @@ RSpec.describe GlobalPolicy do
 
     context 'user with expired password' do
       before do
-        current_user.update!(password_expires_at: 2.minutes.ago, password_automatically_set: true)
+        current_user.update!(password_expires_at: 2.minutes.ago)
       end
 
       it { is_expected.not_to be_allowed(:access_git) }
 
       context 'when user is using ldap' do
-        before do
-          allow(current_user).to receive(:ldap_user?).and_return(true)
-        end
+        let(:current_user) { create(:omniauth_user, provider: 'ldap', password_expires_at: 2.minutes.ago) }
 
         it { is_expected.to be_allowed(:access_git) }
       end
@@ -537,15 +533,13 @@ RSpec.describe GlobalPolicy do
 
     context 'user with expired password' do
       before do
-        current_user.update!(password_expires_at: 2.minutes.ago, password_automatically_set: true)
+        current_user.update!(password_expires_at: 2.minutes.ago)
       end
 
       it { is_expected.not_to be_allowed(:use_slash_commands) }
 
       context 'when user is using ldap' do
-        before do
-          allow(current_user).to receive(:ldap_user?).and_return(true)
-        end
+        let(:current_user) { create(:omniauth_user, provider: 'ldap', password_expires_at: 2.minutes.ago) }
 
         it { is_expected.to be_allowed(:use_slash_commands) }
       end