Add latest changes from gitlab-org/gitlab@master

4 files changed, 170 insertions, 14 deletions

diff --git a/spec/frontend/monitoring/components/dashboard_spec.js b/spec/frontend/monitoring/components/dashboard_spec.js
index 6ac5248759b..24883e9055e 100644
--- a/spec/frontend/monitoring/components/dashboard_spec.js
+++ b/spec/frontend/monitoring/components/dashboard_spec.js
@@ -1,5 +1,6 @@
 import { shallowMount, mount } from '@vue/test-utils';
 import Tracking from '~/tracking';
+import { ESC_KEY, ESC_KEY_IE11 } from '~/lib/utils/keys';
 import { GlModal, GlDropdownItem, GlDeprecatedButton } from '@gitlab/ui';
 import VueDraggable from 'vuedraggable';
 import MockAdapter from 'axios-mock-adapter';
@@ -248,6 +249,8 @@ describe('Dashboard', () => {
       let group;
       let panel;
 
+      const mockKeyup = key => window.dispatchEvent(new KeyboardEvent('keyup', { key }));
+
       const MockPanel = {
         template: `<div><slot name="topLeft"/></div>`,
       };
@@ -265,6 +268,9 @@ describe('Dashboard', () => {
           group,
           panel,
         });
+
+        jest.spyOn(store, 'dispatch');
+
         return wrapper.vm.$nextTick();
       });
 
@@ -289,17 +295,30 @@ describe('Dashboard', () => {
       });
 
       it('restores full dashboard by clicking `back`', () => {
-        const backBtn = wrapper.find({ ref: 'goBackBtn' });
-        expect(backBtn.exists()).toBe(true);
-
-        jest.spyOn(store, 'dispatch');
-        backBtn.vm.$emit('click');
+        wrapper.find({ ref: 'goBackBtn' }).vm.$emit('click');
 
         expect(store.dispatch).toHaveBeenCalledWith(
           'monitoringDashboard/clearExpandedPanel',
           undefined,
         );
       });
+
+      it('restores dashboard from full screen by typing the Escape key', () => {
+        mockKeyup(ESC_KEY);
+        expect(store.dispatch).toHaveBeenCalledWith(
+          `monitoringDashboard/clearExpandedPanel`,
+          undefined,
+        );
+      });
+
+      it('restores dashboard from full screen by typing the Escape key on IE11', () => {
+        mockKeyup(ESC_KEY_IE11);
+
+        expect(store.dispatch).toHaveBeenCalledWith(
+          `monitoringDashboard/clearExpandedPanel`,
+          undefined,
+        );
+      });
     });
   });
 
