Commit 2b0f4df0 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'sh-fix-detect-host-keys' into 'master'

Fix Detect Host Keys not working

Closes #56855

See merge request gitlab-org/gitlab-ce!24884
parents c48f29c1 4c1231ac
......@@ -54,7 +54,7 @@ class SshHostKey
# Needed for reactive caching
def self.primary_key
'id'
:id
end
def id
......
---
title: Fix Detect Host Keys not working
merge_request: 24884
author:
type: fixed
......@@ -50,6 +50,12 @@ describe SshHostKey do
subject(:ssh_host_key) { described_class.new(project: project, url: 'ssh://example.com:2222', compare_host_keys: compare_host_keys) }
describe '.primary_key' do
it 'returns a symbol' do
expect(described_class.primary_key).to eq(:id)
end
end
describe '#fingerprints', :use_clean_rails_memory_store_caching do
it 'returns an array of indexed fingerprints when the cache is filled' do
stub_reactive_cache(ssh_host_key, known_hosts: known_hosts)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment