summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-07-25 13:59:50 +0200
committerJacob Vosmaer <jacob@gitlab.com>2017-07-25 15:23:41 +0200
commita78306e7fa0e815a5586a81ee9c2fcf095793de4 (patch)
treef2869c845434f433772d454bd347a4ae450c410c /spec
parentc2c8d7ffabaeb6514f7bf15fb5330c8402d80333 (diff)
downloadgitlab-ce-a78306e7fa0e815a5586a81ee9c2fcf095793de4.tar.gz
Enable gitaly_post_upload_pack by default
Diffstat (limited to 'spec')
-rw-r--r--spec/lib/gitlab/workhorse_spec.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb
index 7b39441e76e..6ca1edb01b9 100644
--- a/spec/lib/gitlab/workhorse_spec.rb
+++ b/spec/lib/gitlab/workhorse_spec.rb
@@ -237,7 +237,8 @@ describe Gitlab::Workhorse, lib: true do
context 'when action is not enabled by feature flag' do
it 'does not include Gitaly params in the returned value' do
- allow(Gitlab::GitalyClient).to receive(:feature_enabled?).with(feature_flag).and_return(false)
+ status_opt_out = Gitlab::GitalyClient::MigrationStatus::OPT_OUT
+ allow(Gitlab::GitalyClient).to receive(:feature_enabled?).with(feature_flag, status: status_opt_out).and_return(false)
expect(subject).not_to include(gitaly_params)
end