diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 15:07:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-12 15:07:33 +0300 |
| commit | 784fae4b9d7e92350075df2a43d06893080ed1e6 (patch) | |
| tree | c7a6fd444acd6897622b233b250a34fd176f01da /spec/lib/gitlab/metrics | |
| parent | fc53ce8e6ca67bf217470179a1ea6cf139bcffad (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/metrics')
| -rw-r--r-- | spec/lib/gitlab/metrics/requests_rack_middleware_spec.rb | 1 | ||||
| -rw-r--r-- | spec/lib/gitlab/metrics/samplers/unicorn_sampler_spec.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/spec/lib/gitlab/metrics/requests_rack_middleware_spec.rb b/spec/lib/gitlab/metrics/requests_rack_middleware_spec.rb index 335670278c4..1fc6fdcf622 100644 --- a/spec/lib/gitlab/metrics/requests_rack_middleware_spec.rb +++ b/spec/lib/gitlab/metrics/requests_rack_middleware_spec.rb @@ -4,6 +4,7 @@ require 'spec_helper' describe Gitlab::Metrics::RequestsRackMiddleware do let(:app) { double('app') } + subject { described_class.new(app) } describe '#call' do diff --git a/spec/lib/gitlab/metrics/samplers/unicorn_sampler_spec.rb b/spec/lib/gitlab/metrics/samplers/unicorn_sampler_spec.rb index cdfd95e3885..a64aae73d43 100644 --- a/spec/lib/gitlab/metrics/samplers/unicorn_sampler_spec.rb +++ b/spec/lib/gitlab/metrics/samplers/unicorn_sampler_spec.rb @@ -52,6 +52,7 @@ describe Gitlab::Metrics::Samplers::UnicornSampler do context 'unicorn listens on tcp sockets' do let(:tcp_socket_address) { '0.0.0.0:8080' } let(:tcp_sockets) { [tcp_socket_address] } + before do allow(unicorn).to receive(:listener_names).and_return(tcp_sockets) end |