From 85dc423f7090da0a52c73eb66faf22ddb20efff9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 19 Sep 2020 01:45:44 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-4-stable-ee --- spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb') diff --git a/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb b/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb index 59a70ac74a5..eb6c83096b9 100644 --- a/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb +++ b/spec/lib/gitlab/metrics/samplers/ruby_sampler_spec.rb @@ -12,7 +12,7 @@ RSpec.describe Gitlab::Metrics::Samplers::RubySampler do describe '#initialize' do it 'sets process_start_time_seconds' do - Timecop.freeze do + freeze_time do expect(sampler.metrics[:process_start_time_seconds].get).to eq(Time.now.to_i) end end -- cgit v1.2.1