From ba87878e2731e90c8eedb9c1f304310d42711f14 Mon Sep 17 00:00:00 2001
From: Simon Knox <psimyn@gmail.com>
Date: Thu, 30 Nov 2017 19:13:26 +1100
Subject: fix import order lint

---
 .../vue_shared/notes/components/comment_form.vue   |  6 +--
 .../vue_shared/notes/components/note_body.vue      |  2 +-
 .../vue_shared/notes/components/note_form.vue      |  2 +-
 .../notes/components/noteable_discussion.vue       |  6 +--
 .../vue_shared/notes/components/notes_app.vue      | 10 ++--
 .../javascripts/vue_shared/notes/stores/actions.js |  6 +--
 .../notes/components/comment_form_spec.js          |  2 +-
 .../vue_shared/notes/components/note_form_spec.js  |  2 +-
 .../components/notes/placeholder_note_spec.js      | 39 ---------------
 .../notes/placeholder_system_note_spec.js          | 25 ----------
 .../notes/components/notes/system_note_spec.js     | 57 ----------------------
 .../notes/components/placeholder_note_spec.js      | 39 +++++++++++++++
 .../components/placeholder_system_note_spec.js     | 25 ++++++++++
 .../notes/components/system_note_spec.js           | 57 ++++++++++++++++++++++
 .../vue_shared/notes/stores/actions_spec.js        |  2 +-
 15 files changed, 140 insertions(+), 140 deletions(-)
 delete mode 100644 spec/javascripts/vue_shared/notes/components/notes/placeholder_note_spec.js
 delete mode 100644 spec/javascripts/vue_shared/notes/components/notes/placeholder_system_note_spec.js
 delete mode 100644 spec/javascripts/vue_shared/notes/components/notes/system_note_spec.js
 create mode 100644 spec/javascripts/vue_shared/notes/components/placeholder_note_spec.js
 create mode 100644 spec/javascripts/vue_shared/notes/components/placeholder_system_note_spec.js
 create mode 100644 spec/javascripts/vue_shared/notes/components/system_note_spec.js

diff --git a/app/assets/javascripts/vue_shared/notes/components/comment_form.vue b/app/assets/javascripts/vue_shared/notes/components/comment_form.vue
index 413e143d949..ccb94fefb6d 100644
--- a/app/assets/javascripts/vue_shared/notes/components/comment_form.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/comment_form.vue
@@ -5,13 +5,13 @@
   import Flash from '~/flash';
   import Autosave from '~/autosave';
   import TaskList from '~/task_list';
+  import markdownField from '~/vue_shared/components/markdown/field.vue';
+  import userAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
+  import issueWarning from '~/vue_shared/components/issue/issue_warning.vue';
   import * as constants from '../constants';
   import eventHub from '../event_hub';
-  import issueWarning from '~/vue_shared/components/issue/issue_warning.vue';
   import noteSignedOutWidget from './note_signed_out_widget.vue';
   import discussionLockedWidget from './discussion_locked_widget.vue';
