diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-20 18:42:06 +0000 |
| commit | 6e4e1050d9dba2b7b2523fdd1768823ab85feef4 (patch) | |
| tree | 78be5963ec075d80116a932011d695dd33910b4e /spec/frontend/behaviors/gl_emoji_spec.js | |
| parent | 1ce776de4ae122aba3f349c02c17cebeaa8ecf07 (diff) | |
| download | gitlab-ce-6e4e1050d9dba2b7b2523fdd1768823ab85feef4.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'spec/frontend/behaviors/gl_emoji_spec.js')
| -rw-r--r-- | spec/frontend/behaviors/gl_emoji_spec.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/frontend/behaviors/gl_emoji_spec.js b/spec/frontend/behaviors/gl_emoji_spec.js index 7ea0bafc328..ef6b1673b7c 100644 --- a/spec/frontend/behaviors/gl_emoji_spec.js +++ b/spec/frontend/behaviors/gl_emoji_spec.js @@ -1,10 +1,10 @@ import MockAdapter from 'axios-mock-adapter'; +import waitForPromises from 'jest/helpers/wait_for_promises'; import axios from '~/lib/utils/axios_utils'; import { initEmojiMap, EMOJI_VERSION } from '~/emoji'; import installGlEmojiElement from '~/behaviors/gl_emoji'; import * as EmojiUnicodeSupport from '~/emoji/support'; -import waitForPromises from 'jest/helpers/wait_for_promises'; jest.mock('~/emoji/support'); |