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

@@ -215,6 +215,14 @@ jest minimal:
   script:
     - run_timed_command "yarn jest:ci:minimal"
 
+jest as-if-foss:
+  extends:
+    - .jest-base
+    - .frontend:rules:jest:as-if-foss
+    - .as-if-foss
+  needs: ["rspec-all frontend_fixture as-if-foss"]
+  parallel: 2
+
 jest minimal as-if-foss:
   extends:
     - .jest-base
@@ -236,14 +244,6 @@ jest-integration:
     - job: "rspec-all frontend_fixture"
     - job: "graphql-schema-dump"
 
-jest-as-if-foss:
-  extends:
-    - .jest-base
-    - .frontend:rules:default-frontend-jobs-as-if-foss
-    - .as-if-foss
-  needs: ["rspec-all frontend_fixture as-if-foss"]
-  parallel: 2
-
 coverage-frontend:
   extends:
     - .default-retry

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

@@ -806,30 +806,28 @@
     - <<: *if-merge-request
       changes: *code-backstage-patterns
 
-.frontend:rules:jest:minimal:as-if-foss:
+.frontend:rules:jest:as-if-foss:
   rules:
     - !reference [".strict-ee-only-rules", rules]
-    - <<: *if-security-merge-request
-      changes: *code-backstage-patterns
-      when: never
     - <<: *if-merge-request-labels-as-if-foss
-      when: never
     - <<: *if-merge-request-labels-run-all-jest
-      when: never
-    - <<: *if-merge-request-labels-run-all-rspec
-      when: never
-    - <<: *if-merge-request
-      changes: *startup-css-patterns
+    - <<: *if-security-merge-request
+      changes: *code-backstage-patterns
+    - <<: *if-merge-request-not-approved
       when: never
     - <<: *if-merge-request
-      changes: *ci-patterns
+      changes: *frontend-patterns-for-as-if-foss
+
+.frontend:rules:jest:minimal:as-if-foss:
+  rules:
+    - !reference [".strict-ee-only-rules", rules]
+    - !reference [".rails:rules:minimal-default-rules", rules]
+    - <<: *if-merge-request-labels-run-all-jest
       when: never
     - <<: *if-fork-merge-request
       when: never
     - <<: *if-merge-request
-      changes: *core-frontend-patterns
-    - <<: *if-merge-request
-      changes: *code-backstage-patterns
+      changes: *frontend-patterns-for-as-if-foss
 
 .frontend:rules:eslint-as-if-foss:
   rules:

.rubocop_todo/layout/line_length.yml

@@ -1123,7 +1123,6 @@ Layout/LineLength:
     - 'ee/app/controllers/concerns/ee/issuable_collections.rb'
     - 'ee/app/controllers/concerns/group_invite_members.rb'
     - 'ee/app/controllers/concerns/insights_actions.rb'
-    - 'ee/app/controllers/concerns/registrations/create_project.rb'
     - 'ee/app/controllers/ee/admin/dev_ops_report_controller.rb'
     - 'ee/app/controllers/ee/admin/users_controller.rb'
     - 'ee/app/controllers/ee/application_controller.rb'
@@ -1160,8 +1159,6 @@ Layout/LineLength:
     - 'ee/app/controllers/projects/requirements_management/requirements_controller.rb'
     - 'ee/app/controllers/projects/security/policies_controller.rb'
     - 'ee/app/controllers/projects/security/vulnerabilities/notes_controller.rb'
-    - 'ee/app/controllers/registrations/groups_controller.rb'
-    - 'ee/app/controllers/registrations/groups_projects_controller.rb'
     - 'ee/app/controllers/subscriptions_controller.rb'
     - 'ee/app/controllers/trial_registrations_controller.rb'
     - 'ee/app/controllers/trials_controller.rb'
@@ -1862,8 +1859,6 @@ Layout/LineLength:
     - 'ee/spec/controllers/projects/subscriptions_controller_spec.rb'
     - 'ee/spec/controllers/projects/vulnerability_feedback_controller_spec.rb'
     - 'ee/spec/controllers/projects_controller_spec.rb'
-    - 'ee/spec/controllers/registrations/groups_controller_spec.rb'
-    - 'ee/spec/controllers/registrations/groups_projects_controller_spec.rb'
     - 'ee/spec/controllers/registrations/welcome_controller_spec.rb'
     - 'ee/spec/controllers/subscriptions/groups_controller_spec.rb'
     - 'ee/spec/controllers/subscriptions_controller_spec.rb'
