diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-06-01 11:56:29 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-01 11:56:29 +0000 |
| commit | edb9db37ede4aff12f06338e4fd8f30039cc8183 (patch) | |
| tree | 460bbcce4dd97fea12de3dd609345912636eadb9 /spec/support | |
| parent | cc5890f287b9dc5c117470d5b0925ba7f6d07485 (diff) | |
| download | gitlab-ce-edb9db37ede4aff12f06338e4fd8f30039cc8183.tar.gz | |
Add "deny disk access" Gitaly feature (tripswitch)
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/gitaly.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/support/gitaly.rb b/spec/support/gitaly.rb index 9cf541372b5..5a1dd44bc9d 100644 --- a/spec/support/gitaly.rb +++ b/spec/support/gitaly.rb @@ -7,7 +7,10 @@ RSpec.configure do |config| next if example.metadata[:skip_gitaly_mock] # Use 'and_wrap_original' to make sure the arguments are valid - allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_wrap_original { |m, *args| m.call(*args) || true } + allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_wrap_original do |m, *args| + m.call(*args) + !Gitlab::GitalyClient::EXPLICIT_OPT_IN_REQUIRED.include?(args.first) + end end end end |