Merge branch 'qa-update-jira-integration-selectors' into 'master'

Update Jira integration qa selectors

Closes #225801

See merge request gitlab-org/gitlab!35914

app/assets/javascripts/integrations/edit/components/dynamic_field.vue

@@ -162,6 +162,7 @@ export default {
       autocomplete="new-password"
       :placeholder="placeholder"
       :required="passwordRequired"
+      :data-qa-selector="`${fieldId}_field`"
     />
     <gl-form-input
       v-else
@@ -170,6 +171,7 @@ export default {
       :type="type"
       :placeholder="placeholder"
       :required="required"
+      :data-qa-selector="`${fieldId}_field`"
     />
   </gl-form-group>
 </template>

qa/qa/page/project/settings/services/jira.rb

@@ -6,11 +6,11 @@ module QA
       module Settings
         module Services
           class Jira < QA::Page::Base
-            view 'app/views/shared/_field.html.haml' do
-              element :url_field, 'data: { qa_selector: "#{name.downcase.gsub' # rubocop:disable QA/ElementWithPattern
-              element :username_field, 'data: { qa_selector: "#{name.downcase.gsub' # rubocop:disable QA/ElementWithPattern
-              element :password_field, 'data: { qa_selector: "#{name.downcase.gsub' # rubocop:disable QA/ElementWithPattern
-              element :jira_issue_transition_id_field, 'data: { qa_selector: "#{name.downcase.gsub' # rubocop:disable QA/ElementWithPattern
+            view 'app/assets/javascripts/integrations/edit/components/dynamic_field.vue' do
+              element :service_url_field, ':data-qa-selector="`${fieldId}_field`"' # rubocop:disable QA/ElementWithPattern
+              element :service_username_field, ':data-qa-selector="`${fieldId}_field`"' # rubocop:disable QA/ElementWithPattern
+              element :service_password_field, ':data-qa-selector="`${fieldId}_field`"' # rubocop:disable QA/ElementWithPattern
+              element :service_jira_issue_transition_id_field, ':data-qa-selector="`${fieldId}_field`"' # rubocop:disable QA/ElementWithPattern
             end
 
             view 'app/helpers/services_helper.rb' do
@@ -34,19 +34,19 @@ module QA
             private
 
             def set_jira_server_url(url)
-              fill_element(:url_field, url)
+              fill_element(:service_url_field, url)
             end
 
             def set_username(username)
-              fill_element(:username_field, username)
+              fill_element(:service_username_field, username)
             end
 
             def set_password(password)
-              fill_element(:password_field, password)
+              fill_element(:service_password_field, password)
             end
 
             def set_transaction_ids(transaction_ids)
-              fill_element(:jira_issue_transition_id_field, transaction_ids)
+              fill_element(:service_jira_issue_transition_id_field, transaction_ids)
             end
 
             def click_save_changes_button