summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-10-03 18:22:51 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-10-03 18:22:51 +0800
commit8dfec32d2bac661313f62b338b6d991b3fa25b98 (patch)
tree8bb43aeb7f97380ad779da2b575c296a5ce8bbe1 /spec
parentf0002da09c0f8ae4fb9f732c2e225c9affd98b04 (diff)
downloadgitlab-ce-8dfec32d2bac661313f62b338b6d991b3fa25b98.tar.gz
Rename ignored to failed_but_allowed, introduce exclude_ignored
which merges previous exclude_ignored_jobs and failed_but_allowed, so that we don't treat ignored a special case in HasStatus.
Diffstat (limited to 'spec')
-rw-r--r--spec/models/build_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index e7864b7ad33..ae185de9ca3 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -39,8 +39,8 @@ describe Ci::Build, models: true do
end
end
- describe '#ignored?' do
- subject { build.ignored? }
+ describe '#failed_but_allowed?' do
+ subject { build.failed_but_allowed? }
context 'when build is not allowed to fail' do
before do