Add latest changes from gitlab-org/gitlab@master

1 files changed, 26 insertions, 1 deletions

diff --git a/spec/frontend/notes/components/note_header_spec.js b/spec/frontend/notes/components/note_header_spec.js
index 43fbc5e26dc..8b4fab48b7e 100644
--- a/spec/frontend/notes/components/note_header_spec.js
+++ b/spec/frontend/notes/components/note_header_spec.js
@@ -40,13 +40,18 @@ describe('NoteHeader component', () => {
     availability: '',
   };
 
-  const createComponent = (props) => {
+  const createComponent = (props, userAttributes = false) => {
     wrapper = shallowMountExtended(NoteHeader, {
       store: new Vuex.Store({
         actions,
       }),
       propsData: { ...props },
       stubs: { GlSprintf, UserNameWithStatus },
+      provide: {
+        glFeatures: {
+          removeUserAttributes: userAttributes,
+        },
+      },
     });
   };
 
@@ -55,6 +60,26 @@ describe('NoteHeader component', () => {
     wrapper = null;
   });
 
+  describe('when removeUserAttributes feature flag is enabled', () => {
+    it('does not render busy status', () => {
+      createComponent({ author: { ...author, availability: AVAILABILITY_STATUS.BUSY } }, true);
+
+      expect(wrapper.find('.note-header-info').text()).not.toContain('(Busy)');
+    });
+
+    it('does not render author status', () => {
+      createComponent({ author }, true);
+
+      expect(findAuthorStatus().exists()).toBe(false);
+    });
+
+    it('does not render username', () => {
+      createComponent({ author }, true);
+
+      expect(wrapper.find('.note-header-info').text()).not.toContain('@');
+    });
+  });
+
   it('does not render discussion actions when includeToggle is false', () => {
     createComponent({
       includeToggle: false,