Merge branch '65312-use-group-labels-instead-of-legacy-team-labels-for-danger-picking-test-reviewers' into 'master'

Detect the new stage labels in `Gitlab::Danger::Teammate`

Closes #65312

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

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/gitlab/danger/teammate.rb b/lib/gitlab/danger/teammate.rb
index 74cbcc11255..8ae4ffdadb0 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]
+          area = role[/Test Automation Engineer(?:.*?, (\w+))/, 1].downcase
 
-          area && labels.any?(area) if kind == :reviewer
+          area && labels.any?("devops::#{area}") 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 171f2344e82..61b43e343c1 100644
--- a/spec/lib/gitlab/danger/teammate_spec.rb
+++ b/spec/lib/gitlab/danger/teammate_spec.rb
@@ -28,7 +28,7 @@ describe Gitlab::Danger::Teammate do
     end
 
     context 'when labels contain Create and the category is test' do
-      let(:labels) { ['Create'] }
+      let(:labels) { ['devops::create'] }
 
       context 'when role is Test Automation Engineer, Create' do
         let(:role) { 'Test Automation Engineer, Create' }