Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 11 insertions, 1 deletions

diff --git a/spec/lib/gitlab/metrics/samplers/puma_sampler_spec.rb b/spec/lib/gitlab/metrics/samplers/puma_sampler_spec.rb
index 1097d26c320..df63f2ebe28 100644
--- a/spec/lib/gitlab/metrics/samplers/puma_sampler_spec.rb
+++ b/spec/lib/gitlab/metrics/samplers/puma_sampler_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Gitlab::Metrics::Samplers::PumaSampler do
-  subject { described_class.new(5) }
+  subject { described_class.new }
 
   let(:null_metric) { double('null_metric', set: nil, observe: nil) }
 
@@ -11,6 +11,16 @@ describe Gitlab::Metrics::Samplers::PumaSampler do
     allow(Gitlab::Metrics::NullMetric).to receive(:instance).and_return(null_metric)
   end
 
+  describe '#interval' do
+    it 'samples every five seconds by default' do
+      expect(subject.interval).to eq(5)
+    end
+
+    it 'samples at other intervals if requested' do
+      expect(described_class.new(11).interval).to eq(11)
+    end
+  end
+
   describe '#sample' do
     before do
       expect(subject).to receive(:puma_stats).and_return(puma_stats)