Commit 11edb83a authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'gitaly-fix-broken-specs' into 'master'

skip_gitaly_mock disables Gitaly in specs

See merge request gitlab-org/gitlab-ce!15383
RSpec.configure do |config| RSpec.configure do |config|
config.before(:each) do |example| config.before(:each) do |example|
next if example.metadata[:skip_gitaly_mock] if example.metadata[:disable_gitaly]
allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(true) allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(false)
next if example.metadata[:skip_gitaly_mock]
allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(true)
end end
end end
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment