diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/models/ci/pipeline_spec.rb | 10 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 1 |
2 files changed, 7 insertions, 4 deletions
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index 9478b011a71..721b20e0cb2 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -128,11 +128,13 @@ describe Ci::Pipeline, models: true do describe '#duration' do before do - allow(Gitlab::Utils).to receive(:now). - and_return(current - 120, current) + travel_to(current - 120) do + pipeline.run + end - pipeline.run - pipeline.succeed + travel_to(current) do + pipeline.succeed + end end it 'matches sum of builds duration' do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 2e2aa7c4fc0..c144cd85487 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -33,6 +33,7 @@ RSpec.configure do |config| config.include EmailHelpers config.include TestEnv config.include ActiveJob::TestHelper + config.include ActiveSupport::Testing::TimeHelpers config.include StubGitlabCalls config.include StubGitlabData |