fix finishing a build that has a canceled job on a stage

travis-ci · Aug 29, 2017 · a4b4e70 · a4b4e70
1 parent 65063a8
commit a4b4e70
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/lib/travis/hub/model/stage.rb b/lib/travis/hub/model/stage.rb
@@ -7,7 +7,7 @@ class Stage < ActiveRecord::Base
 
   event :start,  if: :start?
   event :finish, if: :finish?, to: Build::FINISHED_STATES
-  event :cancel
+  event :cancel, if: :finish?
   event :restart
   event :all, after: :propagate
 

diff --git a/spec/travis/hub/model/stage_spec.rb b/spec/travis/hub/model/stage_spec.rb
@@ -98,4 +98,18 @@ def reload
 
     it { expect(Travis::Event).to have_received(:dispatch).times(3) }
   end
+
+  describe 'cancel and fail' do
+    before { jobs[0].cancel! }
+    before { jobs[2].cancel! }
+    before { jobs[1].finish!(state: :failed, finished_at: now) }
+    before { reload }
+
+    it { expect(build.state).to eq :canceled }
+    it { expect(stages[0].state).to eq :canceled }
+    it { expect(stages[1].state).to eq :canceled }
+    it { expect(jobs[0].state).to eq :canceled }
+    it { expect(jobs[1].state).to eq :failed }
+    it { expect(jobs[2].state).to eq :canceled }
+  end
 end