diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-15 03:10:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-15 03:10:45 +0300 |
commit | 8b75948934667904196aba319aedda25b00f06ff (patch) | |
tree | 5f743f14301b5abe868a35fad87bfa0fc0581f04 /spec/frontend/behaviors | |
parent | 8f534e1e960eef1f4cfcb7c6d723840523515ffb (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/behaviors')
-rw-r--r-- | spec/frontend/behaviors/bind_in_out_spec.js | 2 | ||||
-rw-r--r-- | spec/frontend/behaviors/gl_emoji_spec.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/frontend/behaviors/bind_in_out_spec.js b/spec/frontend/behaviors/bind_in_out_spec.js index 92a68ddd387..49425a9377e 100644 --- a/spec/frontend/behaviors/bind_in_out_spec.js +++ b/spec/frontend/behaviors/bind_in_out_spec.js @@ -1,5 +1,5 @@ +import ClassSpecHelper from 'helpers/class_spec_helper'; import BindInOut from '~/behaviors/bind_in_out'; -import ClassSpecHelper from '../helpers/class_spec_helper'; describe('BindInOut', () => { let testContext; diff --git a/spec/frontend/behaviors/gl_emoji_spec.js b/spec/frontend/behaviors/gl_emoji_spec.js index 46b4e5d3d5c..6e476d84501 100644 --- a/spec/frontend/behaviors/gl_emoji_spec.js +++ b/spec/frontend/behaviors/gl_emoji_spec.js @@ -1,5 +1,5 @@ import MockAdapter from 'axios-mock-adapter'; -import waitForPromises from 'jest/helpers/wait_for_promises'; +import waitForPromises from 'helpers/wait_for_promises'; import axios from '~/lib/utils/axios_utils'; import { initEmojiMap, EMOJI_VERSION } from '~/emoji'; import installGlEmojiElement from '~/behaviors/gl_emoji'; |