From 1d7c0390722c96aa66af5b26f5a826b97293dcd6 Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Thu, 31 Aug 2017 22:03:41 +0900
Subject: Fix enum lists

---
 spec/models/commit_status_spec.rb | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'spec/models/commit_status_spec.rb')

diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index f7583645e69..4fd330ab7dc 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -443,4 +443,24 @@ describe CommitStatus do
       end
     end
   end
+
+  describe 'set failure_reason when drop' do
+    let(:build) { create(:ci_build, :created) }
+
+    before do
+      build.drop!(reason)
+    end
+
+    context 'when failure_reason is nil' do
+      let(:reason) { }
+
+      it { expect(build).to be_unknown_failure }
+    end
+
+    context 'when failure_reason is job_failure' do
+      let(:reason) { :job_failure }
+
+      it { expect(build).to be_job_failure }
+    end
+  end
 end
-- 
cgit v1.2.1


From 68f6c61cf621db82ac98d561782590b1866fcf6f Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Fri, 1 Sep 2017 16:52:11 +0900
Subject: - Allow runner API to pass failure_reason - Fix spec

---
 spec/models/commit_status_spec.rb | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'spec/models/commit_status_spec.rb')

diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index 4fd330ab7dc..f5c1db79823 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -445,22 +445,20 @@ describe CommitStatus do
   end
 
   describe 'set failure_reason when drop' do
-    let(:build) { create(:ci_build, :created) }
+    let(:commit_status) { create(:commit_status, :created) }
 
-    before do
-      build.drop!(reason)
-    end
+    subject { commit_status.drop!(reason); commit_status }
 
     context 'when failure_reason is nil' do
       let(:reason) { }
 
-      it { expect(build).to be_unknown_failure }
+      it { is_expected.to be_unknown_failure }
     end
 
     context 'when failure_reason is job_failure' do
       let(:reason) { :job_failure }
 
-      it { expect(build).to be_job_failure }
+      it { is_expected.to be_job_failure }
     end
   end
 end
-- 
cgit v1.2.1


From e8e8ae4d7df1de71d9f52e774607ac1ba4cce1cc Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Fri, 1 Sep 2017 22:01:26 +0900
Subject: Fix spec

---
 spec/models/commit_status_spec.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'spec/models/commit_status_spec.rb')

diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index f5c1db79823..0a6b0023dea 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -447,7 +447,10 @@ describe CommitStatus do
   describe 'set failure_reason when drop' do
     let(:commit_status) { create(:commit_status, :created) }
 
-    subject { commit_status.drop!(reason); commit_status }
+    subject do
+      commit_status.drop!(reason)
+      commit_status
+    end
 
     context 'when failure_reason is nil' do
       let(:reason) { }
-- 
cgit v1.2.1


From 38d9b4d77d85e26f827ff9640243494adc8597ed Mon Sep 17 00:00:00 2001
From: Shinya Maeda <shinya@gitlab.com>
Date: Tue, 5 Sep 2017 15:10:34 +0900
Subject: Use script_failure. Add runner_system_failure. Improve spec.

---
 spec/models/commit_status_spec.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'spec/models/commit_status_spec.rb')

diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index 0a6b0023dea..858ec831200 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -458,10 +458,10 @@ describe CommitStatus do
       it { is_expected.to be_unknown_failure }
     end
 
-    context 'when failure_reason is job_failure' do
-      let(:reason) { :job_failure }
+    context 'when failure_reason is script_failure' do
+      let(:reason) { :script_failure }
 
-      it { is_expected.to be_job_failure }
+      it { is_expected.to be_script_failure }
     end
   end
 end
-- 
cgit v1.2.1