Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 1 deletions

diff --git a/spec/frontend/content_editor/components/formatting_toolbar_spec.js b/spec/frontend/content_editor/components/formatting_toolbar_spec.js
index e04c6a00765..9d835381ff4 100644
--- a/spec/frontend/content_editor/components/formatting_toolbar_spec.js
+++ b/spec/frontend/content_editor/components/formatting_toolbar_spec.js
@@ -12,13 +12,14 @@ describe('content_editor/components/formatting_toolbar', () => {
   let wrapper;
   let trackingSpy;
 
-  const buildWrapper = () => {
+  const buildWrapper = (props) => {
     wrapper = shallowMountExtended(FormattingToolbar, {
       stubs: {
         GlTabs,
         GlTab,
         EditorModeSwitcher,
       },
+      propsData: props,
     });
   };
 
@@ -73,4 +74,12 @@ describe('content_editor/components/formatting_toolbar', () => {
 
     expect(wrapper.findComponent(EditorModeSwitcher).exists()).toBe(true);
   });
+
+  describe('when attachment button is hidden', () => {
+    it('does not show the attachment button', () => {
+      buildWrapper({ hideAttachmentButton: true });
+
+      expect(wrapper.findByTestId('attachment').exists()).toBe(false);
+    });
+  });
 });