Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 5 deletions

diff --git a/spec/frontend/vue_shared/components/markdown/field_spec.js b/spec/frontend/vue_shared/components/markdown/field_spec.js
index 85a135d2b89..50864a4bf25 100644
--- a/spec/frontend/vue_shared/components/markdown/field_spec.js
+++ b/spec/frontend/vue_shared/components/markdown/field_spec.js
@@ -76,7 +76,7 @@ describe('Markdown field component', () => {
   const getMarkdownButton = () => subject.find('.js-md');
   const getListBulletedButton = () => subject.findAll('.js-md[title="Add a bullet list"]');
   const getVideo = () => subject.find('video');
-  const getAttachButton = () => subject.find('.button-attach-file');
+  const getAttachButton = () => subject.findByTestId('button-attach-file');
   const clickAttachButton = () => getAttachButton().trigger('click');
   const findDropzone = () => subject.find('.div-dropzone');
   const findMarkdownHeader = () => subject.findComponent(MarkdownFieldHeader);
@@ -232,13 +232,10 @@ describe('Markdown field component', () => {
       });
     });
 
-    it('should render attach a file button', () => {
-      expect(getAttachButton().text()).toBe('Attach a file');
-    });
-
     it('should trigger dropzone when attach button is clicked', () => {
       expect(dropzoneSpy).not.toHaveBeenCalled();
 
+      getAttachButton().trigger('click');
       clickAttachButton();
 
       expect(dropzoneSpy).toHaveBeenCalled();
diff --git a/spec/frontend/vue_shared/components/markdown/header_spec.js b/spec/frontend/vue_shared/components/markdown/header_spec.js
index 67222cab247..12972fff58e 100644
--- a/spec/frontend/vue_shared/components/markdown/header_spec.js
+++ b/spec/frontend/vue_shared/components/markdown/header_spec.js
@@ -56,6 +56,7 @@ describe('Markdown field header component', () => {
         'Add a task list',
         'Add a collapsible section',
         'Add a table',
+        'Attach a file or image',
         'Go full screen',
       ];
       const elements = findToolbarButtons();