@@ -1979,7 +1974,6 @@ Layout/LineLength:
     - 'ee/spec/features/projects_spec.rb'
     - 'ee/spec/features/promotion_spec.rb'
     - 'ee/spec/features/read_only_spec.rb'
-    - 'ee/spec/features/registrations/combined_registration_spec.rb'
     - 'ee/spec/features/search/elastic/global_search_spec.rb'
     - 'ee/spec/features/search/elastic/project_search_spec.rb'
     - 'ee/spec/features/search/elastic/snippet_search_spec.rb'
@@ -2960,8 +2954,6 @@ Layout/LineLength:
     - 'ee/spec/support/shared_examples/controllers/analytics/cycle_analytics/shared_stage_shared_examples.rb'
     - 'ee/spec/support/shared_examples/controllers/concerns/description_diff_actions_shared_examples.rb'
     - 'ee/spec/support/shared_examples/controllers/projects/license_scanning_report_comparison_shared_examples.rb'
-    - 'ee/spec/support/shared_examples/controllers/registrations/groups_controller_shared_examples.rb'
-    - 'ee/spec/support/shared_examples/controllers/registrations/projects_controller_shared_examples.rb'
     - 'ee/spec/support/shared_examples/features/epics_filtered_search_shared_examples.rb'
     - 'ee/spec/support/shared_examples/features/over_free_user_limit_shared_examples.rb'
     - 'ee/spec/support/shared_examples/features/protected_branches_access_control_shared_examples.rb'
@@ -3017,7 +3009,6 @@ Layout/LineLength:
     - 'ee/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb'
     - 'ee/spec/views/operations/environments.html.haml_spec.rb'
     - 'ee/spec/views/projects/security/discover/show.html.haml_spec.rb'
-    - 'ee/spec/views/registrations/groups_projects/new.html.haml_spec.rb'
     - 'ee/spec/views/registrations/welcome/show.html.haml_spec.rb'
     - 'ee/spec/views/shared/_mirror_status.html.haml_spec.rb'
     - 'ee/spec/views/shared/_namespace_user_cap_reached_alert.html.haml_spec.rb'

.rubocop_todo/rspec/context_wording.yml

@@ -64,7 +64,6 @@ RSpec/ContextWording:
     - 'ee/spec/controllers/projects/settings/repository_controller_spec.rb'
     - 'ee/spec/controllers/projects/vulnerability_feedback_controller_spec.rb'
     - 'ee/spec/controllers/projects_controller_spec.rb'
-    - 'ee/spec/controllers/registrations/groups_projects_controller_spec.rb'
     - 'ee/spec/controllers/registrations/welcome_controller_spec.rb'
     - 'ee/spec/controllers/repositories/git_http_controller_spec.rb'
     - 'ee/spec/controllers/security/dashboard_controller_spec.rb'
@@ -921,8 +920,6 @@ RSpec/ContextWording:
     - 'ee/spec/support/shared_examples/controllers/boards_actions_shared_examples.rb'
     - 'ee/spec/support/shared_examples/controllers/cluster_metrics_shared_examples.rb'
     - 'ee/spec/support/shared_examples/controllers/concerns/description_diff_actions_shared_examples.rb'
-    - 'ee/spec/support/shared_examples/controllers/registrations/groups_controller_shared_examples.rb'
-    - 'ee/spec/support/shared_examples/controllers/registrations/projects_controller_shared_examples.rb'
     - 'ee/spec/support/shared_examples/features/insights_shared_examples.rb'
     - 'ee/spec/support/shared_examples/features/password_complexity_shared_examples.rb'
     - 'ee/spec/support/shared_examples/features/protected_branches_access_control_shared_examples.rb'
@@ -968,7 +965,6 @@ RSpec/ContextWording:
     - 'ee/spec/views/profiles/preferences/show.html.haml_spec.rb'
     - 'ee/spec/views/projects/edit.html.haml_spec.rb'
     - 'ee/spec/views/projects/security/discover/show.html.haml_spec.rb'
-    - 'ee/spec/views/registrations/groups/new.html.haml_spec.rb'
     - 'ee/spec/views/registrations/welcome/show.html.haml_spec.rb'
     - 'ee/spec/views/search/_category.html.haml_spec.rb'
     - 'ee/spec/views/shared/_clone_panel.html.haml_spec.rb'

