Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42

7 files changed, 12 insertions, 11 deletions

diff --git a/spec/frontend/snippets/components/__snapshots__/snippet_blob_edit_spec.js.snap b/spec/frontend/snippets/components/__snapshots__/snippet_blob_edit_spec.js.snap
index 1c60c3af310..6414ab6dfba 100644
--- a/spec/frontend/snippets/components/__snapshots__/snippet_blob_edit_spec.js.snap
+++ b/spec/frontend/snippets/components/__snapshots__/snippet_blob_edit_spec.js.snap
@@ -3,11 +3,11 @@
 exports[`Snippet Blob Edit component with loaded blob matches snapshot 1`] = `
 <div
   class="file-holder snippet"
-  data-qa-selector="file_holder_container"
+  data-testid="file-holder-container"
 >
   <blob-header-edit-stub
     candelete="true"
-    data-qa-selector="file_name_field"
+    data-testid="file-name-field"
     id="reference-0"
     showdelete="true"
     value="foo/bar/test.md"
diff --git a/spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap b/spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap
index 5ed3b520b70..92511acc4f8 100644
--- a/spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap
+++ b/spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap
@@ -17,7 +17,7 @@ exports[`Snippet Description Edit component rendering matches the snapshot 1`] =
     >
       <gl-form-input-stub
         class="form-control"
-        data-qa-selector="description_placeholder"
+        data-testid="description-placeholder"
         placeholder="Describe what your snippet does or how to use it…"
       />
     </div>
@@ -46,8 +46,8 @@ exports[`Snippet Description Edit component rendering matches the snapshot 1`] =
             <textarea
               aria-label="Description"
               class="js-autosize js-gfm-input js-gfm-input-initialized markdown-area note-textarea"
-              data-qa-selector="snippet_description_field"
               data-supports-quick-actions="false"
+              data-testid="snippet-description-field"
               dir="auto"
               id="reference-0"
               placeholder="Write a comment or drag your files here…"
diff --git a/spec/frontend/snippets/components/__snapshots__/snippet_description_view_spec.js.snap b/spec/frontend/snippets/components/__snapshots__/snippet_description_view_spec.js.snap
index 2b2335036f6..7c5fbf4cfb7 100644
--- a/spec/frontend/snippets/components/__snapshots__/snippet_description_view_spec.js.snap
+++ b/spec/frontend/snippets/components/__snapshots__/snippet_description_view_spec.js.snap
@@ -3,7 +3,7 @@
 exports[`Snippet Description component matches the snapshot 1`] = `
 <markdown-field-view-stub
   class="snippet-description"
-  data-qa-selector="snippet_description_content"
+  data-testid="snippet-description-content"
 >
   <div
     class="js-snippet-description md"
diff --git a/spec/frontend/snippets/components/__snapshots__/snippet_visibility_edit_spec.js.snap b/spec/frontend/snippets/components/__snapshots__/snippet_visibility_edit_spec.js.snap
index 3274f41e4af..ab96d1a3653 100644
--- a/spec/frontend/snippets/components/__snapshots__/snippet_visibility_edit_spec.js.snap
+++ b/spec/frontend/snippets/components/__snapshots__/snippet_visibility_edit_spec.js.snap
@@ -44,8 +44,8 @@ exports[`Snippet Visibility Edit component rendering matches the snapshot 1`] =
           />
           <span
             class="font-weight-bold js-visibility-option ml-1"
-            data-qa-selector="visibility_content"
             data-qa-visibility="Private"
+            data-testid="visibility-content"
           >
             Private
           </span>
@@ -64,8 +64,8 @@ exports[`Snippet Visibility Edit component rendering matches the snapshot 1`] =
           />
           <span
             class="font-weight-bold js-visibility-option ml-1"
-            data-qa-selector="visibility_content"
             data-qa-visibility="Internal"
+            data-testid="visibility-content"
           >
             Internal
           </span>
@@ -84,8 +84,8 @@ exports[`Snippet Visibility Edit component rendering matches the snapshot 1`] =
           />
           <span
             class="font-weight-bold js-visibility-option ml-1"
-            data-qa-selector="visibility_content"
             data-qa-visibility="Public"
+            data-testid="visibility-content"
           >
             Public
           </span>
diff --git a/spec/frontend/snippets/components/edit_spec.js b/spec/frontend/snippets/components/edit_spec.js
index 17862953920..5fbc16ff430 100644
--- a/spec/frontend/snippets/components/edit_spec.js
+++ b/spec/frontend/snippets/components/edit_spec.js
@@ -117,7 +117,8 @@ describe('Snippet Edit app', () => {
       .map((path) => `<input name="files[]" value="${path}">`)
       .join('');
   };
-  const setTitle = (val) => wrapper.findByTestId('snippet-title-input').vm.$emit('input', val);
+  const setTitle = (val) =>
+    wrapper.findByTestId('snippet-title-input-field').vm.$emit('input', val);
   const setDescription = (val) =>
     wrapper.findComponent(SnippetDescriptionEdit).vm.$emit('input', val);
 
diff --git a/spec/frontend/snippets/components/snippet_blob_actions_edit_spec.js b/spec/frontend/snippets/components/snippet_blob_actions_edit_spec.js
index cb11e98cd35..fab65434c3a 100644
--- a/spec/frontend/snippets/components/snippet_blob_actions_edit_spec.js
+++ b/spec/frontend/snippets/components/snippet_blob_actions_edit_spec.js
@@ -40,7 +40,7 @@ describe('snippets/components/snippet_blob_actions_edit', () => {
       classes: x.classes(),
     }));
   const findFirstBlobEdit = () => findBlobEdits().at(0);
-  const findAddButton = () => wrapper.find('[data-testid="add_button"]');
+  const findAddButton = () => wrapper.find('[data-testid="add-button"]');
   const findLimitationsText = () => wrapper.find('[data-testid="limitations_text"]');
   const getLastActions = () => {
     const events = wrapper.emitted().actions;
diff --git a/spec/frontend/snippets/components/snippet_header_spec.js b/spec/frontend/snippets/components/snippet_header_spec.js
index 4bf64bfd3cd..3932675aa52 100644
--- a/spec/frontend/snippets/components/snippet_header_spec.js
+++ b/spec/frontend/snippets/components/snippet_header_spec.js
@@ -331,7 +331,7 @@ describe('Snippet header component', () => {
       expect(findDeleteModal().props().visible).toBe(true);
 
       // Click delete button in delete modal
-      document.querySelector('[data-testid="delete-snippet"').click();
+      document.querySelector('[data-testid="delete-snippet-button"').click();
       await waitForPromises();
     };