From a6ef279624c62fa26c07a91caf791d2c505093d9 Mon Sep 17 00:00:00 2001 From: Thomas Randolph Date: Wed, 22 Jul 2020 14:38:03 -0600 Subject: [PATCH] Rename the DiscussionKeyboardNavigator to DiscussionNavigator --- app/assets/javascripts/mr_notes/init_notes.js | 6 +++--- ...on_keyboard_navigator.vue => discussion_navigator.vue} | 0 ...ard_navigator_spec.js => discussion_navigator_spec.js} | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) rename app/assets/javascripts/notes/components/{discussion_keyboard_navigator.vue => discussion_navigator.vue} (100%) rename spec/frontend/notes/components/{discussion_keyboard_navigator_spec.js => discussion_navigator_spec.js} (89%) diff --git a/app/assets/javascripts/mr_notes/init_notes.js b/app/assets/javascripts/mr_notes/init_notes.js index fcde9bf7849a17..44fc104f9de0cf 100644 --- a/app/assets/javascripts/mr_notes/init_notes.js +++ b/app/assets/javascripts/mr_notes/init_notes.js @@ -3,7 +3,7 @@ import Vue from 'vue'; import { mapActions, mapState, mapGetters } from 'vuex'; import store from '~/mr_notes/stores'; import notesApp from '../notes/components/notes_app.vue'; -import discussionKeyboardNavigator from '../notes/components/discussion_keyboard_navigator.vue'; +import discussionNavigator from '../notes/components/discussion_navigator.vue'; import initWidget from '../vue_merge_request_widget'; export default () => { @@ -69,11 +69,11 @@ export default () => { }, }, render(createElement) { - // NOTE: Even though `discussionKeyboardNavigator` is added to the `notes-app`, + // NOTE: Even though `discussionNavigator` is added to the `notes-app`, // it adds a global key listener so it works on the diffs tab as well. // If we create a single Vue app for all of the MR tabs, we should move this // up the tree, to the root. - return createElement(discussionKeyboardNavigator, [ + return createElement(discussionNavigator, [ createElement('notes-app', { props: { noteableData: this.noteableData, diff --git a/app/assets/javascripts/notes/components/discussion_keyboard_navigator.vue b/app/assets/javascripts/notes/components/discussion_navigator.vue similarity index 100% rename from app/assets/javascripts/notes/components/discussion_keyboard_navigator.vue rename to app/assets/javascripts/notes/components/discussion_navigator.vue diff --git a/spec/frontend/notes/components/discussion_keyboard_navigator_spec.js b/spec/frontend/notes/components/discussion_navigator_spec.js similarity index 89% rename from spec/frontend/notes/components/discussion_keyboard_navigator_spec.js rename to spec/frontend/notes/components/discussion_navigator_spec.js index fd0383f3b9d24a..122814b8e3f72f 100644 --- a/spec/frontend/notes/components/discussion_keyboard_navigator_spec.js +++ b/spec/frontend/notes/components/discussion_navigator_spec.js @@ -2,10 +2,10 @@ import 'mousetrap'; import Vue from 'vue'; import { shallowMount, createLocalVue } from '@vue/test-utils'; -import DiscussionKeyboardNavigator from '~/notes/components/discussion_keyboard_navigator.vue'; +import DiscussionNavigator from '~/notes/components/discussion_navigator.vue'; import eventHub from '~/notes/event_hub'; -describe('notes/components/discussion_keyboard_navigator', () => { +describe('notes/components/discussion_navigator', () => { const localVue = createLocalVue(); let wrapper; @@ -13,7 +13,7 @@ describe('notes/components/discussion_keyboard_navigator', () => { let jumpToPreviousDiscussion; const createComponent = () => { - wrapper = shallowMount(DiscussionKeyboardNavigator, { + wrapper = shallowMount(DiscussionNavigator, { mixins: [ localVue.extend({ methods: { @@ -43,7 +43,7 @@ describe('notes/components/discussion_keyboard_navigator', () => { beforeEach(() => { onSpy = jest.spyOn(eventHub, '$on'); - vm = new (Vue.extend(DiscussionKeyboardNavigator))(); + vm = new (Vue.extend(DiscussionNavigator))(); }); it('listens for jumpToFirstUnresolvedDiscussion events', () => { -- GitLab