From 40d3c58809a6478a2cffa16b6e212dc771686a4a Mon Sep 17 00:00:00 2001
From: Desiree Chevalier <dchevalier@gitlab.com>
Date: Tue, 9 Nov 2021 16:34:42 -0500
Subject: [PATCH] Separate testcase cop execution
---
.gitlab/ci/static-analysis.gitlab-ci.yml | 8 ++++++++
.rubocop.yml | 4 ++++
.../ee/browser_ui/10_protect/policies_list_spec.rb | 2 +-
rubocop/cop/qa/duplicate_testcase_link.rb | 6 ------
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/.gitlab/ci/static-analysis.gitlab-ci.yml b/.gitlab/ci/static-analysis.gitlab-ci.yml
index 8824d3d753f5a..ebd223c4171a3 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 d6cc0cfe6d463..5b7a58e1f2db5 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/qa/qa/specs/features/ee/browser_ui/10_protect/policies_list_spec.rb b/qa/qa/specs/features/ee/browser_ui/10_protect/policies_list_spec.rb
index 50fc595e83b09..dbd3ac713ed3f 100644
--- a/qa/qa/specs/features/ee/browser_ui/10_protect/policies_list_spec.rb
+++ b/qa/qa/specs/features/ee/browser_ui/10_protect/policies_list_spec.rb
@@ -23,7 +23,7 @@ module QA
project.visit!
end
- it 'can load Policies page and view the policies list', :smoke, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/1892' do
+ it 'can load Policies page and view the policies list', :smoke, testcase: 'https://gitlab.com/gitlab-org/quality/testcases/-/quality/test_cases/2382' do
Page::Project::Menu.perform(&:click_on_policies)
EE::Page::Project::Policies::Index.perform do |policies_page|
diff --git a/rubocop/cop/qa/duplicate_testcase_link.rb b/rubocop/cop/qa/duplicate_testcase_link.rb
index f30768c7d80fe..82549707a83d6 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 QA
# 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 @@ class DuplicateTestcaseLink < RuboCop::Cop::Cop
PATTERN
def on_block(node)
- return unless in_qa_file?(node)
-
duplicate_testcase_link(node) do |link|
break unless self.class.duplicate?(link)
--
GitLab