diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-30 16:54:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-30 16:54:01 +0300 |
commit | d111c2d301f43d0b6de98f47da39d2b107ce17a1 (patch) | |
tree | 92897bde1a5132063f4820b733a793d140785e03 /spec/models | |
parent | 5b713e1e9a309d1afff4c7068d1e03fbd6a5f7f7 (diff) |
Add latest changes from gitlab-org/security/gitlab@14-9-stable-ee
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/hooks/system_hook_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/user_spec.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/models/hooks/system_hook_spec.rb b/spec/models/hooks/system_hook_spec.rb index a3d36058b74..bf69c7219a8 100644 --- a/spec/models/hooks/system_hook_spec.rb +++ b/spec/models/hooks/system_hook_spec.rb @@ -37,7 +37,7 @@ RSpec.describe SystemHook do let(:project) { create(:project, namespace: user.namespace) } let(:group) { create(:group) } let(:params) do - { name: 'John Doe', username: 'jduser', email: 'jg@example.com', password: Gitlab::Password.test_default } + { name: 'John Doe', username: 'jduser', email: 'jg@example.com', password: 'mydummypass' } end before do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index b16a76211eb..d4e82b5798f 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1757,9 +1757,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 |