diff options
| -rw-r--r-- | app/assets/javascripts/pages/profiles/show/emoji_menu.js | 1 | ||||
| -rw-r--r-- | config/jest.config.js | 1 | ||||
| -rw-r--r-- | spec/frontend/helpers/test_constants.js | 2 | ||||
| -rw-r--r-- | spec/frontend/pages/profiles/show/emoji_menu_spec.js (renamed from spec/javascripts/pages/profiles/show/emoji_menu_spec.js) | 6 |
4 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/javascripts/pages/profiles/show/emoji_menu.js b/app/assets/javascripts/pages/profiles/show/emoji_menu.js index 094837b40e0..286c1f1e929 100644 --- a/app/assets/javascripts/pages/profiles/show/emoji_menu.js +++ b/app/assets/javascripts/pages/profiles/show/emoji_menu.js @@ -1,3 +1,4 @@ +import '~/commons/bootstrap'; import { AwardsHandler } from '~/awards_handler'; class EmojiMenu extends AwardsHandler { diff --git a/config/jest.config.js b/config/jest.config.js index 23e62f49be1..e1b07f21555 100644 --- a/config/jest.config.js +++ b/config/jest.config.js @@ -16,6 +16,7 @@ module.exports = { testMatch: ['<rootDir>/spec/frontend/**/*_spec.js'], moduleNameMapper: { '^~(.*)$': '<rootDir>/app/assets/javascripts$1', + '^helpers(.*)$': '<rootDir>/spec/frontend/helpers$1', }, collectCoverageFrom: ['<rootDir>/app/assets/javascripts/**/*.{js,vue}'], coverageDirectory: '<rootDir>/coverage-frontend/', diff --git a/spec/frontend/helpers/test_constants.js b/spec/frontend/helpers/test_constants.js new file mode 100644 index 00000000000..8dc4aef87e1 --- /dev/null +++ b/spec/frontend/helpers/test_constants.js @@ -0,0 +1,2 @@ +// eslint-disable-next-line import/prefer-default-export +export const TEST_HOST = 'http://test.host'; diff --git a/spec/javascripts/pages/profiles/show/emoji_menu_spec.js b/spec/frontend/pages/profiles/show/emoji_menu_spec.js index 864bda65736..efc338b36eb 100644 --- a/spec/javascripts/pages/profiles/show/emoji_menu_spec.js +++ b/spec/frontend/pages/profiles/show/emoji_menu_spec.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import axios from '~/lib/utils/axios_utils'; import EmojiMenu from '~/pages/profiles/show/emoji_menu'; -import { TEST_HOST } from 'spec/test_constants'; +import { TEST_HOST } from 'helpers/test_constants'; describe('EmojiMenu', () => { const dummyEmojiTag = '<dummy></tag>'; @@ -56,7 +56,7 @@ describe('EmojiMenu', () => { }); it('does not make an axios requst', done => { - spyOn(axios, 'request').and.stub(); + jest.spyOn(axios, 'request').mockReturnValue(); emojiMenu.addAward(dummyVotesBlock(), dummyAwardUrl, dummyEmoji, false, () => { expect(axios.request).not.toHaveBeenCalled(); @@ -67,7 +67,7 @@ describe('EmojiMenu', () => { describe('bindEvents', () => { beforeEach(() => { - spyOn(emojiMenu, 'registerEventListener').and.stub(); + jest.spyOn(emojiMenu, 'registerEventListener').mockReturnValue(); }); it('binds event listeners to custom toggle button', () => { |