.rubocop_todo/rspec/expect_change.yml

@@ -22,8 +22,6 @@ RSpec/ExpectChange:
     - 'ee/spec/controllers/projects/repositories_controller_spec.rb'
     - 'ee/spec/controllers/projects/security/vulnerabilities/notes_controller_spec.rb'
     - 'ee/spec/controllers/projects_controller_spec.rb'
-    - 'ee/spec/controllers/registrations/groups_controller_spec.rb'
-    - 'ee/spec/controllers/registrations/groups_projects_controller_spec.rb'
     - 'ee/spec/controllers/trials_controller_spec.rb'
     - 'ee/spec/elastic/migrate/20220119120500_populate_commit_permissions_in_main_index_spec.rb'
     - 'ee/spec/features/groups/group_settings_spec.rb'
@@ -245,7 +243,6 @@ RSpec/ExpectChange:
     - 'ee/spec/services/vulnerability_feedback/create_service_spec.rb'
     - 'ee/spec/services/vulnerability_feedback/destroy_service_spec.rb'
     - 'ee/spec/support/shared_contexts/audit_event_not_licensed_shared_context.rb'
-    - 'ee/spec/support/shared_examples/controllers/registrations/projects_controller_shared_examples.rb'
     - 'ee/spec/support/shared_examples/graphql/mutations/update_health_status_shared_examples.rb'
     - 'ee/spec/support/shared_examples/models/concerns/replicable_model_with_separate_table_shared_examples.rb'
     - 'ee/spec/support/shared_examples/models/geo_verifiable_registry_shared_examples.rb'

.rubocop_todo/rspec/expect_in_hook.yml

@@ -6,8 +6,6 @@ RSpec/ExpectInHook:
     - 'ee/spec/controllers/groups/seat_usage_controller_spec.rb'
     - 'ee/spec/controllers/projects/boards_controller_spec.rb'
     - 'ee/spec/controllers/projects/settings/slacks_controller_spec.rb'
-    - 'ee/spec/controllers/registrations/groups_controller_spec.rb'
-    - 'ee/spec/controllers/registrations/groups_projects_controller_spec.rb'
     - 'ee/spec/controllers/subscriptions_controller_spec.rb'
     - 'ee/spec/controllers/trials_controller_spec.rb'
     - 'ee/spec/elastic/migrate/20220118150500_delete_orphaned_commits_spec.rb'
@@ -17,7 +15,6 @@ RSpec/ExpectInHook:
     - 'ee/spec/features/projects/feature_flags/user_creates_feature_flag_spec.rb'
     - 'ee/spec/features/projects/feature_flags/user_deletes_feature_flag_spec.rb'
     - 'ee/spec/features/projects/settings/ee/service_desk_setting_spec.rb'
-    - 'ee/spec/features/registrations/combined_registration_spec.rb'
     - 'ee/spec/features/registrations/saas_user_registration_spec.rb'
     - 'ee/spec/features/registrations/trial_during_signup_flow_spec.rb'
     - 'ee/spec/features/signup_spec.rb'
@@ -103,7 +100,6 @@ RSpec/ExpectInHook:
     - 'ee/spec/services/projects/update_mirror_service_spec.rb'
     - 'ee/spec/services/security/findings/cleanup_service_spec.rb'
     - 'ee/spec/services/upcoming_reconciliations/update_service_spec.rb'
-    - 'ee/spec/support/shared_examples/controllers/registrations/projects_controller_shared_examples.rb'
     - 'ee/spec/support/shared_examples/lib/gitlab/graphql/issuables_lazy_links_aggregate_shared_examples.rb'
     - 'ee/spec/support/shared_examples/models/concerns/elastic/cannot_read_cross_project_shared_examples.rb'
     - 'ee/spec/support/shared_examples/models/concerns/verifiable_replicator_shared_examples.rb'

.rubocop_todo/style/class_and_module_children.yml

@@ -384,9 +384,6 @@ Style/ClassAndModuleChildren:
     - 'ee/app/controllers/admin/push_rules_controller.rb'
     - 'ee/app/controllers/admin/subscriptions_controller.rb'
     - 'ee/app/controllers/admin/user_permission_exports_controller.rb'
