diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 06:07:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 06:07:45 +0300 |
commit | 9763c081708e4c2e08de1f4e9ca9abdef5cffe3c (patch) | |
tree | b27794ba1a039cdc42cdf5d90bcb7b7503437324 /spec/lib/gitlab/gitaly_client_spec.rb | |
parent | 7480d774dfca97ea905321d52c70fd19496f0084 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/gitaly_client_spec.rb')
-rw-r--r-- | spec/lib/gitlab/gitaly_client_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/gitaly_client_spec.rb b/spec/lib/gitlab/gitaly_client_spec.rb index 0d9719a5663..4b69b4734f1 100644 --- a/spec/lib/gitlab/gitaly_client_spec.rb +++ b/spec/lib/gitlab/gitaly_client_spec.rb @@ -26,7 +26,7 @@ describe Gitlab::GitalyClient do context 'running in Unicorn' do before do - allow(Gitlab::Runtime).to receive(:unicorn?).and_return(true) + stub_const('Unicorn', 1) end it { expect(subject.long_timeout).to eq(55) } @@ -34,7 +34,7 @@ describe Gitlab::GitalyClient do context 'running in Puma' do before do - allow(Gitlab::Runtime).to receive(:puma?).and_return(true) + stub_const('Puma', 1) end it { expect(subject.long_timeout).to eq(55) } |