summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-12-15 18:52:36 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-12-15 18:52:36 +0800
commitd9000184e5e8a63e0c24fe264e864fc27f6515c4 (patch)
treef4400e953ff24f1ba2a3e4b2632f461e8444e50f
parentb4a7e7cfbf2a79cf6ecdb8b251ad41c09a40e5bd (diff)
downloadgitlab-ce-show-commit-status-from-latest-pipeline.tar.gz
Add explicit status test, feedback:show-commit-status-from-latest-pipeline
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333#note_20058993 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333#note_20059060 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7333#note_20059357
-rw-r--r--spec/models/ci/pipeline_spec.rb2
-rw-r--r--spec/models/commit_spec.rb2
2 files changed, 4 insertions, 0 deletions
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index d06c30a891c..52dd41065e9 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -426,6 +426,7 @@ describe Ci::Pipeline, models: true do
it 'returns the latest status for the same ref and different sha' do
expect(latest_status).to eq(described_class.latest.status)
+ expect(latest_status).to eq('failed')
end
end
@@ -434,6 +435,7 @@ describe Ci::Pipeline, models: true do
it 'returns the latest status for ref and different sha' do
expect(latest_status).to eq(described_class.latest_status('ref'))
+ expect(latest_status).to eq('failed')
end
end
end
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index 9aac2abfb27..74b50d2908d 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -225,6 +225,7 @@ eos
it 'gives compound status from latest pipelines' do
expect(commit.status).to eq(Ci::Pipeline.latest_status)
+ expect(commit.status).to eq('pending')
end
end
@@ -252,6 +253,7 @@ eos
it 'gives compound status from latest pipelines if ref is nil' do
expect(commit.status(nil)).to eq(Ci::Pipeline.latest_status)
+ expect(commit.status(nil)).to eq('failed')
end
end
end