diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-07 12:30:31 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-07 12:30:31 +0000 |
commit | 5c0d8d59ff676373659e4215067f3640604576e0 (patch) | |
tree | 5fbb3df5e7f63eb23651f7898d75c0e6378590d4 /spec/support | |
parent | d40445e4c9964ae0ab793bfdd7ba530de4259716 (diff) | |
parent | 78089d1153ce9a2e3d32cbcaafb8f9757c56a9d4 (diff) | |
download | gitlab-ce-5c0d8d59ff676373659e4215067f3640604576e0.tar.gz |
Merge branch 'gitaly-mandatory' into 'master'
Remove option to disable Gitaly in Rails
See merge request !12677
Diffstat (limited to 'spec/support')
-rw-r--r-- | spec/support/gitaly.rb | 10 | ||||
-rw-r--r-- | spec/support/test_env.rb | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/spec/support/gitaly.rb b/spec/support/gitaly.rb index 2bf159002a0..89fb362cf14 100644 --- a/spec/support/gitaly.rb +++ b/spec/support/gitaly.rb @@ -1,8 +1,6 @@ -if Gitlab::GitalyClient.enabled? - 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) - end +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) end end diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 32546abcad4..0cae5620920 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -69,7 +69,7 @@ module TestEnv # Setup GitLab shell for test instance setup_gitlab_shell - setup_gitaly if Gitlab::GitalyClient.enabled? + setup_gitaly # Create repository for FactoryGirl.create(:project) setup_factory_repo |