-    - 'ee/app/controllers/concerns/registrations/apply_trial.rb'
-    - 'ee/app/controllers/concerns/registrations/create_group.rb'
-    - 'ee/app/controllers/concerns/registrations/create_project.rb'
     - 'ee/app/controllers/concerns/registrations/verification.rb'
     - 'ee/app/controllers/ee/profiles/accounts_controller.rb'
     - 'ee/app/controllers/ee/profiles/preferences_controller.rb'

CHANGELOG.md

@@ -2,6 +2,16 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
+## 15.3.3 (2022-09-01)
+
+### Fixed (5 changes)
+
+- [Skip file removal if GitLab managed replication is disabled](gitlab-org/gitlab@dbec61270621df70775c98946d09deca913bd187) ([merge request](gitlab-org/gitlab!96556)) **GitLab Enterprise Edition**
+- [Geo: Fix redirects of LFS transfer downloads](gitlab-org/gitlab@98092958c879d1dc9dda0ba2953ba548aa0b93c0) ([merge request](gitlab-org/gitlab!96654)) **GitLab Enterprise Edition**
+- [Improve blame link feature](gitlab-org/gitlab@163cadb49f96951a0f747d61a8cd1cb92b7d4296) ([merge request](gitlab-org/gitlab!96654))
+- [Bypass earliest date validation in importing of iteration cadences](gitlab-org/gitlab@66f56eb2551a302d80ca0891ff0bddec1c84f025) ([merge request](gitlab-org/gitlab!96654)) **GitLab Enterprise Edition**
+- [Fix user recent activity links for work item actions](gitlab-org/gitlab@9d9368545847cf558fad26a64b216a00b2db36b4) ([merge request](gitlab-org/gitlab!96654))
+
 ## 15.3.2 (2022-08-30)
 ### Security (17 changes)

app/assets/javascripts/content_editor/components/bubble_menus/link_bubble_menu.vue

@@ -36,18 +36,9 @@ export default {
       isEditing: false,
     };
   },
