diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2017-06-20 17:42:54 +0200 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-06-20 17:42:54 +0200 |
| commit | 218da88e1aa7b0538d069ce9dc6e3a4348c610fc (patch) | |
| tree | ac31025caa313fd3218afaa50b76cf3c690f4aa9 | |
| parent | 4f8af50b619dd87c16035f56dce5cbde3531aef1 (diff) | |
| download | gitlab-ce-218da88e1aa7b0538d069ce9dc6e3a4348c610fc.tar.gz | |
Enable gitaly token auth when testing
| -rw-r--r-- | config/gitlab.yml.example | 1 | ||||
| -rw-r--r-- | lib/tasks/gitlab/gitaly.rake | 5 | ||||
| -rw-r--r-- | spec/tasks/gitlab/gitaly_rake_spec.rb | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 82dd53013f9..43a8c0078ca 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -599,6 +599,7 @@ test: gitaly_address: unix:tmp/tests/gitaly/gitaly.socket gitaly: enabled: true + token: secret backup: path: tmp/tests/backups gitlab_shell: diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake index e88111c3725..a8db5701d0b 100644 --- a/lib/tasks/gitlab/gitaly.rake +++ b/lib/tasks/gitlab/gitaly.rake @@ -58,8 +58,9 @@ namespace :gitlab do storages << { name: key, path: val['path'] } end - - TOML.dump(socket_path: address.sub(%r{\Aunix:}, ''), storage: storages) + config = { socket_path: address.sub(%r{\Aunix:}, ''), storage: storages } + config[:auth] = { token: 'secret' } if Rails.env.test? + TOML.dump(config) end def create_gitaly_configuration diff --git a/spec/tasks/gitlab/gitaly_rake_spec.rb b/spec/tasks/gitlab/gitaly_rake_spec.rb index cfa6c9ca8ce..c9a0f1cb144 100644 --- a/spec/tasks/gitlab/gitaly_rake_spec.rb +++ b/spec/tasks/gitlab/gitaly_rake_spec.rb @@ -89,6 +89,7 @@ describe 'gitlab:gitaly namespace rake task' do } } allow(Gitlab.config.repositories).to receive(:storages).and_return(config) + allow(Rails.env).to receive(:test?).and_return(false) expected_output = '' Timecop.freeze do |