diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-11-20 15:29:56 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-11-20 15:29:56 +0300 |
| commit | 16346eb5b9b7aa1fa98a7eb7d9015f48856151ce (patch) | |
| tree | ac1b2786b8eeea2229f1db4d2e2e87de62d3d65e /spec/support | |
| parent | fa5900fb6b5bda6f8568319293575c3072e47505 (diff) | |
Revert "Merge branch 'revert-e2aa2177' into 'master'"
This reverts merge request !23229
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/gitaly.rb | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/spec/support/gitaly.rb b/spec/support/gitaly.rb deleted file mode 100644 index 614aaa73693..00000000000 --- a/spec/support/gitaly.rb +++ /dev/null @@ -1,16 +0,0 @@ -RSpec.configure do |config| - config.before(:each) do |example| - if example.metadata[:disable_gitaly] - # 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) && false } - else - 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 do |m, *args| - m.call(*args) - !Gitlab::GitalyClient.explicit_opt_in_required.include?(args.first) - end - end - end -end |