-  watch: {
-    linkCanonicalSrc(value) {
-      if (!value) this.isEditing = true;
-    },
-  },
   methods: {
     shouldShow() {
-      const shouldShow = this.tiptapEditor.isActive(Link.name);
-
-      if (!shouldShow) this.isEditing = false;
-
-      return shouldShow;
+      return this.tiptapEditor.isActive(Link.name);
     },
 
     startEditingLink() {
@@ -92,13 +83,23 @@ export default {
     },
 
     updateLinkToState() {
-      if (!this.tiptapEditor.isActive(Link.name)) return;
+      const editor = this.tiptapEditor;
 
-      const { href, title, canonicalSrc } = this.tiptapEditor.getAttributes(Link.name);
+      const { href, title, canonicalSrc } = editor.getAttributes(Link.name);
+
+      if (
+        canonicalSrc === this.linkCanonicalSrc &&
+        href === this.linkHref &&
+        title === this.linkTitle
+      ) {
+        return;
+      }
 
       this.linkTitle = title;
       this.linkHref = href;
       this.linkCanonicalSrc = canonicalSrc || href;
+
+      this.isEditing = !this.linkCanonicalSrc;
     },
 
     copyLinkHref() {
@@ -108,6 +109,12 @@ export default {
     removeLink() {
       this.tiptapEditor.chain().focus().extendMarkRange(Link.name).unsetLink().run();
     },
+
+    resetBubbleMenuState() {
+      this.linkTitle = undefined;
+      this.linkHref = undefined;
+      this.linkCanonicalSrc = undefined;
+    },
   },
   tippyOptions: {
     placement: 'bottom',
@@ -121,8 +128,10 @@ export default {
     plugin-key="bubbleMenuLink"
     :should-show="shouldShow"
     :tippy-options="$options.tippyOptions"
+    @show="updateLinkToState"
+    @hidden="resetBubbleMenuState"
   >
-    <editor-state-observer @transaction="updateLinkToState">
+    <editor-state-observer @selectionUpdate="updateLinkToState">
       <gl-button-group v-if="!isEditing" class="gl-display-flex gl-align-items-center">
         <gl-link
           v-gl-tooltip

app/assets/javascripts/environments/components/deployment.vue

@@ -47,6 +47,9 @@ export default {
     commit() {
       return this.deployment?.commit;
     },
+    commitPath() {
+      return this.commit?.commitPath;
+    },
     user() {
       return this.deployment?.user;
     },
@@ -147,7 +150,9 @@ export default {
             class="gl-font-monospace gl-display-flex gl-align-items-center"
           >
             <gl-icon ref="deployment-commit-icon" name="commit" class="gl-mr-2" />
-            <span v-gl-tooltip :title="$options.i18n.commitSha">{{ shortSha }}</span>
+            <gl-link v-gl-tooltip :title="$options.i18n.commitSha" :href="commitPath">
+              {{ shortSha }}
+            </gl-link>
             <clipboard-button
               :text="shortSha"
               category="tertiary"

app/assets/javascripts/google_tag_manager/index.js

@@ -140,17 +140,6 @@ export const trackSaasTrialGroup = () => {
   });
 };
 
-export const trackSaasTrialProject = () => {
-  if (!isSupported()) {
-    return;
-  }
-
-  const form = document.getElementById('new_project');
-  form.addEventListener('submit', () => {
-    pushEvent('saasTrialProject');
-  });
-};
-
 export const trackProjectImport = () => {
   if (!isSupported()) {
     return;

app/assets/javascripts/groups/components/visibility_level_dropdown.vue

-<script>
-import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
-
-export default {
-  components: {
-    GlDropdown,
-    GlDropdownItem,
-  },
-  props: {
-    visibilityLevelOptions: {
-      type: Array,
-      required: true,
-    },
-    defaultLevel: {
-      type: Number,
-      required: true,
-    },
-  },
-  data() {
-    return {
-      selectedOption: this.getDefaultOption(),
-    };
-  },
-  methods: {
-    getDefaultOption() {
-      return this.visibilityLevelOptions.find((option) => option.level === this.defaultLevel);
-    },
-    onClick(option) {
-      this.selectedOption = option;
-    },
-  },
-};
-</script>
-<template>
-  <div>
-    <input type="hidden" name="group[visibility_level]" :value="selectedOption.level" />
-    <gl-dropdown :text="selectedOption.label" class="gl-w-full" menu-class="gl-w-full! gl-mb-0">
-      <gl-dropdown-item
-        v-for="option in visibilityLevelOptions"
-        :key="option.level"
-        :secondary-text="option.description"
-        @click="onClick(option)"
-      >
-        <div class="gl-font-weight-bold gl-mb-1">{{ option.label }}</div>
-      </gl-dropdown-item>
-    </gl-dropdown>
-  </div>
-</template>

app/assets/javascripts/groups/visibility_level.js

-import Vue from 'vue';
-import VisibilityLevelDropdown from './components/visibility_level_dropdown.vue';
-
-export default () => {
-  const el = document.querySelector('.js-visibility-level-dropdown');
-
-  if (!el) {
-    return null;
-  }
-
-  const { visibilityLevelOptions, defaultLevel } = el.dataset;
-
-  return new Vue({
-    el,
-    render(createElement) {
-      return createElement(VisibilityLevelDropdown, {
-        props: {
-          visibilityLevelOptions: JSON.parse(visibilityLevelOptions),
-          defaultLevel: Number(defaultLevel),
-        },
-      });
-    },
-  });
-};

app/assets/javascripts/notes/components/comment_form.vue

@@ -214,11 +214,7 @@ export default {
             note: {
               noteable_type: this.noteableType,
               noteable_id: this.getNoteableData.id,
-              // Internal notes were identified as `confidential`
-              // before we decided to treat them as _internal_
-              // so now until API is updated we need to use `confidential`
-              // in request payload.
-              confidential: this.noteIsInternal,
+              internal: this.noteIsInternal,
               note: this.note,
             },
             merge_request_diff_head_sha: this.getNoteableData.diff_head_sha,

app/assets/javascripts/notes/components/note_body.vue

@@ -71,7 +71,7 @@ export default {
       return this.note.note;
     },
     saveButtonTitle() {
-      return this.note.confidential ? __('Save internal note') : __('Save comment');
+      return this.note.internal ? __('Save internal note') : __('Save comment');
     },
     hasSuggestion() {
       return this.note.suggestions && this.note.suggestions.length;

app/assets/javascripts/notes/components/note_form.vue

@@ -136,7 +136,7 @@ export default {
       );
     },
     textareaPlaceholder() {
-      return this.discussionNote?.confidential
+      return this.discussionNote?.internal
         ? this.$options.i18n.bodyPlaceholderInternal
         : this.$options.i18n.bodyPlaceholder;
     },
@@ -331,7 +331,7 @@ export default {
     <form :data-line-code="lineCode" class="edit-note common-note-form js-quick-submit gfm-form">
       <comment-field-layout
         :noteable-data="getNoteableData"
-        :is-internal-note="discussion.confidential"
+        :is-internal-note="discussion.internal"
       >
         <markdown-field
           :markdown-preview-path="markdownPreviewPath"

app/assets/javascripts/notes/components/noteable_discussion.vue

@@ -96,7 +96,7 @@ export default {
       return isLoggedIn();
     },
     commentType() {
-      return this.discussion.confidential ? __('internal note') : __('comment');
+      return this.discussion.internal ? __('internal note') : __('comment');
     },
     autosaveKey() {
       return getDiscussionReplyKey(this.firstNote.noteable_type, this.discussion.id);
@@ -108,7 +108,7 @@ export default {
       return this.discussion.notes.slice(0, 1)[0];
     },
     saveButtonTitle() {
-      return this.discussion.confidential ? __('Reply internally') : __('Reply');
+      return this.discussion.internal ? __('Reply internally') : __('Reply');
     },
     shouldShowJumpToNextDiscussion() {
       return this.showJumpToNextDiscussion(this.discussionsByDiffOrder ? 'diff' : 'discussion');

app/assets/javascripts/notes/components/noteable_note.vue

@@ -109,7 +109,7 @@ export default {
       return this.note.author;
     },
     commentType() {
-      return this.note.confidential ? __('internal note') : __('comment');
+      return this.note.internal ? __('internal note') : __('comment');
     },
     classNameBindings() {
       return {
@@ -259,7 +259,7 @@ export default {
       });
       const confirmed = await confirmAction(msg, {
         primaryBtnVariant: 'danger',
-        primaryBtnText: this.note.confidential ? __('Delete internal note') : __('Delete comment'),
+        primaryBtnText: this.note.internal ? __('Delete internal note') : __('Delete comment'),
       });
 
       if (confirmed) {
@@ -406,7 +406,7 @@ export default {
 <template>
   <timeline-entry-item
     :id="noteAnchorId"
-    :class="{ ...classNameBindings, 'internal-note': note.confidential }"
+    :class="{ ...classNameBindings, 'internal-note': note.internal }"
     :data-award-url="note.toggle_award_path"
     :data-note-id="note.id"
     class="note note-wrapper"
@@ -459,7 +459,7 @@ export default {
           :author="author"
           :created-at="note.created_at"
           :note-id="note.id"
-          :is-internal-note="note.confidential"
+          :is-internal-note="note.internal"
           :noteable-type="noteableType"
         >
           <template #note-header-info>

app/experiments/combined_registration_experiment.rb

-# frozen_string_literal: true
-
-class CombinedRegistrationExperiment < ApplicationExperiment
-  include Rails.application.routes.url_helpers
-
-  control { new_users_sign_up_group_path }
-  candidate { new_users_sign_up_groups_project_path }
-
-  def key_for(source, _ = nil)
-    super(source, 'force_company_trial')
-  end
-
-  def redirect_path
-    run
-  end
-end

app/helpers/dropdowns_helper.rb

 # frozen_string_literal: true
 
 module DropdownsHelper
+  # rubocop:disable Metrics/CyclomaticComplexity
   def dropdown_tag(toggle_text, options: {}, &block)
     content_tag :div, class: "dropdown #{options[:wrapper_class] if options.key?(:wrapper_class)}" do
       data_attr = { toggle: "dropdown" }
@@ -16,7 +17,8 @@ def dropdown_tag(toggle_text, options: {}, &block)
       end
 
       content_tag_options = { class: "dropdown-menu dropdown-select #{options[:dropdown_class] if options.key?(:dropdown_class)}" }
-      content_tag_options[:data] = { qa_selector: "#{options[:dropdown_qa_selector]}" } if options[:dropdown_qa_selector]
+      content_tag_options[:data] = options[:dropdown_qa_selector] ? { qa_selector: "#{options[:dropdown_qa_selector]}" } : {}
+      content_tag_options[:data][:testid] = "#{options[:dropdown_testid]}" if options[:dropdown_testid]
 
       dropdown_output << content_tag(:div, content_tag_options) do
         output = []
@@ -46,6 +48,7 @@ def dropdown_tag(toggle_text, options: {}, &block)
       dropdown_output.html_safe
     end
   end
+  # rubocop:enable Metrics/CyclomaticComplexity
 
   def dropdown_toggle(toggle_text, data_attr, options = {})
     default_label = data_attr[:default_label]