From 9bd7e5997e1452257e3861555c151764cf0574d7 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 15 Jul 2022 09:10:09 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/channels/application_cable/connection_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/channels') diff --git a/spec/channels/application_cable/connection_spec.rb b/spec/channels/application_cable/connection_spec.rb index affde0095cf..f5b2cdd2fca 100644 --- a/spec/channels/application_cable/connection_spec.rb +++ b/spec/channels/application_cable/connection_spec.rb @@ -12,7 +12,7 @@ RSpec.describe ApplicationCable::Connection, :clean_gitlab_redis_sessions do context 'when user is logged in' do let(:user) { create(:user) } - let(:session_hash) { { 'warden.user.user.key' => [[user.id], user.encrypted_password[0, 29]] } } + let(:session_hash) { { 'warden.user.user.key' => [[user.id], user.authenticatable_salt] } } it 'sets current_user' do connect @@ -21,7 +21,7 @@ RSpec.describe ApplicationCable::Connection, :clean_gitlab_redis_sessions do end context 'with a stale password' do - let(:partial_password_hash) { build(:user, password: 'some_old_password').encrypted_password[0, 29] } + let(:partial_password_hash) { build(:user, password: 'some_old_password').authenticatable_salt } let(:session_hash) { { 'warden.user.user.key' => [[user.id], partial_password_hash] } } it 'sets current_user to nil' do -- cgit v1.2.3