Merge branch 'master' into 'gl-ui-tooltip'gl-ui-tooltip

# Conflicts:
#   app/assets/javascripts/commons/gitlab_ui.js

3 files changed, 16 insertions, 9 deletions

diff --git a/spec/javascripts/notes/components/discussion_filter_spec.js b/spec/javascripts/notes/components/discussion_filter_spec.js
index 70dd5bb3be5..a81bdf618a3 100644
--- a/spec/javascripts/notes/components/discussion_filter_spec.js
+++ b/spec/javascripts/notes/components/discussion_filter_spec.js
@@ -11,11 +11,13 @@ describe('DiscussionFilter component', () => {
   beforeEach(() => {
     store = createStore();
 
-    const discussions = [{
-      ...discussionMock,
-      id: discussionMock.id,
-      notes: [{ ...discussionMock.notes[0], resolvable: true, resolved: true }],
-    }];
+    const discussions = [
+      {
+        ...discussionMock,
+        id: discussionMock.id,
+        notes: [{ ...discussionMock.notes[0], resolvable: true, resolved: true }],
+      },
+    ];
     const Component = Vue.extend(DiscussionFilter);
     const defaultValue = discussionFiltersMock[0].value;
 
@@ -35,11 +37,15 @@ describe('DiscussionFilter component', () => {
   });
 
   it('renders the all filters', () => {
-    expect(vm.$el.querySelectorAll('.dropdown-menu li').length).toEqual(discussionFiltersMock.length);
+    expect(vm.$el.querySelectorAll('.dropdown-menu li').length).toEqual(
+      discussionFiltersMock.length,
+    );
   });
 
   it('renders the default selected item', () => {
-    expect(vm.$el.querySelector('#discussion-filter-dropdown').textContent.trim()).toEqual(discussionFiltersMock[0].title);
+    expect(vm.$el.querySelector('#discussion-filter-dropdown').textContent.trim()).toEqual(
+      discussionFiltersMock[0].title,
+    );
   });
 
   it('updates to the selected item', () => {
diff --git a/spec/javascripts/notes/components/note_app_spec.js b/spec/javascripts/notes/components/note_app_spec.js
index 06b30375306..3e289a6b8e6 100644
--- a/spec/javascripts/notes/components/note_app_spec.js
+++ b/spec/javascripts/notes/components/note_app_spec.js
@@ -97,7 +97,8 @@ describe('note_app', () => {
     });
 
     it('should render list of notes', done => {
-      const note = mockData.INDIVIDUAL_NOTE_RESPONSE_MAP.GET[
+      const note =
+        mockData.INDIVIDUAL_NOTE_RESPONSE_MAP.GET[
           '/gitlab-org/gitlab-ce/issues/26/discussions.json'
         ][0].notes[0];
 
diff --git a/spec/javascripts/notes/stores/mutation_spec.js b/spec/javascripts/notes/stores/mutation_spec.js
index 9d652ba9f1e..380ab59099d 100644
--- a/spec/javascripts/notes/stores/mutation_spec.js
+++ b/spec/javascripts/notes/stores/mutation_spec.js
@@ -78,7 +78,7 @@ describe('Notes Store mutations', () => {
   });
 
   describe('COLLAPSE_DISCUSSION', () => {
-    it('should collpase an expanded discussion', () => {
+    it('should collapse an expanded discussion', () => {
       const discussion = Object.assign({}, discussionMock, { expanded: true });
 
       const state = {