diff options
author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-06-05 18:51:14 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-06-05 18:51:14 +0300 |
commit | a0808df0b627180d7773d5d13a0f64d6e7c45f5d (patch) | |
tree | cd33f1aa2b27747ff09d10d74d2606a274dba565 /spec/models/merge_request_spec.rb | |
parent | 78d2e91b7c514c1d743294ae014f24eec7cb7d52 (diff) |
Find and mark more Git disk access locations
Diffstat (limited to 'spec/models/merge_request_spec.rb')
-rw-r--r-- | spec/models/merge_request_spec.rb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 7e85a99494a..3f028b3bd5c 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -16,7 +16,11 @@ describe MergeRequest do describe '#squash_in_progress?' do shared_examples 'checking whether a squash is in progress' do - let(:repo_path) { subject.source_project.repository.path } + let(:repo_path) do + Gitlab::GitalyClient::StorageSettings.allow_disk_access do + subject.source_project.repository.path + end + end let(:squash_path) { File.join(repo_path, "gitlab-worktree", "squash-#{subject.id}") } before do @@ -2197,7 +2201,11 @@ describe MergeRequest do describe '#rebase_in_progress?' do shared_examples 'checking whether a rebase is in progress' do - let(:repo_path) { subject.source_project.repository.path } + let(:repo_path) do + Gitlab::GitalyClient::StorageSettings.allow_disk_access do + subject.source_project.repository.path + end + end let(:rebase_path) { File.join(repo_path, "gitlab-worktree", "rebase-#{subject.id}") } before do |