Automatic merge of gitlab-org/gitlab master

.gitlab/ci/frontend.gitlab-ci.yml

@@ -128,11 +128,13 @@ update-storybook-yarn-cache:
       - tmp/tests/frontend/
       - knapsack/
 
-rspec frontend_fixture:
+# In gitlab-foss, generates FOSS fixtures. In gitlab, generates FOSS & EE fixtures.
+# That way, we don't need to have two separate jobs.
+rspec-all frontend_fixture:
   extends:
     - .frontend-fixtures-base
     - .frontend:rules:default-frontend-jobs
-  parallel: 2
+  parallel: 5
 
 rspec frontend_fixture as-if-foss:
   extends:
@@ -140,12 +142,6 @@ rspec frontend_fixture as-if-foss:
     - .frontend:rules:default-frontend-jobs-as-if-foss
     - .as-if-foss
 
-rspec-ee frontend_fixture:
-  extends:
-    - .frontend-fixtures-base
-    - .frontend:rules:default-frontend-jobs-ee
-  parallel: 3
-
 graphql-schema-dump:
   variables:
     SETUP_DB: "false"
@@ -196,9 +192,7 @@ jest:
     - .frontend:rules:jest
   needs:
     - job: "detect-tests"
-    - job: "rspec frontend_fixture"
-    - job: "rspec-ee frontend_fixture"
-      optional: true
+    - job: "rspec-all frontend_fixture"
   artifacts:
     name: coverage-frontend
     expire_in: 31d
@@ -225,9 +219,7 @@ jest-integration:
   script:
     - run_timed_command "yarn jest:integration --ci"
   needs:
-    - job: "rspec frontend_fixture"
-    - job: "rspec-ee frontend_fixture"
-      optional: true
+    - job: "rspec-all frontend_fixture"
     - job: "graphql-schema-dump"
 
 jest-as-if-foss:
@@ -341,9 +333,7 @@ startup-css-check:
     - .frontend:rules:default-frontend-jobs
   needs:
     - job: "compile-test-assets"
-    - job: "rspec frontend_fixture"
-    - job: "rspec-ee frontend_fixture"
-      optional: true
+    - job: "rspec-all frontend_fixture"
 
 startup-css-check as-if-foss:
   extends:

.gitlab/ci/rules.gitlab-ci.yml

@@ -495,13 +495,6 @@
     - <<: *if-default-refs
       changes: *code-backstage-patterns
 
-.frontend:rules:default-frontend-jobs-ee:
-  rules:
-    - <<: *if-not-ee
-      when: never
-    - <<: *if-default-refs
-      changes: *code-backstage-patterns
-
 .frontend:rules:default-frontend-jobs-as-if-foss:
   rules:
     - <<: *if-not-ee

.gitlab/ci/test-metadata.gitlab-ci.yml

@@ -29,8 +29,7 @@ update-tests-metadata:
     - retrieve-tests-metadata
     - setup-test-env
     - rspec migration pg12
-    - rspec frontend_fixture
-    - rspec-ee frontend_fixture
+    - rspec-all frontend_fixture
     - rspec unit pg12
     - rspec integration pg12
     - rspec system pg12

app/assets/javascripts/boards/components/board_card_inner.vue

