From 33de33198560844a32e4ed60f9f6476b7c6aa6aa Mon Sep 17 00:00:00 2001 From: Tomasz Maczukin Date: Tue, 17 Apr 2018 15:51:53 +0200 Subject: [PATCH] Move Ci::BuildMetadata#update_timeout_state to after_transition callback --- app/models/ci/build.rb | 2 +- spec/models/ci/build_spec.rb | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 4aa65bf4273..3e3ef674dff 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -162,7 +162,7 @@ module Ci build.validates_dependencies! unless Feature.enabled?('ci_disable_validates_dependencies') end - before_transition pending: :running do |build| + after_transition pending: :running do |build| build.ensure_metadata.update_timeout_state end end diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index a12717835b0..d7075d4a6b4 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -2140,10 +2140,6 @@ describe Ci::Build do it "doesn't save timeout_source" do expect { run_job_without_exception }.not_to change { job.reload.ensure_metadata.timeout_source } end - - it 'raises an exception' do - expect { job.run! }.to raise_error(StateMachines::InvalidTransition) - end end end