Merge branch '62673-clean-note-app-tests' into 'master'

make test of note app with comments disabled dry

Closes #62673

See merge request gitlab-org/gitlab-ce!32383

changelogs/unreleased/62673-clean-note-app-tests.yml

+---
+title: make test of note app with comments disabled dry
+merge_request: 32383
+author: Romain Maneschi
+type: other

spec/frontend/notes/components/note_app_spec.js

@@ -133,32 +133,31 @@ describe('note_app', () => {
       );
     });
 
-    it('should not render form when commenting is disabled', () => {
-      wrapper.destroy();
+    it('should render form comment button as disabled', () => {
+      expect(wrapper.find('.js-note-new-discussion').attributes('disabled')).toEqual('disabled');
+    });
 
-      store.state.commentsDisabled = true;
-      wrapper = mountComponent();
-      return waitForDiscussionsRequest().then(() => {
-        expect(wrapper.find('.js-main-target-form').exists()).toBe(false);
+    it('updates discussions badge', () => {
+      expect(document.querySelector('.js-discussions-count').textContent).toEqual('2');
     });
   });
 
-    it('should render discussion filter note `commentsDisabled` is true', () => {
-      wrapper.destroy();
+  describe('render with comments disabled', () => {
+    beforeEach(() => {
+      setFixtures('<div class="js-discussions-count"></div>');
 
+      Vue.http.interceptors.push(mockData.individualNoteInterceptor);
       store.state.commentsDisabled = true;
       wrapper = mountComponent();
-      return waitForDiscussionsRequest().then(() => {
-        expect(wrapper.find('.js-discussion-filter-note').exists()).toBe(true);
-      });
+      return waitForDiscussionsRequest();
     });
 
-    it('should render form comment button as disabled', () => {
-      expect(wrapper.find('.js-note-new-discussion').attributes('disabled')).toEqual('disabled');
+    it('should not render form when commenting is disabled', () => {
+      expect(wrapper.find('.js-main-target-form').exists()).toBe(false);
     });
 
-    it('updates discussions badge', () => {
-      expect(document.querySelector('.js-discussions-count').textContent).toEqual('2');
+    it('should render discussion filter note `commentsDisabled` is true', () => {
+      expect(wrapper.find('.js-discussion-filter-note').exists()).toBe(true);
     });
   });