Skip to content
Snippets Groups Projects
Commit 5f938bc9 authored by Robert Marshall's avatar Robert Marshall
Browse files

Refactor workhorse helper rspec tests


- Reduce complexity in workhorse helper rspec tests to reflet the
  refactor we have made

Signed-off-by: default avatarRobert Marshall <rmarshall@gitlab.com>
parent 883749a6
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -10,7 +10,7 @@ RSpec.describe GitlabWorkhorseHelper do
 
context 'workhorse is listening on a tcp socket' do
cached(:chef_run) { converge_config }
let(:tcp_address) { '10.0.1.42' }
let(:tcp_address) { '1.9.8.4' }
 
before do
stub_gitlab_rb(
Loading
Loading
@@ -29,71 +29,18 @@ RSpec.describe GitlabWorkhorseHelper do
end
 
context 'workhorse is listening on a unix socket' do
let(:new_directory) { '/var/opt/gitlab/gitlab-workhorse/sockets' }
let(:deprecated_custom) { '/where/is/my/ten/mm/socket' }
let(:new_custom_directory) { '/where/is/my/ten/mm/sockets' }
context 'with default workhorse configuration' do
cached(:chef_run) { converge_config }
before do
stub_gitlab_rb(
gitlab_workhorse: {
listen_network: 'unix'
}
)
end
describe '#sockets_directory' do
it 'returns the default directory path' do
expect(subject.sockets_directory).to eq(new_directory)
end
end
describe '#unix_socket?' do
it 'returns true' do
expect(subject.unix_socket?).to be true
end
end
cached(:chef_run) { converge_config }
before do
stub_gitlab_rb(
gitlab_workhorse: {
listen_network: 'unix'
}
)
end
 
context 'with custom workhorse listen_addr' do
context 'without sockets_directory configured' do
cached(:chef_run) { converge_config }
before do
stub_gitlab_rb(
gitlab_workhorse: {
listen_network: 'unix',
listen_addr: deprecated_custom
}
)
end
describe '#user_customized_socket?' do
it 'should be true when listen_addr is set' do
expect(subject.user_customized_socket?).to be true
end
end
end
context 'with sockets_directory configured' do
cached(:chef_run) { converge_config }
before do
stub_gitlab_rb(
gitlab_workhorse: {
listen_network: 'unix',
listen_addr: deprecated_custom,
sockets_directory: new_custom_directory
}
)
end
describe '#sockets_directory' do
it 'returns the user configured sockets directory path' do
expect(subject.sockets_directory).to eq(new_custom_directory)
end
end
describe '#unix_socket?' do
it 'returns true' do
expect(subject.unix_socket?).to be true
end
end
end
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment