Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-03-24 20:22:42 +0300
committerJacob Vosmaer <jacob@gitlab.com>2017-03-29 15:48:05 +0300
commit1904c80f3dd5437cb39aa90de933279bf9635678 (patch)
tree6de907068aadafc992ada78ffb0b484b1ad74faa /spec/lib/gitlab/workhorse_spec.rb
parenteee07f1c7cacdd24cbd66917ba66e703128f65c6 (diff)
Change socket_path to gitaly_address
Diffstat (limited to 'spec/lib/gitlab/workhorse_spec.rb')
-rw-r--r--spec/lib/gitlab/workhorse_spec.rb12
1 files changed, 4 insertions, 8 deletions
diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb
index 8e5e8288c49..535c96eeee9 100644
--- a/spec/lib/gitlab/workhorse_spec.rb
+++ b/spec/lib/gitlab/workhorse_spec.rb
@@ -184,18 +184,14 @@ describe Gitlab::Workhorse, lib: true do
it { expect(subject).to eq({ GL_ID: "user-#{user.id}", RepoPath: repository.path_to_repo }) }
- context 'when Gitaly socket path is present' do
- let(:gitaly_socket_path) { '/tmp/gitaly.sock' }
-
+ context 'when Gitaly is enabled' do
before do
- allow(Gitlab.config.gitaly).to receive(:socket_path).and_return(gitaly_socket_path)
+ allow(Gitlab.config.gitaly).to receive(:enabled).and_return(true)
end
it 'includes Gitaly params in the returned value' do
- expect(subject).to include({
- GitalyResourcePath: "/projects/#{repository.project.id}/git-http/info-refs",
- GitalySocketPath: gitaly_socket_path,
- })
+ gitaly_socket_path = URI(Gitlab::GitalyClient.get_address('default')).path
+ expect(subject).to include({ GitalySocketPath: gitaly_socket_path })
end
end
end