diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-22 12:07:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-22 12:07:51 +0300 |
| commit | 3ad11f24ca52d42694a8ce920a87ead6085d3f85 (patch) | |
| tree | d5b664aafa7c2b65f470a700431d336d908c0ebc /spec/lib/gitlab/health_checks/puma_check_spec.rb | |
| parent | 62fcb9ffa9e40db6f34e7dd0d36804d73ef01435 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/health_checks/puma_check_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/health_checks/puma_check_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/lib/gitlab/health_checks/puma_check_spec.rb b/spec/lib/gitlab/health_checks/puma_check_spec.rb index dd052a4dd2c..93ef81978a8 100644 --- a/spec/lib/gitlab/health_checks/puma_check_spec.rb +++ b/spec/lib/gitlab/health_checks/puma_check_spec.rb @@ -22,6 +22,7 @@ describe Gitlab::HealthChecks::PumaCheck do context 'when Puma is not loaded' do before do + allow(Gitlab::Runtime).to receive(:puma?).and_return(false) hide_const('Puma') end @@ -33,6 +34,7 @@ describe Gitlab::HealthChecks::PumaCheck do context 'when Puma is loaded' do before do + allow(Gitlab::Runtime).to receive(:puma?).and_return(true) stub_const('Puma', Module.new) end |