-  import markdownField from '~/vue_shared/components/markdown/field.vue';
-  import userAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
   import issuableStateMixin from '../mixins/issuable_state';
 
   export default {
diff --git a/app/assets/javascripts/vue_shared/notes/components/note_body.vue b/app/assets/javascripts/vue_shared/notes/components/note_body.vue
index 33b1eb945f2..2fbd882f415 100644
--- a/app/assets/javascripts/vue_shared/notes/components/note_body.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/note_body.vue
@@ -1,9 +1,9 @@
 <script>
+  import TaskList from '~/task_list';
   import noteEditedText from './note_edited_text.vue';
   import noteAwardsList from './note_awards_list.vue';
   import noteAttachment from './note_attachment.vue';
   import noteForm from './note_form.vue';
-  import TaskList from '~/task_list';
   import autosave from '../mixins/autosave';
 
   export default {
diff --git a/app/assets/javascripts/vue_shared/notes/components/note_form.vue b/app/assets/javascripts/vue_shared/notes/components/note_form.vue
index 48bf08ba554..5e2b4ebf26e 100644
--- a/app/assets/javascripts/vue_shared/notes/components/note_form.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/note_form.vue
@@ -1,8 +1,8 @@
 <script>
   import { mapGetters } from 'vuex';
-  import eventHub from '../event_hub';
   import issueWarning from '~/vue_shared/components/issue/issue_warning.vue';
   import markdownField from '~/vue_shared/components/markdown/field.vue';
+  import eventHub from '../event_hub';
   import issuableStateMixin from '../mixins/issuable_state';
 
   export default {
diff --git a/app/assets/javascripts/vue_shared/notes/components/noteable_discussion.vue b/app/assets/javascripts/vue_shared/notes/components/noteable_discussion.vue
index 5b37b74b604..4e000be2eb3 100644
--- a/app/assets/javascripts/vue_shared/notes/components/noteable_discussion.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/noteable_discussion.vue
@@ -1,15 +1,15 @@
 <script>
   import { mapActions, mapGetters } from 'vuex';
   import Flash from '~/flash';
-  import { SYSTEM_NOTE } from '../constants';
   import userAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue';
+  import { SYSTEM_NOTE } from '../constants';
   import noteHeader from './note_header.vue';
   import noteSignedOutWidget from './note_signed_out_widget.vue';
   import noteEditedText from './note_edited_text.vue';
   import noteForm from './note_form.vue';
   import noteableNote from './noteable_note.vue';
-  import placeholderNote from '~/vue_shared/notes/components/placeholder_note.vue';
-  import placeholderSystemNote from '~/vue_shared/notes/components/placeholder_system_note.vue';
+  import placeholderNote from './placeholder_note.vue';
+  import placeholderSystemNote from './placeholder_system_note.vue';
   import autosave from '../mixins/autosave';
 
   export default {
diff --git a/app/assets/javascripts/vue_shared/notes/components/notes_app.vue b/app/assets/javascripts/vue_shared/notes/components/notes_app.vue
index 12f25ef9f44..a0f387586df 100644
--- a/app/assets/javascripts/vue_shared/notes/components/notes_app.vue
+++ b/app/assets/javascripts/vue_shared/notes/components/notes_app.vue
@@ -1,15 +1,15 @@
 <script>
   import { mapGetters, mapActions } from 'vuex';
   import Flash from '~/flash';
-  import store from '../stores/';
-  import * as constants from '../constants';
-  import noteableNote from './noteable_note.vue';
-  import noteableDiscussion from './noteable_discussion.vue';
   import systemNote from '~/vue_shared/notes/components/system_note.vue';
-  import commentForm from './comment_form.vue';
   import placeholderNote from '~/vue_shared/notes/components/placeholder_note.vue';
   import placeholderSystemNote from '~/vue_shared/notes/components/placeholder_system_note.vue';
   import loadingIcon from '~/vue_shared/components/loading_icon.vue';
+  import noteableDiscussion from './noteable_discussion.vue';
+  import store from '../stores/';
+  import * as constants from '../constants';
+  import noteableNote from './noteable_note.vue';
+  import commentForm from './comment_form.vue';
 
   export default {
     name: 'notesApp',
diff --git a/app/assets/javascripts/vue_shared/notes/stores/actions.js b/app/assets/javascripts/vue_shared/notes/stores/actions.js
index 957f642bce7..3b87ccdc92e 100644
--- a/app/assets/javascripts/vue_shared/notes/stores/actions.js
+++ b/app/assets/javascripts/vue_shared/notes/stores/actions.js
@@ -1,13 +1,13 @@
 import Visibility from 'visibilityjs';
 import Flash from '~/flash';
 import Poll from '~/lib/utils/poll';
+import loadAwardsHandler from '~/awards_handler';
+import sidebarTimeTrackingEventHub from '~/sidebar/event_hub';
+import { isInViewport, scrollToElement } from '~/lib/utils/common_utils';
 import * as types from './mutation_types';
 import * as utils from './utils';
 import * as constants from '../constants';
 import service from '../services/notes_service';
-import loadAwardsHandler from '~/awards_handler';
-import sidebarTimeTrackingEventHub from '~/sidebar/event_hub';
-import { isInViewport, scrollToElement } from '~/lib/utils/common_utils';
 
 let eTagPoll;
 
diff --git a/spec/javascripts/vue_shared/notes/components/comment_form_spec.js b/spec/javascripts/vue_shared/notes/components/comment_form_spec.js
index 516e1b1b192..7741c99f78d 100644
--- a/spec/javascripts/vue_shared/notes/components/comment_form_spec.js
+++ b/spec/javascripts/vue_shared/notes/components/comment_form_spec.js
@@ -3,7 +3,7 @@ import Autosize from 'autosize';
 import store from '~/vue_shared/notes/stores';
 import issueCommentForm from '~/vue_shared/notes/components/comment_form.vue';
 import { loggedOutnoteableData, notesDataMock, userDataMock, noteableDataMock } from '../mock_data';
-import { keyboardDownEvent } from '../../issue_show/helpers';
+import { keyboardDownEvent } from '../../../issue_show/helpers';
 
 describe('issue_comment_form component', () => {
   let vm;
diff --git a/spec/javascripts/vue_shared/notes/components/note_form_spec.js b/spec/javascripts/vue_shared/notes/components/note_form_spec.js
index 4c56057b448..2819e07a3ca 100644
--- a/spec/javascripts/vue_shared/notes/components/note_form_spec.js
+++ b/spec/javascripts/vue_shared/notes/components/note_form_spec.js
@@ -2,7 +2,7 @@ import Vue from 'vue';
 import store from '~/vue_shared/notes/stores';
 import issueNoteForm from '~/vue_shared/notes/components/note_form.vue';
 import { noteableDataMock, notesDataMock } from '../mock_data';
-import { keyboardDownEvent } from '../../issue_show/helpers';
+import { keyboardDownEvent } from '../../../issue_show/helpers';
 
 describe('issue_note_form component', () => {
   let vm;
diff --git a/spec/javascripts/vue_shared/notes/components/notes/placeholder_note_spec.js b/spec/javascripts/vue_shared/notes/components/notes/placeholder_note_spec.js
deleted file mode 100644
index 7c4123e70ed..00000000000
--- a/spec/javascripts/vue_shared/notes/components/notes/placeholder_note_spec.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import Vue from 'vue';
-import issuePlaceholderNote from '~/vue_shared/notes/components/placeholder_note.vue';
-import store from '~/vue_shared/notes/stores';
-import { userDataMock } from '../../../notes/mock_data';
-
-describe('issue placeholder system note component', () => {
-  let vm;
-
-  beforeEach(() => {
-    const Component = Vue.extend(issuePlaceholderNote);
-    store.dispatch('setUserData', userDataMock);
-    vm = new Component({
-      store,
-      propsData: { note: { body: 'Foo' } },
-    }).$mount();
-  });
-
-  afterEach(() => {
-    vm.$destroy();
-  });
-
-  describe('user information', () => {
-    it('should render user avatar with link', () => {
-      expect(vm.$el.querySelector('.user-avatar-link').getAttribute('href')).toEqual(userDataMock.path);
-      expect(vm.$el.querySelector('.user-avatar-link img').getAttribute('src')).toEqual(userDataMock.avatar_url);
-    });
-  });
-
-  describe('note content', () => {
-    it('should render note header information', () => {
-      expect(vm.$el.querySelector('.note-header-info a').getAttribute('href')).toEqual(userDataMock.path);
-      expect(vm.$el.querySelector('.note-header-info .note-headline-light').textContent.trim()).toEqual(`@${userDataMock.username}`);
-    });
-
-    it('should render note body', () => {
-      expect(vm.$el.querySelector('.note-text p').textContent.trim()).toEqual('Foo');
-    });
-  });
-});
diff --git a/spec/javascripts/vue_shared/notes/components/notes/placeholder_system_note_spec.js b/spec/javascripts/vue_shared/notes/components/notes/placeholder_system_note_spec.js
deleted file mode 100644
index 2b7398bcefe..00000000000
--- a/spec/javascripts/vue_shared/notes/components/notes/placeholder_system_note_spec.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import Vue from 'vue';
-import placeholderSystemNote from '~/vue_shared/notes/components/placeholder_system_note.vue';
-import mountComponent from '../../../helpers/vue_mount_component_helper';
-
-describe('placeholder system note component', () => {
-  let PlaceholderSystemNote;
-  let vm;
-
-  beforeEach(() => {
-    PlaceholderSystemNote = Vue.extend(placeholderSystemNote);
-  });
-
-  afterEach(() => {
-    vm.$destroy();
-  });
-
-  it('should render system note placeholder with plain text', () => {
-    vm = mountComponent(PlaceholderSystemNote, {
-      note: { body: 'This is a placeholder' },
-    });
-
-    expect(vm.$el.tagName).toEqual('LI');
-    expect(vm.$el.querySelector('.timeline-content em').textContent.trim()).toEqual('This is a placeholder');
-  });
-});
diff --git a/spec/javascripts/vue_shared/notes/components/notes/system_note_spec.js b/spec/javascripts/vue_shared/notes/components/notes/system_note_spec.js
deleted file mode 100644
index 60e591d9d5f..00000000000
--- a/spec/javascripts/vue_shared/notes/components/notes/system_note_spec.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import Vue from 'vue';
-import issueSystemNote from '~/vue_shared/notes/components/system_note.vue';
-import store from '~/vue_shared/notes/stores';
-
-describe('issue system note', () => {
-  let vm;
-  let props;
-
-  beforeEach(() => {
-    props = {
-      note: {
-        id: 1424,
-        author: {
-          id: 1,
-          name: 'Root',
-          username: 'root',
-          state: 'active',
-          avatar_url: 'path',
-          path: '/root',
-        },
-        note_html: '<p dir="auto">closed</p>',
-        system_note_icon_name: 'icon_status_closed',
-        created_at: '2017-08-02T10:51:58.559Z',
-      },
-    };
-
-    store.dispatch('setTargetNoteHash', `note_${props.note.id}`);
-
-    const Component = Vue.extend(issueSystemNote);
-    vm = new Component({
-      store,
-      propsData: props,
-    }).$mount();
-  });
-
-  afterEach(() => {
-    vm.$destroy();
-  });
-
-  it('should render a list item with correct id', () => {
-    expect(vm.$el.getAttribute('id')).toEqual(`note_${props.note.id}`);
-  });
-
-  it('should render target class is note is target note', () => {
-    expect(vm.$el.classList).toContain('target');
-  });
-
-  it('should render svg icon', () => {
-    expect(vm.$el.querySelector('.timeline-icon svg')).toBeDefined();
-  });
-
-  it('should render note header component', () => {
-    expect(
-      vm.$el.querySelector('.system-note-message').innerHTML,
-    ).toEqual(props.note.note_html);
-  });
-});
diff --git a/spec/javascripts/vue_shared/notes/components/placeholder_note_spec.js b/spec/javascripts/vue_shared/notes/components/placeholder_note_spec.js
new file mode 100644
index 00000000000..6d19d2154e3
--- /dev/null
+++ b/spec/javascripts/vue_shared/notes/components/placeholder_note_spec.js
@@ -0,0 +1,39 @@
+import Vue from 'vue';
+import issuePlaceholderNote from '~/vue_shared/notes/components/placeholder_note.vue';
+import store from '~/vue_shared/notes/stores';
+import { userDataMock } from '../mock_data';
+
+describe('issue placeholder system note component', () => {
+  let vm;
+
+  beforeEach(() => {
+    const Component = Vue.extend(issuePlaceholderNote);
+    store.dispatch('setUserData', userDataMock);
+    vm = new Component({
+      store,
+      propsData: { note: { body: 'Foo' } },
+    }).$mount();
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  describe('user information', () => {
+    it('should render user avatar with link', () => {
+      expect(vm.$el.querySelector('.user-avatar-link').getAttribute('href')).toEqual(userDataMock.path);
+      expect(vm.$el.querySelector('.user-avatar-link img').getAttribute('src')).toEqual(userDataMock.avatar_url);
+    });
+  });
+
+  describe('note content', () => {
+    it('should render note header information', () => {
+      expect(vm.$el.querySelector('.note-header-info a').getAttribute('href')).toEqual(userDataMock.path);
+      expect(vm.$el.querySelector('.note-header-info .note-headline-light').textContent.trim()).toEqual(`@${userDataMock.username}`);
+    });
+
+    it('should render note body', () => {
+      expect(vm.$el.querySelector('.note-text p').textContent.trim()).toEqual('Foo');
+    });
+  });
+});
diff --git a/spec/javascripts/vue_shared/notes/components/placeholder_system_note_spec.js b/spec/javascripts/vue_shared/notes/components/placeholder_system_note_spec.js
new file mode 100644
index 00000000000..2b7398bcefe
--- /dev/null
+++ b/spec/javascripts/vue_shared/notes/components/placeholder_system_note_spec.js
@@ -0,0 +1,25 @@
+import Vue from 'vue';
+import placeholderSystemNote from '~/vue_shared/notes/components/placeholder_system_note.vue';
+import mountComponent from '../../../helpers/vue_mount_component_helper';
+
+describe('placeholder system note component', () => {
+  let PlaceholderSystemNote;
+  let vm;
+
+  beforeEach(() => {
+    PlaceholderSystemNote = Vue.extend(placeholderSystemNote);
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  it('should render system note placeholder with plain text', () => {
+    vm = mountComponent(PlaceholderSystemNote, {
+      note: { body: 'This is a placeholder' },
+    });
+
+    expect(vm.$el.tagName).toEqual('LI');
+    expect(vm.$el.querySelector('.timeline-content em').textContent.trim()).toEqual('This is a placeholder');
+  });
+});
diff --git a/spec/javascripts/vue_shared/notes/components/system_note_spec.js b/spec/javascripts/vue_shared/notes/components/system_note_spec.js
new file mode 100644
index 00000000000..60e591d9d5f
--- /dev/null
+++ b/spec/javascripts/vue_shared/notes/components/system_note_spec.js
@@ -0,0 +1,57 @@
+import Vue from 'vue';
+import issueSystemNote from '~/vue_shared/notes/components/system_note.vue';
+import store from '~/vue_shared/notes/stores';
+
+describe('issue system note', () => {
+  let vm;
+  let props;
+
+  beforeEach(() => {
+    props = {
+      note: {
+        id: 1424,
+        author: {
+          id: 1,
+          name: 'Root',
+          username: 'root',
+          state: 'active',
+          avatar_url: 'path',
+          path: '/root',
+        },
+        note_html: '<p dir="auto">closed</p>',
+        system_note_icon_name: 'icon_status_closed',
+        created_at: '2017-08-02T10:51:58.559Z',
+      },
+    };
+
+    store.dispatch('setTargetNoteHash', `note_${props.note.id}`);
+
+    const Component = Vue.extend(issueSystemNote);
+    vm = new Component({
+      store,
+      propsData: props,
+    }).$mount();
+  });
+
+  afterEach(() => {
+    vm.$destroy();
+  });
+
+  it('should render a list item with correct id', () => {
+    expect(vm.$el.getAttribute('id')).toEqual(`note_${props.note.id}`);
+  });
+
+  it('should render target class is note is target note', () => {
+    expect(vm.$el.classList).toContain('target');
+  });
+
+  it('should render svg icon', () => {
+    expect(vm.$el.querySelector('.timeline-icon svg')).toBeDefined();
+  });
+
+  it('should render note header component', () => {
+    expect(
+      vm.$el.querySelector('.system-note-message').innerHTML,
+    ).toEqual(props.note.note_html);
+  });
+});
diff --git a/spec/javascripts/vue_shared/notes/stores/actions_spec.js b/spec/javascripts/vue_shared/notes/stores/actions_spec.js
index 46b4f5f2163..a5fa36a353f 100644
--- a/spec/javascripts/vue_shared/notes/stores/actions_spec.js
+++ b/spec/javascripts/vue_shared/notes/stores/actions_spec.js
@@ -1,5 +1,5 @@
 import * as actions from '~/vue_shared/notes/stores/actions';
-import testAction from '../../helpers/vuex_action_helper';
+import testAction from '../../../helpers/vuex_action_helper';
 import { discussionMock, notesDataMock, userDataMock, noteableDataMock, individualNote } from '../mock_data';
 
 describe('Actions Notes Store', () => {
-- 
cgit v1.2.1