diff --git a/spec/frontend/notes/components/discussion_counter_spec.js b/spec/frontend/notes/components/discussion_counter_spec.js
index 77603c16f82..04535aa17c5 100644
--- a/spec/frontend/notes/components/discussion_counter_spec.js
+++ b/spec/frontend/notes/components/discussion_counter_spec.js
@@ -75,15 +75,14 @@ describe('DiscussionCounter component', () => {
     });
 
     it.each`
-      title                | resolved | isActive | icon                     | groupLength
-      ${'not allResolved'} | ${false} | ${false} | ${'check-circle'}        | ${3}
-      ${'allResolved'}     | ${true}  | ${true}  | ${'check-circle-filled'} | ${1}
-    `('renders correctly if $title', ({ resolved, isActive, icon, groupLength }) => {
+      title                | resolved | isActive | groupLength
+      ${'not allResolved'} | ${false} | ${false} | ${3}
+      ${'allResolved'}     | ${true}  | ${true}  | ${1}
+    `('renders correctly if $title', ({ resolved, isActive, groupLength }) => {
       updateStore({ resolvable: true, resolved });
       wrapper = shallowMount(DiscussionCounter, { store, localVue });
 
       expect(wrapper.find(`.is-active`).exists()).toBe(isActive);
-      expect(wrapper.find({ name: icon }).exists()).toBe(true);
       expect(wrapper.findAll('[role="group"').length).toBe(groupLength);
     });
   });
diff --git a/spec/frontend/sidebar/assignees_realtime_spec.js b/spec/frontend/sidebar/assignees_realtime_spec.js
new file mode 100644
index 00000000000..d6a6ca18fe8
--- /dev/null
+++ b/spec/frontend/sidebar/assignees_realtime_spec.js
@@ -0,0 +1,100 @@
+import { shallowMount } from '@vue/test-utils';
+import ActionCable from '@rails/actioncable';
+import AssigneesRealtime from '~/sidebar/components/assignees/assignees_realtime.vue';
+import SidebarMediator from '~/sidebar/sidebar_mediator';
+import Mock from './mock_data';
+import query from '~/issuable_sidebar/queries/issue_sidebar.query.graphql';
+
+jest.mock('@rails/actioncable', () => {
+  const mockConsumer = { subscriptions: { create: jest.fn() } };
+  return {
+    createConsumer: jest.fn().mockReturnValue(mockConsumer),
+  };
+});
+
+describe('Assignees Realtime', () => {
+  let wrapper;
+  let mediator;
+
+  const createComponent = () => {
+    wrapper = shallowMount(AssigneesRealtime, {
+      propsData: {
+        issuableIid: '1',
+        mediator,
+        projectPath: 'path/to/project',
+      },
+      mocks: {
+        $apollo: {
+          query,
+          queries: {
+            project: {
+              refetch: jest.fn(),
+            },
+          },
+        },
+      },
+    });
+  };
+
+  beforeEach(() => {
+    mediator = new SidebarMediator(Mock.mediator);
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+    SidebarMediator.singleton = null;
+  });
+
+  describe('when handleFetchResult is called from smart query', () => {
+    it('sets assignees to the store', () => {
+      const data = {
+        project: {
+          issue: {
+            assignees: {
+              nodes: [{ id: 'gid://gitlab/Environments/123', avatarUrl: 'url' }],
+            },
+          },
+        },
+      };
+      const expected = [{ id: 123, avatar_url: 'url', avatarUrl: 'url' }];
+      createComponent();
+
+      wrapper.vm.handleFetchResult({ data });
+
+      expect(mediator.store.assignees).toEqual(expected);
+    });
+  });
+
+  describe('when mounted', () => {
+    it('calls create subscription', () => {
+      const cable = ActionCable.createConsumer();
+
+      createComponent();
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(cable.subscriptions.create).toHaveBeenCalledTimes(1);
+        expect(cable.subscriptions.create).toHaveBeenCalledWith(
+          {
+            channel: 'IssuesChannel',
+            iid: wrapper.props('issuableIid'),
+            project_path: wrapper.props('projectPath'),
+          },
+          { received: wrapper.vm.received },
+        );
+      });
+    });
+  });
+
+  describe('when subscription is recieved', () => {
+    it('refetches the GraphQL project query', () => {
+      createComponent();
+
+      wrapper.vm.received({ event: 'updated' });
+
+      return wrapper.vm.$nextTick().then(() => {
+        expect(wrapper.vm.$apollo.queries.project.refetch).toHaveBeenCalledTimes(1);
+      });
+    });
+  });
+});
diff --git a/spec/frontend/sidebar/sidebar_assignees_spec.js b/spec/frontend/sidebar/sidebar_assignees_spec.js
index c1876066a21..88e2d2c9514 100644
--- a/spec/frontend/sidebar/sidebar_assignees_spec.js
+++ b/spec/frontend/sidebar/sidebar_assignees_spec.js
@@ -3,6 +3,7 @@ import AxiosMockAdapter from 'axios-mock-adapter';
 import axios from 'axios';
 import SidebarAssignees from '~/sidebar/components/assignees/sidebar_assignees.vue';
 import Assigness from '~/sidebar/components/assignees/assignees.vue';
+import AssigneesRealtime from '~/sidebar/components/assignees/assignees_realtime.vue';
 import SidebarMediator from '~/sidebar/sidebar_mediator';
 import SidebarService from '~/sidebar/services/sidebar_service';
 import SidebarStore from '~/sidebar/stores/sidebar_store';
@@ -12,12 +13,19 @@ describe('sidebar assignees', () => {
   let wrapper;
   let mediator;
   let axiosMock;
-
-  const createComponent = () => {
+  const createComponent = (realTimeIssueSidebar = false, props) => {
     wrapper = shallowMount(SidebarAssignees, {
       propsData: {
+        issuableIid: '1',
         mediator,
         field: '',
+        projectPath: 'projectPath',
+        ...props,
+      },
+      provide: {
+        glFeatures: {
+          realTimeIssueSidebar,
+        },
       },
       // Attaching to document is required because this component emits something from the parent element :/
       attachToDocument: true,
@@ -30,8 +38,6 @@ describe('sidebar assignees', () => {
 
     jest.spyOn(mediator, 'saveAssignees');
     jest.spyOn(mediator, 'assignYourself');
-
-    createComponent();
   });
 
   afterEach(() => {
@@ -45,6 +51,8 @@ describe('sidebar assignees', () => {
   });
 
   it('calls the mediator when saves the assignees', () => {
+    createComponent();
+
     expect(mediator.saveAssignees).not.toHaveBeenCalled();
 
     wrapper.vm.saveAssignees();
@@ -53,6 +61,8 @@ describe('sidebar assignees', () => {
   });
 
   it('calls the mediator when "assignSelf" method is called', () => {
+    createComponent();
+
     expect(mediator.assignYourself).not.toHaveBeenCalled();
     expect(mediator.store.assignees.length).toBe(0);
 
@@ -63,6 +73,8 @@ describe('sidebar assignees', () => {
   });
 
   it('hides assignees until fetched', () => {
+    createComponent();
+
     expect(wrapper.find(Assigness).exists()).toBe(false);
 
     wrapper.vm.store.isFetching.assignees = false;
@@ -71,4 +83,30 @@ describe('sidebar assignees', () => {
       expect(wrapper.find(Assigness).exists()).toBe(true);
     });
   });
+
+  describe('when realTimeIssueSidebar is turned on', () => {
+    describe('when issuableType is issue', () => {
+      it('finds AssigneesRealtime componeont', () => {
+        createComponent(true);
+
+        expect(wrapper.find(AssigneesRealtime).exists()).toBe(true);
+      });
+    });
+
+    describe('when issuableType is MR', () => {
+      it('does not find AssigneesRealtime componeont', () => {
+        createComponent(true, { issuableType: 'MR' });
+
+        expect(wrapper.find(AssigneesRealtime).exists()).toBe(false);
+      });
+    });
+  });
+
+  describe('when realTimeIssueSidebar is turned off', () => {
+    it('does not find AssigneesRealtime', () => {
+      createComponent(false, { issuableType: 'issue' });
+
+      expect(wrapper.find(AssigneesRealtime).exists()).toBe(false);
+    });
+  });
 });