diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 18:06:05 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 18:06:05 +0300 |
commit | 5c521d1f9b1e389e2f9b2b5fccf3798159a10f8d (patch) | |
tree | 2460d9f5229b4b42b117b33584276d1040e2803c /spec/tasks/gitlab | |
parent | 6cdc0f32fabea92606c8cda040a3d0875914b906 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/tasks/gitlab')
-rw-r--r-- | spec/tasks/gitlab/shell_rake_spec.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/tasks/gitlab/shell_rake_spec.rb b/spec/tasks/gitlab/shell_rake_spec.rb index e3b7967bd19..abad16be580 100644 --- a/spec/tasks/gitlab/shell_rake_spec.rb +++ b/spec/tasks/gitlab/shell_rake_spec.rb @@ -14,8 +14,10 @@ describe 'gitlab:shell rake tasks' do storages = Gitlab::GitalyClient::StorageSettings.allow_disk_access do Gitlab.config.repositories.storages.values.map(&:legacy_disk_path) end - expect(Kernel).to receive(:system).with('bin/install', *storages).and_call_original - expect(Kernel).to receive(:system).with('bin/compile').and_call_original + + expect_any_instance_of(Gitlab::TaskHelpers).to receive(:checkout_or_clone_version) + allow(Kernel).to receive(:system).with('bin/install', *storages).and_return(true) + allow(Kernel).to receive(:system).with('bin/compile').and_return(true) run_rake_task('gitlab:shell:install') end |