Merge branch 'jmc-gen-commit-ids' into 'master'

E2E test: use testids for generate commit spec

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/170532



Merged-by: Natalia Tepluhina <ntepluhina@gitlab.com>
Approved-by: Nivetha Prabakaran <nprabakaran@gitlab.com>
Approved-by: Ammar Alakkad <aalakkad@gitlab.com>
Approved-by: Natalia Tepluhina <ntepluhina@gitlab.com>
Co-authored-by: Jay McCure <jmccure@gitlab.com>

ee/app/assets/javascripts/vue_merge_request_widget/components/ai_commit_message.vue

@@ -73,6 +73,7 @@ export default {
         attributes: {
           variant: 'confirm',
           disabled: this.loadingCommitMessage,
+          'data-testid': 'insert-commit-message',
         },
       };
     },
@@ -129,6 +130,7 @@ export default {
       icon="tanuki-ai"
       size="small"
       :class="buttonClass"
+      data-testid="generate-commit-message"
       @click="triggerAiMutation"
     >
       {{ __('Generate commit message') }}
@@ -146,9 +148,11 @@ export default {
       </template>
       <gl-skeleton-loader v-if="loadingCommitMessage" :width="250" :lines="4" />
       <template v-else>
-        <pre class="commit-row-description js-toggle-content gl-mb-3 gl-whitespace-pre-wrap">{{
-          commitMessage
-        }}</pre>
+        <pre
+          class="commit-row-description js-toggle-content gl-mb-3 gl-whitespace-pre-wrap"
+          data-testid="ai-commit-message-row"
+          >{{ commitMessage }}</pre
+        >
         <user-feedback :event-name="$options.feedback.eventName" />
         <p>
           {{ __('Commit message generated by GitLab Duo') }}

qa/qa/ee/page/merge_request/show.rb

@@ -62,6 +62,12 @@ def self.prepended(base)
               view 'ee/app/assets/javascripts/vue_shared/security_reports/components/event_item.vue' do
                 element 'event-item-content'
               end
+
+              view 'ee/app/assets/javascripts/vue_merge_request_widget/components/ai_commit_message.vue' do
+                element 'generate-commit-message'
+                element 'insert-commit-message'
+                element 'ai-commit-message-row'
+              end
             end
           end
 
@@ -232,12 +238,12 @@ def verify_approved
           end
 
           def generate_commit
-            click_button('Generate commit message')
-            click_button('Insert')
+            click_element('generate-commit-message')
+            click_element('insert-commit-message')
           end
 
-          def commit_message
-            find('#merge-message-edit').value
+          def ai_commit_message
+            find_element('ai-commit-message-row').text
           end
 
           private

qa/qa/specs/features/ee/browser_ui/3_create/merge_request/generate_commit_message_spec.rb

@@ -30,7 +30,8 @@ module QA
           Page::MergeRequest::Show.perform do |merge_request|
             merge_request.edit_commit_message
             merge_request.generate_commit
-            expect(merge_request.commit_message).to include('Commit message generated by GitLab Duo')
+
+            expect(merge_request.ai_commit_message).to include('Commit message generated by GitLab Duo')
 
             merge_request.merge!
             expect(merge_request).to be_merged