diff --git a/app/assets/javascripts/vue_shared/alert_details/components/system_notes/system_note.vue b/app/assets/javascripts/vue_shared/alert_details/components/system_notes/system_note.vue
index 93581dbbd40ba49adf09749b264db072206ce55b..655a16dea0191e63c88a4cc3d2a6a69c956a4f35 100644
--- a/app/assets/javascripts/vue_shared/alert_details/components/system_notes/system_note.vue
+++ b/app/assets/javascripts/vue_shared/alert_details/components/system_notes/system_note.vue
@@ -36,7 +36,7 @@ export default {
<li
:id="noteAnchorId"
class="timeline-entry note system-note note-wrapper gl-p-0!"
- data-qa-selector="alert_system_note_container"
+ data-testid="alert-system-note-container"
>
<div class="gl-display-inline-flex gl-align-items-center gl-relative">
<div
diff --git a/app/views/admin/application_settings/_git_lfs_limits.html.haml b/app/views/admin/application_settings/_git_lfs_limits.html.haml
index 638984ae97ad45769908bb2244a4617db53c5766..bac781675e206210bfc01a9b1c21940c81c923d2 100644
--- a/app/views/admin/application_settings/_git_lfs_limits.html.haml
+++ b/app/views/admin/application_settings/_git_lfs_limits.html.haml
@@ -15,4 +15,4 @@
= f.label :throttle_authenticated_git_lfs_period_in_seconds, _('Authenticated Git LFS rate limit period in seconds'), class: 'gl-font-weight-bold'
= f.number_field :throttle_authenticated_git_lfs_period_in_seconds, class: 'form-control gl-form-input'
- = f.submit _('Save changes'), pajamas_button: true, data: { qa_selector: 'save_changes_button' }
+ = f.submit _('Save changes'), pajamas_button: true
diff --git a/app/views/admin/application_settings/_import_export_limits.html.haml b/app/views/admin/application_settings/_import_export_limits.html.haml
index 269a14973243665bab19206618642f4388de3eb7..9e6f4bbd6a03ba5b899c0c63de377a85ca6012ae 100644
--- a/app/views/admin/application_settings/_import_export_limits.html.haml
+++ b/app/views/admin/application_settings/_import_export_limits.html.haml
@@ -34,4 +34,4 @@
= f.label :group_download_export_limit, _('Maximum group export download requests per minute'), class: 'label-bold'
= f.number_field :group_download_export_limit, class: 'form-control gl-form-input'
- = f.submit _('Save changes'), data: { qa_selector: 'save_changes_button' }, pajamas_button: true
+ = f.submit _('Save changes'), pajamas_button: true
diff --git a/app/views/admin/application_settings/_issue_limits.html.haml b/app/views/admin/application_settings/_issue_limits.html.haml
index 147aab443b2a1b54e7a399cd20cd29c8355e77ff..e78c0209737853ee8418912c5f6041b42daf2c69 100644
--- a/app/views/admin/application_settings/_issue_limits.html.haml
+++ b/app/views/admin/application_settings/_issue_limits.html.haml
@@ -6,4 +6,4 @@
= f.label :issues_create_limit, _('Maximum number of requests per minute')
= f.number_field :issues_create_limit, class: 'form-control gl-form-input'
- = f.submit _('Save changes'), data: { qa_selector: 'save_changes_button' }, pajamas_button: true
+ = f.submit _('Save changes'), pajamas_button: true
diff --git a/app/views/admin/application_settings/_network_rate_limits.html.haml b/app/views/admin/application_settings/_network_rate_limits.html.haml
index 300180f7b9ad8a5d32e98d575ce4d8c74fbc1d00..1a45cbd33cfabbf20f24f2678979d78c212e9916 100644
--- a/app/views/admin/application_settings/_network_rate_limits.html.haml
+++ b/app/views/admin/application_settings/_network_rate_limits.html.haml
@@ -8,7 +8,6 @@
.form-group
= f.gitlab_ui_checkbox_component :"throttle_unauthenticated_#{setting_fragment}_enabled",
_('Enable unauthenticated API request rate limit'),
- checkbox_options: { data: { qa_selector: "throttle_unauthenticated_#{setting_fragment}_checkbox" } },
label_options: { class: 'label-bold' }
.form-group
= f.label :"throttle_unauthenticated_#{setting_fragment}_requests_per_period", _('Maximum unauthenticated API requests per rate limit period per IP'), class: 'label-bold'
@@ -21,7 +20,6 @@
.form-group
= f.gitlab_ui_checkbox_component :"throttle_authenticated_#{setting_fragment}_enabled",
_('Enable authenticated API request rate limit'),
- checkbox_options: { data: { qa_selector: "throttle_authenticated_#{setting_fragment}_checkbox" } },
label_options: { class: 'label-bold' }
.form-group
= f.label :"throttle_authenticated_#{setting_fragment}_requests_per_period", _('Maximum authenticated API requests per rate limit period per user'), class: 'label-bold'
@@ -30,4 +28,4 @@
= f.label :"throttle_authenticated_#{setting_fragment}_period_in_seconds", _('Authenticated API rate limit period in seconds'), class: 'label-bold'
= f.number_field :"throttle_authenticated_#{setting_fragment}_period_in_seconds", class: 'form-control gl-form-input'
- = f.submit _('Save changes'), pajamas_button: true, data: { qa_selector: 'save_changes_button' }
+ = f.submit _('Save changes'), pajamas_button: true, data: { testid: 'save_changes_button' }
diff --git a/app/views/admin/application_settings/_note_limits.html.haml b/app/views/admin/application_settings/_note_limits.html.haml
index 99cf0ebc669f26104f42371f0fc769ae5b6f2630..ed56f35dee4fb68f466c2864dcfbeb62496520d1 100644
--- a/app/views/admin/application_settings/_note_limits.html.haml
+++ b/app/views/admin/application_settings/_note_limits.html.haml
@@ -12,4 +12,4 @@
= _('List of users who are allowed to exceed the rate limit. Example: username1, username2')
- = f.submit _('Save changes'), data: { qa_selector: 'save_changes_button' }, pajamas_button: true
+ = f.submit _('Save changes'), pajamas_button: true
diff --git a/app/views/admin/application_settings/_pipeline_limits.html.haml b/app/views/admin/application_settings/_pipeline_limits.html.haml
index b7dffe63777d09e5a40c6bb5ba2259bfe8907322..15942c980c2943f4bf24c53786ef7ec732ca4493 100644
--- a/app/views/admin/application_settings/_pipeline_limits.html.haml
+++ b/app/views/admin/application_settings/_pipeline_limits.html.haml
@@ -6,4 +6,4 @@
= f.label :pipeline_limit_per_project_user_sha, _('Maximum number of requests per minute')
= f.number_field :pipeline_limit_per_project_user_sha, class: 'form-control gl-form-input'
- = f.submit _('Save changes'), data: { qa_selector: 'save_changes_button' }, pajamas_button: true
+ = f.submit _('Save changes'), pajamas_button: true
diff --git a/app/views/admin/application_settings/_projects_api_limits.html.haml b/app/views/admin/application_settings/_projects_api_limits.html.haml
index c9eff76916acb7a104fd200cfb200269f8cadbdc..a937a528e80ece815b866c49039690966c747c15 100644
--- a/app/views/admin/application_settings/_projects_api_limits.html.haml
+++ b/app/views/admin/application_settings/_projects_api_limits.html.haml
@@ -18,4 +18,4 @@
.form-text.gl-text-gray-600
= _("Set to 0 to disable the limit.")
- = f.submit _('Save changes'), data: { qa_selector: 'save_changes_button' }, pajamas_button: true
+ = f.submit _('Save changes'), pajamas_button: true
diff --git a/app/views/admin/application_settings/_search_limits.html.haml b/app/views/admin/application_settings/_search_limits.html.haml
index b318f7e5a206ed98df993d31cccd94d0ca783ab0..98ce675937bb0a47f20c6afcada2ed9c7d944cf3 100644
--- a/app/views/admin/application_settings/_search_limits.html.haml
+++ b/app/views/admin/application_settings/_search_limits.html.haml
@@ -19,4 +19,4 @@
= _('List of users who are allowed to exceed the rate limit. Example: username1, username2')
- = f.submit _('Save changes'), data: { qa_selector: 'save_changes_button' }, pajamas_button: true
+ = f.submit _('Save changes'), pajamas_button: true
diff --git a/app/views/admin/application_settings/_users_api_limits.html.haml b/app/views/admin/application_settings/_users_api_limits.html.haml
index ca6f1113c4a859efa3c069d24b7a34590e1f43d2..7dad581f8855f40f570dd157d346aafbd9578f3a 100644
--- a/app/views/admin/application_settings/_users_api_limits.html.haml
+++ b/app/views/admin/application_settings/_users_api_limits.html.haml
@@ -11,4 +11,4 @@
.form-text.text-muted{ id: 'users-api-limit-users-allowlist-field-description' }
= _('List of users who are allowed to exceed the rate limit. Example: username1, username2')
- = f.submit _('Save changes'), data: { qa_selector: 'save_changes_button' }, pajamas_button: true
+ = f.submit _('Save changes'), pajamas_button: true
diff --git a/app/views/admin/deploy_keys/new.html.haml b/app/views/admin/deploy_keys/new.html.haml
index 3d73b255a5ed23372f4b7f90e0628e888821f4de..ef314bf7d6a460ba9ac6a7e4e7bd72dd15b2bce2 100644
--- a/app/views/admin/deploy_keys/new.html.haml
+++ b/app/views/admin/deploy_keys/new.html.haml
@@ -4,6 +4,6 @@
= gitlab_ui_form_for [:admin, @deploy_key], html: { class: 'deploy-key-form' } do |f|
= render partial: 'shared/deploy_keys/form', locals: { form: f, deploy_key: @deploy_key }
.gl-display-flex.gl-mt-6.gl-gap-3
- = f.submit 'Create', data: { qa_selector: "add_deploy_key_button" }, pajamas_button: true
+ = f.submit 'Create', pajamas_button: true
= render Pajamas::ButtonComponent.new(href: admin_deploy_keys_path) do
= _('Cancel')
diff --git a/app/views/admin/topics/_form.html.haml b/app/views/admin/topics/_form.html.haml
index c61be1182e00dd2bf7fe67eb0bdb4b540ebc01ca..85d374d740439dcd96544147b808ea3a7552c181 100644
--- a/app/views/admin/topics/_form.html.haml
+++ b/app/views/admin/topics/_form.html.haml
@@ -45,7 +45,7 @@
- else
.form-actions
- = f.submit _('Save changes'), pajamas_button: true, data: { qa_selector: 'save_changes_button' }
+ = f.submit _('Save changes'), pajamas_button: true
= render Pajamas::ButtonComponent.new(href: admin_topics_path) do
= _('Cancel')
diff --git a/ee/app/views/admin/application_settings/_elasticsearch_form.html.haml b/ee/app/views/admin/application_settings/_elasticsearch_form.html.haml
index 713ad0c98bca180f77e21edb3cbec285819be524..c25f00283f95eba935e905448fa376e0adb8025a 100644
--- a/ee/app/views/admin/application_settings/_elasticsearch_form.html.haml
+++ b/ee/app/views/admin/application_settings/_elasticsearch_form.html.haml
@@ -62,12 +62,12 @@
.form-group
= f.label :elasticsearch_username, _('Username'), class: 'label-bold'
- = f.text_field :elasticsearch_username, value: @application_setting.elasticsearch_username, class: 'form-control gl-form-input', data: { qa_selector: 'username_field' }
+ = f.text_field :elasticsearch_username, value: @application_setting.elasticsearch_username, class: 'form-control gl-form-input'
.form-text.gl-text-gray-600.gl-mt-0
= _('Enter the username for password-protected Elasticsearch servers.')
.form-group
= f.label :elasticsearch_password, _('Password'), class: 'label-bold'
- = f.password_field :elasticsearch_password, value: (@application_setting.elasticsearch_password.present? ? ApplicationSetting::MASK_PASSWORD : ''), class: 'form-control gl-form-input', data: { qa_selector: 'password_field' }
+ = f.password_field :elasticsearch_password, value: (@application_setting.elasticsearch_password.present? ? ApplicationSetting::MASK_PASSWORD : ''), class: 'form-control gl-form-input'
.form-text.gl-text-gray-600.gl-mt-0
= _('Enter the password for password-protected Elasticsearch servers.')
diff --git a/ee/app/views/admin/geo/shared/_filter_nav.html.haml b/ee/app/views/admin/geo/shared/_filter_nav.html.haml
index 78b988e6c4ed9fa72b224c32b393327f1a8a67fa..2eb429aae3ed67e2e6f95754002c5d6a02a6d93e 100644
--- a/ee/app/views/admin/geo/shared/_filter_nav.html.haml
+++ b/ee/app/views/admin/geo/shared/_filter_nav.html.haml
@@ -7,7 +7,7 @@
.gl-sm-display-flex.gl-mx-n1
= gl_redirect_listbox_tag geo_filter_nav_options(replicable_controller, replicable_name), filter_by, class: 'gl-px-2 gl-my-2 my-sm-0 gl-w-full'
.replicable-search.px-1.my-1.my-sm-0.w-100
- = form_tag filter_projects_path, method: :get, data: { qa_selector: 'project_filter_form_container' } do |f|
+ = form_tag filter_projects_path, method: :get do |f|
.gl-search-box-by-type
= sprite_icon('search', css_class: 'gl-search-box-by-type-search-icon gl-icon')
= search_field_tag :name, params[:name], placeholder: _('Filter by name'), class: "gl-form-input form-control gl-search-box-by-type-input", spellcheck: false, autofocus: true, data: { testid: 'geo-projects-filter-field' }
diff --git a/qa/qa/ee/page/dashboard/projects.rb b/qa/qa/ee/page/dashboard/projects.rb
index 41a22091b98a77175bbe898c5c6de583904fed8e..d58d3629cf2fc610b33ab2b2d1bfa94b8c718b0b 100644
--- a/qa/qa/ee/page/dashboard/projects.rb
+++ b/qa/qa/ee/page/dashboard/projects.rb
@@ -33,7 +33,7 @@ def projects_list
end
def project_created?(project_name)
- fill_element(:project_filter_form_container, project_name)
+ fill_element('project-filter-form-container', project_name)
wait_until(max_duration: Runtime::Geo.max_db_replication_time) do
within_element('projects-list') do
@@ -43,7 +43,7 @@ def project_created?(project_name)
end
def project_deleted?(project_name)
- fill_element(:project_filter_form_container, project_name)
+ fill_element('project-filter-form-container', project_name)
wait_until(max_duration: Runtime::Geo.max_db_replication_time) do
within_element('projects-list') do
diff --git a/qa/qa/page/project/monitor/alerts/show.rb b/qa/qa/page/project/monitor/alerts/show.rb
index 1f3c52d89886f0ac27b38df9190d64ba99eaa7cb..b1866c6d3664cc28f73086ad8f8b7c54b7516a88 100644
--- a/qa/qa/page/project/monitor/alerts/show.rb
+++ b/qa/qa/page/project/monitor/alerts/show.rb
@@ -7,7 +7,7 @@ module Monitor
module Alerts
class Show < Page::Base
view 'app/assets/javascripts/vue_shared/alert_details/components/system_notes/system_note.vue' do
- element :alert_system_note_container
+ element 'alert-system-note-container'
end
def go_to_activity_feed_tab
@@ -15,7 +15,7 @@ def go_to_activity_feed_tab
end
def has_system_note?(text)
- has_element?(:alert_system_note_container, text: text)
+ has_element?('alert-system-note-container', text: text)
end
end
end