diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-04 18:48:24 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-04 18:48:24 +0300 |
| commit | 20e3ed60935ca2b28cf1f632c5ce75f8dbac8e10 (patch) | |
| tree | fc27d630899a54b7e90cd25ddbdb0e099c9fdf72 /spec/lib/gitlab/workhorse_spec.rb | |
| parent | a46cca2e58643acd9d936442f98b12aaa84b9a26 (diff) | |
| parent | ca94d20013b9f4480d0ba4d9fc831b6021877f03 (diff) | |
Merge branch 'workhorse-gitaly-address' into 'master'
Pass GitalyAddress to workhorse
See merge request !10447
Diffstat (limited to 'spec/lib/gitlab/workhorse_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/workhorse_spec.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb index a5b7d9ad35f..9fbcb1fee69 100644 --- a/spec/lib/gitlab/workhorse_spec.rb +++ b/spec/lib/gitlab/workhorse_spec.rb @@ -188,8 +188,10 @@ describe Gitlab::Workhorse, lib: true do context 'when Gitaly is enabled' do let(:gitaly_params) do + address = Gitlab::GitalyClient.get_address('default') { - GitalySocketPath: URI(Gitlab::GitalyClient.get_address('default')).path, + GitalySocketPath: URI(address).path, + GitalyAddress: address, } end |