diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-09 15:07:58 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-09 15:07:58 +0300 |
commit | 93c6764dacd4c605027ef1cd367d3aebe420b223 (patch) | |
tree | 5213b1fc874ee3e31701a81007f97d7664b95205 /spec/frontend/sidebar/components | |
parent | aa10b541b6a3fbc7fa712abcc59d073fc8dc620a (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/sidebar/components')
4 files changed, 4 insertions, 4 deletions
diff --git a/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js b/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js index d0d1af56872..d800649bc1d 100644 --- a/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js +++ b/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; -import { joinPaths } from '~/lib/utils/url_utility'; import { TEST_HOST } from 'helpers/test_constants'; +import { joinPaths } from '~/lib/utils/url_utility'; import AssigneeAvatarLink from '~/sidebar/components/assignees/assignee_avatar_link.vue'; import AssigneeAvatar from '~/sidebar/components/assignees/assignee_avatar.vue'; import userDataMock from '../../user_data_mock'; diff --git a/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js b/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js index d60ae17733b..e925da0e4c2 100644 --- a/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js +++ b/spec/frontend/sidebar/components/assignees/assignee_avatar_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; -import AssigneeAvatar from '~/sidebar/components/assignees/assignee_avatar.vue'; import { TEST_HOST } from 'helpers/test_constants'; +import AssigneeAvatar from '~/sidebar/components/assignees/assignee_avatar.vue'; import userDataMock from '../../user_data_mock'; const TEST_AVATAR = `${TEST_HOST}/avatar.png`; diff --git a/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js b/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js index c88ae196875..6aa7b166804 100644 --- a/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js +++ b/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; +import UsersMockHelper from 'helpers/user_mock_data_helper'; import CollapsedAssigneeList from '~/sidebar/components/assignees/collapsed_assignee_list.vue'; import CollapsedAssignee from '~/sidebar/components/assignees/collapsed_assignee.vue'; -import UsersMockHelper from 'helpers/user_mock_data_helper'; const DEFAULT_MAX_COUNTER = 99; diff --git a/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js b/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js index 1de21f30d21..8381cc25db4 100644 --- a/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js +++ b/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js @@ -1,7 +1,7 @@ import { mount } from '@vue/test-utils'; +import { TEST_HOST } from 'helpers/test_constants'; import UncollapsedAssigneeList from '~/sidebar/components/assignees/uncollapsed_assignee_list.vue'; import AssigneeAvatarLink from '~/sidebar/components/assignees/assignee_avatar_link.vue'; -import { TEST_HOST } from 'helpers/test_constants'; import userDataMock from '../../user_data_mock'; import UsersMockHelper from '../../../helpers/user_mock_data_helper'; |