Merge branch 'fix-nil-error-in-gitlab-danger-teammate' into 'master'

Fix a nil error in Gitlab::Danger::Teammate

See merge request gitlab-org/gitlab-ce!32284

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' }