summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Shushlin <vshushlin@gitlab.com>2019-01-22 15:14:29 +0300
committerVladimir Shushlin <vshushlin@gitlab.com>2019-01-22 15:17:30 +0300
commit7f6e0c84f8b9beb1875e28aca982c0ada79d4242 (patch)
tree2d5be2c50305d54b026ca0ad7347a8733df1d5e4
parentffc9fe49a15e68c8251082fa6ac75a57350640ed (diff)
downloadgitlab-ce-7f6e0c84f8b9beb1875e28aca982c0ada79d4242.tar.gz
Treat "" as nil for external commit status description
-rw-r--r--lib/gitlab/ci/status/external/common.rb2
-rw-r--r--spec/lib/gitlab/ci/status/external/common_spec.rb10
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/gitlab/ci/status/external/common.rb b/lib/gitlab/ci/status/external/common.rb
index 5471b0092ed..cd772819293 100644
--- a/lib/gitlab/ci/status/external/common.rb
+++ b/lib/gitlab/ci/status/external/common.rb
@@ -6,7 +6,7 @@ module Gitlab
module External
module Common
def label
- subject.description || super
+ subject.description.presence || super
end
def has_details?
diff --git a/spec/lib/gitlab/ci/status/external/common_spec.rb b/spec/lib/gitlab/ci/status/external/common_spec.rb
index 44e73eadc72..0d02c371a92 100644
--- a/spec/lib/gitlab/ci/status/external/common_spec.rb
+++ b/spec/lib/gitlab/ci/status/external/common_spec.rb
@@ -21,13 +21,21 @@ describe Gitlab::Ci::Status::External::Common do
expect(subject.label).to eq external_description
end
- context 'when description is not set' do
+ context 'when description is nil' do
let(:external_description) { nil }
it 'uses core status label' do
expect(subject.label).to eq('passed')
end
end
+
+ context 'when description is empty string' do
+ let(:external_description) { '' }
+
+ it 'uses core status label' do
+ expect(subject.label).to eq('passed')
+ end
+ end
end
describe '#has_action?' do