From c12ad9259fbff0be7f553a575319ae027741692c Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 30 Mar 2022 14:11:33 +0000 Subject: Add latest changes from gitlab-org/security/gitlab@14-7-stable-ee --- spec/models/user_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/models/user_spec.rb') diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index c2535fd3698..eedf4ad1e65 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1696,9 +1696,9 @@ RSpec.describe User do describe '#generate_password' do it 'does not generate password by default' do - user = create(:user, password: Gitlab::Password.test_default) + user = create(:user, password: 'abcdefghe') - expect(user.password).to eq(Gitlab::Password.test_default) + expect(user.password).to eq('abcdefghe') end end -- cgit v1.2.1 From a3a48d8ad7ed4648eb9e09b7f2ca7893c561c2cf Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 31 Mar 2022 00:06:49 +0000 Subject: Add latest changes from gitlab-org/security/gitlab@14-7-stable-ee --- spec/models/user_spec.rb | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'spec/models/user_spec.rb') diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index eedf4ad1e65..cd8be088c6c 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -5792,6 +5792,36 @@ RSpec.describe User do end end + describe '#valid_password?' do + subject { user.valid_password?(password) } + + context 'user with password not in disallowed list' do + let(:user) { create(:user) } + let(:password) { user.password } + + it { is_expected.to be_truthy } + + context 'using a wrong password' do + let(:password) { 'WRONG PASSWORD' } + + it { is_expected.to be_falsey } + end + end + + context 'user with disallowed password' do + let(:user) { create(:user, :disallowed_password) } + let(:password) { user.password } + + it { is_expected.to be_falsey } + + context 'using a wrong password' do + let(:password) { 'WRONG PASSWORD' } + + it { is_expected.to be_falsey } + end + end + end + describe '#password_expired?' do let(:user) { build(:user, password_expires_at: password_expires_at) } -- cgit v1.2.1