summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-11-21 22:19:16 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-11-21 22:19:16 +0800
commit721f2d3788ae5e8374f357014bd9e20d62de0a81 (patch)
tree44c2f09930d5212e260d7b7fe1fc3ee023b37f65 /spec
parentb20c7846ffc0c78d6b483184363b6ccc7c11326d (diff)
downloadgitlab-ce-721f2d3788ae5e8374f357014bd9e20d62de0a81.tar.gz
Still use compound pipeline status, but group by
ref and sha so that it would show latest pipeline if ref and sha are both specified, otherwise still the same as before.
Diffstat (limited to 'spec')
-rw-r--r--spec/models/commit_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index ca277601970..21590cd4ff1 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -216,8 +216,8 @@ eos
end
end
- it 'gives the status from latest pipeline' do
- expect(commit.status).to eq(Ci::Pipeline.latest.first.status)
+ it 'gives compound status' do
+ expect(commit.status).to eq(Ci::Pipeline.latest.status)
end
end
@@ -243,8 +243,8 @@ eos
expect(commit.status('fix')).to eq(pipeline_from_fix.status)
end
- it 'gives status from latest pipeline for whatever branch' do
- expect(commit.status(nil)).to eq(Ci::Pipeline.latest.first.status)
+ it 'gives compound status if ref is nil' do
+ expect(commit.status(nil)).to eq(Ci::Pipeline.latest.status)
end
end
end