@@ -316,7 +316,7 @@ export default {
               </p>
             </gl-tooltip>
 
-            <span ref="countBadge" class="issue-count-badge board-card-info gl-mr-0 gl-pr-0">
+            <span ref="countBadge" class="board-card-info gl-mr-0 gl-pr-0 gl-pl-3">
               <span v-if="allowSubEpics" class="gl-mr-3">
                 <gl-icon name="epic" />
                 {{ totalEpicsCount }}
@@ -334,7 +334,7 @@ export default {
             <span
               v-if="shouldRenderEpicProgress"
               ref="progressBadge"
-              class="issue-count-badge board-card-info gl-pl-0"
+              class="board-card-info gl-pl-0"
             >
               <span class="gl-mr-3" data-testid="epic-progress">
                 <gl-icon name="progress" />

app/assets/javascripts/boards/components/board_list_header.vue

@@ -365,7 +365,7 @@ export default {
       >
         <span class="gl-display-inline-flex">
           <gl-tooltip :target="() => $refs.itemCount" :title="itemsTooltipLabel" />
-          <span ref="itemCount" class="issue-count-badge-count">
+          <span ref="itemCount" class="gl-display-inline-flex gl-align-items-center">
             <gl-icon class="gl-mr-2" :name="countIcon" />
             <item-count :items-size="itemsCount" :max-issue-count="list.maxIssueCount" />
           </span>
@@ -388,7 +388,7 @@ export default {
           v-gl-tooltip.hover
           :aria-label="$options.i18n.newIssue"
           :title="$options.i18n.newIssue"
-          class="issue-count-badge-add-button no-drag"
+          class="no-drag"
           icon="plus"
           @click="showNewIssueForm"
         />

app/assets/javascripts/related_issues/components/related_issues_block.vue

@@ -162,7 +162,6 @@ export default {
               icon="plus"
               :aria-label="__('Add a related issue')"
               :class="qaClass"
-              class="js-issue-count-badge-add-button"
               @click="$emit('toggleAddRelatedIssuesForm', $event)"
             />
           </div>

app/assets/javascripts/related_merge_requests/components/related_merge_requests.vue

@@ -81,13 +81,13 @@ export default {
             {{ __('Related merge requests') }}
           </span>
           <div v-if="totalCount" class="d-inline-flex lh-100 align-middle">
-            <div class="mr-count-badge gl-display-inline-flex">
-              <div class="mr-count-badge-count">
-                <svg class="s16 mr-1 text-secondary">
-                  <gl-icon name="merge-request" class="mr-1 text-secondary" />
-                </svg>
-                <span class="js-items-count">{{ totalCount }}</span>
-              </div>
+            <div
+              class="mr-count-badge gl-display-inline-flex gl-align-items-center gl-py-2 gl-px-3"
+            >
+              <svg class="s16 mr-1 text-secondary">
+                <gl-icon name="merge-request" class="mr-1 text-secondary" />
+              </svg>
+              <span class="js-items-count">{{ totalCount }}</span>
             </div>
           </div>
         </div>

app/assets/stylesheets/_page_specific_files.scss

@@ -10,7 +10,6 @@
 @import './pages/groups';
 @import './pages/help';
 @import './pages/issuable';
-@import './pages/issues/issue_count_badge';
 @import './pages/issues';
 @import './pages/labels';
 @import './pages/login';

app/assets/stylesheets/pages/issues/issue_count_badge.scss

-.issue-count-badge,
-.mr-count-badge {
-  padding: 5px $gl-padding-8;
-}
-
-.issue-count-badge-count,
-.mr-count-badge-count {
-  display: inline-flex;
-  align-items: center;
-}

doc/development/pipelines.md

@@ -252,7 +252,7 @@ graph RL;
     2_1-1 & 2_1-2 & 2_1-3 & 2_1-4 --> 1-6;
   end
 
-  2_2-2["rspec frontend_fixture/rspec-ee frontend_fixture (7 minutes)"];
+  2_2-2["rspec-all frontend_fixture (7 minutes)"];
   class 2_2-2 criticalPath;
   click 2_2-2 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=7910143&udv=0"
   2_2-4["memory-on-boot (3.5 minutes)"];
@@ -284,7 +284,7 @@ graph RL;
   3_1-1["jest (14.5 minutes)"];
   class 3_1-1 criticalPath;
   click 3_1-1 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=6914204&udv=0"
-  subgraph "Needs `rspec frontend_fixture/rspec-ee frontend_fixture`";
+  subgraph "Needs `rspec-all frontend_fixture`";
     3_1-1 --> 2_2-2;
   end
 
@@ -355,7 +355,7 @@ graph RL;
     2_1-1 & 2_1-2 & 2_1-3 & 2_1-4 --> 1-6;
   end
 
-  2_2-2["rspec frontend_fixture/rspec-ee frontend_fixture (7 minutes)"];
+  2_2-2["rspec-all frontend_fixture (7 minutes)"];
   class 2_2-2 criticalPath;
   click 2_2-2 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=7910143&udv=0"
   2_2-4["memory-on-boot (3.5 minutes)"];
@@ -395,7 +395,7 @@ graph RL;
   3_1-1["jest (14.5 minutes)"];
   class 3_1-1 criticalPath;
   click 3_1-1 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=6914204&udv=0"
-  subgraph "Needs `rspec frontend_fixture/rspec-ee frontend_fixture`";
+  subgraph "Needs `rspec-all frontend_fixture`";
     3_1-1 --> 2_2-2;
   end
 

ee/app/assets/javascripts/issues_analytics/components/issues_analytics.vue

@@ -178,7 +178,7 @@ export default {
     <gl-loading-icon v-if="loading" size="md" class="mt-8" />
 
     <div v-if="showChart" class="issues-analytics-chart">
-      <h4 class="chart-title">{{ s__('IssuesAnalytics|Issues opened per month') }}</h4>
+      <h4 class="gl-mt-6 gl-mb-7">{{ s__('IssuesAnalytics|Issues opened per month') }}</h4>
 
       <gl-column-chart
         data-qa-selector="issues_analytics_graph"
@@ -191,10 +191,10 @@ export default {
       />
       <div class="d-flex">
         <gl-chart-legend v-if="chart" :chart="chart" :series-info="seriesInfo" />
-        <div class="issues-analytics-legend">
-          <span>{{ s__('IssuesAnalytics|Total:') }} {{ seriesTotal }}</span>
-          <span>&#8226;</span>
-          <span>{{ s__('IssuesAnalytics|Avg/Month:') }} {{ seriesAverage }}</span>
+        <div class="gl-font-sm gl-text-gray-500">
+          {{ s__('IssuesAnalytics|Total:') }} {{ seriesTotal }}
+          &#8226;
+          {{ s__('IssuesAnalytics|Avg/Month:') }} {{ seriesAverage }}
         </div>
       </div>
     </div>

ee/app/assets/javascripts/related_items_tree/components/tree_item_body.vue

@@ -233,7 +233,7 @@ export default {
             <div
               v-if="isEpic"
               ref="countBadge"
-              class="issue-count-badge text-secondary gl-display-inline-flex gl-py-0 p-lg-0"
+              class="gl-text-gray-500 gl-display-inline-flex gl-py-0 p-lg-0"
             >
               <span
                 v-if="allowSubEpics"

ee/app/assets/stylesheets/pages/issues_analytics.scss

@@ -11,14 +11,3 @@
     max-width: px-to-rem($milestone-title-max-width);
   }
 }
-
-.issues-analytics-chart {
-  .chart-title {
-    margin: $gl-padding-24 0 $gl-padding-32;
-  }
-}
-
-.issues-analytics-legend {
-  font-size: $gl-font-size-small;
-  color: $gl-text-color-secondary;
-}

ee/spec/features/boards/swimlanes/epics_swimlanes_spec.rb

@@ -119,12 +119,12 @@ RSpec.describe 'epics swimlanes', :js do
     end
 
     it 'displays new issue button' do
-      expect(first('.board')).to have_selector('.issue-count-badge-add-button', count: 1)
+      expect(first('.board')).to have_button('New issue', count: 1)
     end
 
     it 'shows form in unassigned issues lane when clicking button' do
       page.within(first('.board')) do
-        find('.issue-count-badge-add-button').click
+        click_button 'New issue'
       end
 
       page.within("[data-testid='board-lane-unassigned-issues']") do
@@ -134,7 +134,7 @@ RSpec.describe 'epics swimlanes', :js do
 
     it 'hides form when clicking cancel' do
       page.within(first('.board')) do
-        find('.issue-count-badge-add-button').click
+        click_button 'New issue'
       end
 
       page.within("[data-testid='board-lane-unassigned-issues']") do
@@ -148,7 +148,7 @@ RSpec.describe 'epics swimlanes', :js do
 
     it 'creates new issue in unassigned issues lane' do
       page.within(first('.board')) do
-        find('.issue-count-badge-add-button').click
+        click_button 'New issue'
       end
 
       wait_for_all_requests
@@ -160,7 +160,7 @@ RSpec.describe 'epics swimlanes', :js do
 
       wait_for_all_requests
 
-      page.within(first('.board .issue-count-badge-count')) do
+      page.within(first('.board [data-testid="issue-count-badge"]')) do
         expect(page).to have_content('3')
       end
 

ee/spec/features/epic_boards/new_epic_spec.rb

@@ -32,7 +32,7 @@ RSpec.describe 'create epic in board', :js do
 
       wait_for_requests
 
-      page.within(first('.board .issue-count-badge-count')) do
+      page.within(first('.board [data-testid="issue-count-badge"]')) do
         expect(page).to have_content('1')
       end
 

ee/spec/features/issues/related_issues_spec.rb

@@ -51,7 +51,7 @@ RSpec.describe 'Related issues', :js do
 
     context 'with "Relates to", "Blocks", "Is blocked by" groupings' do
       def add_linked_issue(issue, radio_input_value)
-        find('.js-issue-count-badge-add-button').click
+        click_button 'Add a related issue'
         find('.js-add-issuable-form-input').set "#{issue.to_reference(project)} "
         find("input[name=\"linked-issue-type-radio\"][value=\"#{radio_input_value}\"]").click
         find('.js-add-issuable-form-add-button').click

package.json

@@ -55,9 +55,9 @@
     "@babel/preset-env": "^7.10.1",
     "@gitlab/at.js": "1.5.7",
     "@gitlab/favicon-overlay": "2.0.0",
-    "@gitlab/svgs": "1.212.0",
+    "@gitlab/svgs": "1.213.0",
     "@gitlab/tributejs": "1.0.0",
-    "@gitlab/ui": "32.11.4",
+    "@gitlab/ui": "32.12.0",
     "@gitlab/visual-review-tools": "1.6.1",
     "@rails/actioncable": "6.1.3-2",
     "@rails/ujs": "6.1.3-2",

scripts/rspec_helpers.sh

@@ -109,14 +109,18 @@ function rspec_paralellized_job() {
   local test_level="${job_name[1]}"
   local report_name=$(echo "${CI_JOB_NAME}" | sed -E 's|[/ ]|_|g') # e.g. 'rspec unit pg12 1/24' would become 'rspec_unit_pg12_1_24'
   local rspec_opts="${1}"
-  local spec_folder_prefix=""
+  local spec_folder_prefixes=""
 
   if [[ "${test_tool}" =~ "-ee" ]]; then
-    spec_folder_prefix="ee/"
+    spec_folder_prefixes="'ee/'"
   fi
 
   if [[ "${test_tool}" =~ "-jh" ]]; then
-    spec_folder_prefix="jh/"
+    spec_folder_prefixes="'jh/'"
+  fi
+
+  if [[ "${test_tool}" =~ "-all" ]]; then
+    spec_folder_prefixes="['', 'ee/']"
   fi
 
   export KNAPSACK_LOG_LEVEL="debug"
@@ -131,7 +135,7 @@ function rspec_paralellized_job() {
   cp "${KNAPSACK_RSPEC_SUITE_REPORT_PATH}" "${KNAPSACK_REPORT_PATH}"
 
   if [[ -z "${KNAPSACK_TEST_FILE_PATTERN}" ]]; then
-    pattern=$(ruby -r./tooling/quality/test_level.rb -e "puts Quality::TestLevel.new(%(${spec_folder_prefix})).pattern(:${test_level})")
+    pattern=$(ruby -r./tooling/quality/test_level.rb -e "puts Quality::TestLevel.new(${spec_folder_prefixes}).pattern(:${test_level})")
     export KNAPSACK_TEST_FILE_PATTERN="${pattern}"
   fi
 

spec/features/boards/new_issue_spec.rb

@@ -68,7 +68,7 @@ RSpec.describe 'Issue Boards new issue', :js do
 
       wait_for_requests
 
-      page.within(first('.board .issue-count-badge-count')) do
+      page.within(first('.board [data-testid="issue-count-badge"]')) do
         expect(page).to have_content('1')
       end
 

spec/features/boards/reload_boards_on_browser_back_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe 'Ensure Boards do not show stale data on browser back', :js do
       visit project_board_path(project, board)
       wait_for_requests
 
-      page.within(first('.board .issue-count-badge-count')) do
+      page.within(first('.board [data-testid="issue-count-badge"]')) do
         expect(page).to have_content('0')
       end
     end
@@ -35,7 +35,7 @@ RSpec.describe 'Ensure Boards do not show stale data on browser back', :js do
       page.go_back
       wait_for_requests
 
-      page.within(first('.board .issue-count-badge-count')) do
+      page.within(first('.board [data-testid="issue-count-badge"]')) do
         expect(page).to have_content('1')
       end
 

spec/features/groups/board_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe 'Group Boards' do
     it 'adds an issue to the backlog' do
       page.within(find('.board', match: :first)) do
         issue_title = 'New Issue'
-        find(:css, '.issue-count-badge-add-button').click
+        click_button 'New issue'
 
         wait_for_requests
 

spec/features/issues/related_issues_spec.rb

@@ -41,13 +41,13 @@ RSpec.describe 'Related issues', :js do
         visit project_issue_path(project, issue)
 
         expect(page).to have_css('.related-issues-block')
-        expect(page).not_to have_selector('.js-issue-count-badge-add-button')
+        expect(page).not_to have_button 'Add a related issue'
       end
     end
 
     context 'when logged in but not a member' do
       before do
-        gitlab_sign_in(user)
+        sign_in(user)
       end
 
       it 'shows widget when internal project' do
@@ -57,7 +57,7 @@ RSpec.describe 'Related issues', :js do
         visit project_issue_path(project, issue)
 
         expect(page).to have_css('.related-issues-block')
-        expect(page).not_to have_selector('.js-issue-count-badge-add-button')
+        expect(page).not_to have_button 'Add a related issue'
       end
 
       it 'does not show widget when private project' do
@@ -76,7 +76,7 @@ RSpec.describe 'Related issues', :js do
         visit project_issue_path(project, issue)
 
         expect(page).to have_css('.related-issues-block')
-        expect(page).not_to have_selector('.js-issue-count-badge-add-button')
+        expect(page).not_to have_button 'Add a related issue'
       end
 
       it 'shows widget on their own public issue' do
@@ -86,13 +86,13 @@ RSpec.describe 'Related issues', :js do
         visit project_issue_path(project, issue)
 
         expect(page).to have_css('.related-issues-block')
-        expect(page).not_to have_selector('.js-issue-count-badge-add-button')
+        expect(page).not_to have_button 'Add a related issue'
       end
     end
 
     context 'when logged in and a guest' do
       before do
-        gitlab_sign_in(user)
+        sign_in(user)
       end
 
       it 'shows widget when internal project' do
@@ -103,7 +103,7 @@ RSpec.describe 'Related issues', :js do
         visit project_issue_path(project, issue)
 
         expect(page).to have_css('.related-issues-block')
-        expect(page).not_to have_selector('.js-issue-count-badge-add-button')
+        expect(page).not_to have_button 'Add a related issue'
       end
 
       it 'shows widget when private project' do
@@ -114,7 +114,7 @@ RSpec.describe 'Related issues', :js do
         visit project_issue_path(project, issue)
 
         expect(page).to have_css('.related-issues-block')
-        expect(page).not_to have_selector('.js-issue-count-badge-add-button')
+        expect(page).not_to have_button 'Add a related issue'
       end
 
       it 'shows widget when public project' do
@@ -125,13 +125,13 @@ RSpec.describe 'Related issues', :js do
         visit project_issue_path(project, issue)
 
         expect(page).to have_css('.related-issues-block')
-        expect(page).not_to have_selector('.js-issue-count-badge-add-button')
+        expect(page).not_to have_button 'Add a related issue'
       end
     end
 
     context 'when logged in and a reporter' do
       before do
-        gitlab_sign_in(user)
+        sign_in(user)
       end
 
       it 'shows widget when internal project' do
@@ -142,7 +142,7 @@ RSpec.describe 'Related issues', :js do
         visit project_issue_path(project, issue)
 
         expect(page).to have_css('.related-issues-block')
-        expect(page).to have_selector('.js-issue-count-badge-add-button')
+        expect(page).to have_button 'Add a related issue'
       end
 
       it 'shows widget when private project' do
@@ -153,7 +153,7 @@ RSpec.describe 'Related issues', :js do
         visit project_issue_path(project, issue)
 
         expect(page).to have_css('.related-issues-block')
-        expect(page).to have_selector('.js-issue-count-badge-add-button')
+        expect(page).to have_button 'Add a related issue'
       end
 
       it 'shows widget when public project' do
@@ -164,7 +164,7 @@ RSpec.describe 'Related issues', :js do
         visit project_issue_path(project, issue)
 
         expect(page).to have_css('.related-issues-block')
-        expect(page).to have_selector('.js-issue-count-badge-add-button')
+        expect(page).to have_button 'Add a related issue'
       end
 
       it 'shows widget on their own public issue' do
@@ -175,7 +175,7 @@ RSpec.describe 'Related issues', :js do
         visit project_issue_path(project, issue)
 
         expect(page).to have_css('.related-issues-block')
-        expect(page).to have_selector('.js-issue-count-badge-add-button')
+        expect(page).to have_button 'Add a related issue'
       end
     end
   end
@@ -186,7 +186,7 @@ RSpec.describe 'Related issues', :js do
 
     before do
       project.add_guest(user)
-      gitlab_sign_in(user)
+      sign_in(user)
     end
 
     context 'visiting some issue someone else created' do
@@ -216,7 +216,7 @@ RSpec.describe 'Related issues', :js do
     before do
       project.add_maintainer(user)
       project_b.add_maintainer(user)
-      gitlab_sign_in(user)
+      sign_in(user)
     end
 
     context 'without existing related issues' do
@@ -230,7 +230,7 @@ RSpec.describe 'Related issues', :js do
       end
 
       it 'add related issue' do
-        find('.js-issue-count-badge-add-button').click
+        click_button 'Add a related issue'
         find('.js-add-issuable-form-input').set "#{issue_b.to_reference(project)} "
         find('.js-add-issuable-form-add-button').click
 
@@ -247,7 +247,7 @@ RSpec.describe 'Related issues', :js do
       end
 
       it 'add cross-project related issue' do
-        find('.js-issue-count-badge-add-button').click
+        click_button 'Add a related issue'
         find('.js-add-issuable-form-input').set "#{issue_project_b_a.to_reference(project)} "
         find('.js-add-issuable-form-add-button').click
 
@@ -261,7 +261,7 @@ RSpec.describe 'Related issues', :js do
       end
 
       it 'pressing enter should submit the form' do
-        find('.js-issue-count-badge-add-button').click
+        click_button 'Add a related issue'
         find('.js-add-issuable-form-input').set "#{issue_project_b_a.to_reference(project)} "
         find('.js-add-issuable-form-input').native.send_key(:enter)
 
@@ -275,7 +275,7 @@ RSpec.describe 'Related issues', :js do
       end
 
       it 'disallows duplicate entries' do
-        find('.js-issue-count-badge-add-button').click
+        click_button 'Add a related issue'
         find('.js-add-issuable-form-input').set 'duplicate duplicate duplicate'
 
         items = all('.js-add-issuable-form-token-list-item')
@@ -288,7 +288,7 @@ RSpec.describe 'Related issues', :js do
 
       it 'allows us to remove pending issues' do
         # Tests against https://gitlab.com/gitlab-org/gitlab/issues/11625
-        find('.js-issue-count-badge-add-button').click
+        click_button 'Add a related issue'
         find('.js-add-issuable-form-input').set 'issue1 issue2 issue3 '
 
         items = all('.js-add-issuable-form-token-list-item')
@@ -351,7 +351,7 @@ RSpec.describe 'Related issues', :js do
       end
 
       it 'add related issue' do
-        find('.js-issue-count-badge-add-button').click
+        click_button 'Add a related issue'
         find('.js-add-issuable-form-input').set "##{issue_d.iid} "
         find('.js-add-issuable-form-add-button').click
 
@@ -367,7 +367,7 @@ RSpec.describe 'Related issues', :js do
       end
 
       it 'add invalid related issue' do
-        find('.js-issue-count-badge-add-button').click
+        click_button 'Add a related issue'
         find('.js-add-issuable-form-input').set "#9999999 "
         find('.js-add-issuable-form-add-button').click
 
@@ -382,7 +382,7 @@ RSpec.describe 'Related issues', :js do
       end
 
       it 'add unauthorized related issue' do
-        find('.js-issue-count-badge-add-button').click
+        click_button 'Add a related issue'
         find('.js-add-issuable-form-input').set "#{issue_project_unauthorized_a.to_reference(project)} "
         find('.js-add-issuable-form-add-button').click
 

spec/support/helpers/feature_flag_helpers.rb

@@ -71,7 +71,7 @@ module FeatureFlagHelpers
   end
 
   def add_linked_issue_button
-    find('.js-issue-count-badge-add-button')
+    find_button 'Add a related issue'
   end
 
   def remove_linked_issue_button

spec/tooling/quality/test_level_spec.rb

@@ -63,7 +63,14 @@ RSpec.describe Quality::TestLevel do
     context 'with a prefix' do
       it 'returns a pattern' do
         expect(described_class.new('ee/').pattern(:system))
-          .to eq("ee/spec/{features}{,/**/}*_spec.rb")
+          .to eq("{ee/}spec/{features}{,/**/}*_spec.rb")
+      end
+    end
+
+    context 'with several prefixes' do
+      it 'returns a pattern' do
+        expect(described_class.new(['', 'ee/', 'jh/']).pattern(:system))
+          .to eq("{,ee/,jh/}spec/{features}{,/**/}*_spec.rb")
       end
     end
 
@@ -138,7 +145,14 @@ RSpec.describe Quality::TestLevel do
     context 'with a prefix' do
       it 'returns a regexp' do
         expect(described_class.new('ee/').regexp(:system))
-          .to eq(%r{ee/spec/(features)})
+          .to eq(%r{(ee/)spec/(features)})
+      end
+    end
+
+    context 'with several prefixes' do
+      it 'returns a regexp' do
+        expect(described_class.new(['', 'ee/', 'jh/']).regexp(:system))
+          .to eq(%r{(|ee/|jh/)spec/(features)})
       end
     end
 

tooling/quality/test_level.rb

@@ -60,20 +60,20 @@ module Quality
       system: ['features']
     }.freeze
 
-    attr_reader :prefix
+    attr_reader :prefixes
 
-    def initialize(prefix = nil)
-      @prefix = prefix
+    def initialize(prefixes = nil)
+      @prefixes = Array(prefixes)
       @patterns = {}
       @regexps = {}
     end
 
     def pattern(level)
-      @patterns[level] ||= "#{prefix}spec/#{folders_pattern(level)}{,/**/}*#{suffix(level)}"
+      @patterns[level] ||= "#{prefixes_for_pattern}spec/#{folders_pattern(level)}{,/**/}*#{suffix(level)}"
     end
 
     def regexp(level)
-      @regexps[level] ||= Regexp.new("#{prefix}spec/#{folders_regex(level)}").freeze
+      @regexps[level] ||= Regexp.new("#{prefixes_for_regex}spec/#{folders_regex(level)}").freeze
     end
 
     def level_for(file_path)
@@ -102,6 +102,20 @@ module Quality
 
     private
 
+    def prefixes_for_pattern
+      return '' if prefixes.empty?
+
+      "{#{prefixes.join(',')}}"
+    end
+
+    def prefixes_for_regex
+      return '' if prefixes.empty?
+
+      regex_prefix = prefixes.map(&Regexp.method(:escape)).join('|')
+
+      "(#{regex_prefix})"
+    end
+
     def suffix(level)
       case level
       when :frontend_fixture

yarn.lock

@@ -964,20 +964,20 @@
     stylelint-declaration-strict-value "1.7.7"
     stylelint-scss "3.18.0"
 
-"@gitlab/svgs@1.212.0":
-  version "1.212.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.212.0.tgz#21a5df04c52b10cc1b8521cd8ff7c7d6d13716db"
-  integrity sha512-dv0bYTHA3hwi3mNU3bGMq1cd4HVKKFNwCNPgkF91JSp4Xt8DDtJ0Yq4X49ASsq4zCJ3odgkq2aPjEa/Sr5nINQ==
+"@gitlab/svgs@1.213.0":
+  version "1.213.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.213.0.tgz#fcd9794049d2b15f5796dbab2a3d501679153582"
+  integrity sha512-3d9EGpEkPDeW92Xx3FueFCJFZ/yL+uv5MWCUHmSt1tP9YmUhMXw/51c43c5+V17FuCyvhJS5tm3aEg3VYoWIRA==
 
 "@gitlab/tributejs@1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@gitlab/tributejs/-/tributejs-1.0.0.tgz#672befa222aeffc83e7d799b0500a7a4418e59b8"
   integrity sha512-nmKw1+hB6MHvlmPz63yPwVs1qQkycHwsKgxpEbzmky16Y6mL4EJMk3w1b8QlOAF/AIAzjCERPhe/R4MJiohbZw==
 
-"@gitlab/ui@32.11.4":
-  version "32.11.4"
-  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-32.11.4.tgz#ead781c4fd57b4f7bc6818de99e56d023f94c397"
-  integrity sha512-plxOvtAIo+PIng1jBssj/QCx2ATIbZqQvLvCeezgAABgY107XhqZDw50VZL0texTX+0jGwB5PaXthmU/wnCk2w==
+"@gitlab/ui@32.12.0":
+  version "32.12.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/ui/-/ui-32.12.0.tgz#a2e45a7587beb2b9a5014f36c10bac30e6f90f78"
+  integrity sha512-WP7uyf8Ujd2ONOIYLG6s3oIl8/IWpI2H12r7rwNG+yD8EOhvHdK8QS9+b5gpAewYJjT4r2AV8m9QJXZChmmO6w==
   dependencies:
     "@babel/standalone" "^7.0.0"
     bootstrap-vue "2.18.1"