From f8f619856f4437343c81a1fbc1da6c59995fe98d Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Sat, 13 Nov 2021 09:13:02 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .gitlab/ci/static-analysis.gitlab-ci.yml  | 8 ++++++++
 .rubocop.yml                              | 4 ++++
 rubocop/cop/qa/duplicate_testcase_link.rb | 6 ------
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitlab/ci/static-analysis.gitlab-ci.yml b/.gitlab/ci/static-analysis.gitlab-ci.yml
index 8824d3d753f..ebd223c4171 100644
--- a/.gitlab/ci/static-analysis.gitlab-ci.yml
+++ b/.gitlab/ci/static-analysis.gitlab-ci.yml
@@ -93,6 +93,14 @@ rubocop:
   script:
     - run_timed_command "bundle exec rubocop --parallel"
 
+qa:testcases:
+  extends:
+    - .static-analysis-base
+    - .rubocop-job-cache
+    - .static-analysis:rules:ee-and-foss
+  script:
+    - run_timed_command "bundle exec rubocop qa/qa/specs/features/**/* --only QA/DuplicateTestcaseLink"
+
 feature-flags-usage:
   extends:
     - .static-analysis-base
diff --git a/.rubocop.yml b/.rubocop.yml
index d6cc0cfe6d4..5b7a58e1f2d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -734,6 +734,10 @@ QA/SelectorUsage:
   Exclude:
     - 'spec/rubocop/**/*_spec.rb'
 
+QA/DuplicateTestcaseLink:
+  # this cop is executed in static-analysis.gitlab-ci.yml since it cannot be run in parallel
+  Enabled: false
+
 Performance/ActiveRecordSubtransactions:
   Exclude:
     - 'spec/**/*.rb'
diff --git a/rubocop/cop/qa/duplicate_testcase_link.rb b/rubocop/cop/qa/duplicate_testcase_link.rb
index f30768c7d80..82549707a83 100644
--- a/rubocop/cop/qa/duplicate_testcase_link.rb
+++ b/rubocop/cop/qa/duplicate_testcase_link.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../../qa_helpers'
-
 module RuboCop
   module Cop
     module QA
@@ -17,8 +15,6 @@ module RuboCop
       #   it 'some test', testcase: '(...)/quality/test_cases/1892'
       #   it 'another test, testcase: '(...)/quality/test_cases/1894'
       class DuplicateTestcaseLink < RuboCop::Cop::Cop
-        include QAHelpers
-
         MESSAGE = "Don't reuse the same testcase link in different tests. Replace one of `%s`."
 
         @testcase_set = Set.new
@@ -34,8 +30,6 @@ module RuboCop
         PATTERN
 
         def on_block(node)
-          return unless in_qa_file?(node)
-
           duplicate_testcase_link(node) do |link|
             break unless self.class.duplicate?(link)