diff options
| author | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-11-14 19:53:32 +0100 |
|---|---|---|
| committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-11-14 22:35:27 +0100 |
| commit | 6545e56d929d7e3df4c176e8f2f0c64c784857a0 (patch) | |
| tree | 21fdfb215c4487baf1d32c971f57bb319fe2e5c0 | |
| parent | 3d24c01a1925475b35d072e0cad971939a9e8564 (diff) | |
| download | gitlab-ce-6545e56d929d7e3df4c176e8f2f0c64c784857a0.tar.gz | |
we need to disable gitaly for some tests
| -rw-r--r-- | spec/support/gitaly.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/spec/support/gitaly.rb b/spec/support/gitaly.rb index 89fb362cf14..1512b3e0620 100644 --- a/spec/support/gitaly.rb +++ b/spec/support/gitaly.rb @@ -1,6 +1,10 @@ RSpec.configure do |config| config.before(:each) do |example| - next if example.metadata[:skip_gitaly_mock] - allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(true) + if example.metadata[:disable_gitaly] + allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(false) + else + next if example.metadata[:skip_gitaly_mock] + allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(true) + end end end |