diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-26 10:39:15 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-26 10:39:15 +0000 |
| commit | 96dba2ca17878eda915e13a7a00aad5831e03c36 (patch) | |
| tree | 9a6f355898fefd3fc28d1001baf77a74364470c2 /spec | |
| parent | 1a2b92f7f6fd3a533654aae22c4e2b9e5db567ee (diff) | |
| parent | a78306e7fa0e815a5586a81ee9c2fcf095793de4 (diff) | |
| download | gitlab-ce-96dba2ca17878eda915e13a7a00aad5831e03c36.tar.gz | |
Merge branch 'post-upload-pack-opt-out' into 'master'
Enable gitaly_post_upload_pack by default
See merge request !13078
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/gitlab/workhorse_spec.rb | 3 |
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 |