summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-08-27 19:13:55 +0200
committerRémy Coutable <remy@rymai.me>2019-08-27 19:15:19 +0200
commite17ba8d9e32c9d547ff9ca31056bbf7abd864488 (patch)
treea450dffa0aba409d89c198a804753c8d15681d73
parentca5724be5d7ec899a9624827f9a471b4b554a640 (diff)
downloadgitlab-ce-e17ba8d9e32c9d547ff9ca31056bbf7abd864488.tar.gz
Fix a nil error in Gitlab::Danger::Teammate
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--lib/gitlab/danger/teammate.rb4
-rw-r--r--spec/lib/gitlab/danger/teammate_spec.rb8
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/gitlab/danger/teammate.rb b/lib/gitlab/danger/teammate.rb
index 8ae4ffdadb0..2789706aa3b 100644
--- a/lib/gitlab/danger/teammate.rb
+++ b/lib/gitlab/danger/teammate.rb
@@ -39,9 +39,9 @@ module Gitlab
def has_capability?(project, category, kind, labels)
case category
when :test
- area = role[/Test Automation Engineer(?:.*?, (\w+))/, 1].downcase
+ area = role[/Test Automation Engineer(?:.*?, (\w+))/, 1]
- area && labels.any?("devops::#{area}") if kind == :reviewer
+ area && labels.any?("devops::#{area.downcase}") if kind == :reviewer
else
capabilities(project).include?("#{kind} #{category}")
end
diff --git a/spec/lib/gitlab/danger/teammate_spec.rb b/spec/lib/gitlab/danger/teammate_spec.rb
index 61b43e343c1..afbc3896a70 100644
--- a/spec/lib/gitlab/danger/teammate_spec.rb
+++ b/spec/lib/gitlab/danger/teammate_spec.rb
@@ -50,6 +50,14 @@ describe Gitlab::Danger::Teammate do
end
end
+ context 'when role is Test Automation Engineer' do
+ let(:role) { 'Test Automation Engineer' }
+
+ it '#reviewer? returns false' do
+ expect(subject.reviewer?(project, :test, labels)).to be_falsey
+ end
+ end
+
context 'when role is Test Automation Engineer, Manage' do
let(:role) { 'Test Automation Engineer, Manage' }