Skip to content
代码片段 群组 项目
提交 c651973d 编辑于 作者: Vitaly Slobodin's avatar Vitaly Slobodin 提交者: Natalia Tepluhina
浏览文件

Sort leftovers in CE specs

Sort latest changes from master
上级 92c176f1
No related branches found
No related tags found
无相关合并请求
显示
85 个添加93 个删除
...@@ -42,48 +42,50 @@ rules: ...@@ -42,48 +42,50 @@ rules:
no-jquery/no-serialize: error no-jquery/no-serialize: error
promise/always-return: off promise/always-return: off
promise/no-callback-in-promise: off promise/no-callback-in-promise: off
"@gitlab/no-global-event-off": error '@gitlab/no-global-event-off': error
import/order: import/order:
- error - error
- groups: - groups:
- builtin - builtin
- external - external
- internal - internal
- parent - parent
- sibling - sibling
- index - index
pathGroups: pathGroups:
- pattern: ~/** - pattern: ~/**
group: internal group: internal
- pattern: emojis/** - pattern: emojis/**
group: internal group: internal
- pattern: "{ee_,}empty_states/**" - pattern: '{ee_,}empty_states/**'
group: internal group: internal
- pattern: "{ee_,}icons/**" - pattern: '{ee_,}icons/**'
group: internal group: internal
- pattern: "{ee_,}images/**" - pattern: '{ee_,}images/**'
group: internal group: internal
- pattern: vendor/** - pattern: vendor/**
group: internal group: internal
- pattern: shared_queries/** - pattern: shared_queries/**
group: internal group: internal
- pattern: "{ee_,}spec/**" - pattern: '{ee_,}spec/**'
group: internal group: internal
- pattern: "{ee_,}jest/**" - pattern: '{ee_,}jest/**'
group: internal group: internal
- pattern: ee_else_ce/** - pattern: ee_else_ce/**
group: internal group: internal
- pattern: ee/** - pattern: ee/**
group: internal group: internal
- pattern: ee_component/** - pattern: ee_component/**
group: internal group: internal
- pattern: "{test_,}helpers/**" - pattern: '{test_,}helpers/**'
group: internal group: internal
- pattern: test_fixtures/** - pattern: test_fixtures/**
group: internal group: internal
alphabetize:
order: asc
overrides: overrides:
- files: - files:
- '**/spec/**/*' - '**/spec/**/*'
rules: rules:
"@gitlab/require-i18n-strings": off '@gitlab/require-i18n-strings': off
"@gitlab/no-runtime-template-compiler": off '@gitlab/no-runtime-template-compiler': off
...@@ -22,27 +22,24 @@ import Heading from './nodes/heading'; ...@@ -22,27 +22,24 @@ import Heading from './nodes/heading';
import HorizontalRule from './nodes/horizontal_rule'; import HorizontalRule from './nodes/horizontal_rule';
import Image from './nodes/image'; import Image from './nodes/image';
import ListItem from './nodes/list_item';
import OrderedList from './nodes/ordered_list';
import OrderedTaskList from './nodes/ordered_task_list';
import Paragraph from './nodes/paragraph';
import Reference from './nodes/reference'; import Reference from './nodes/reference';
import Summary from './nodes/summary';
import Table from './nodes/table'; import Table from './nodes/table';
import TableHead from './nodes/table_head';
import TableBody from './nodes/table_body'; import TableBody from './nodes/table_body';
import TableCell from './nodes/table_cell';
import TableHead from './nodes/table_head';
import TableHeaderRow from './nodes/table_header_row'; import TableHeaderRow from './nodes/table_header_row';
import TableOfContents from './nodes/table_of_contents';
import TableRow from './nodes/table_row'; import TableRow from './nodes/table_row';
import TableCell from './nodes/table_cell';
import TableOfContents from './nodes/table_of_contents';
import TaskList from './nodes/task_list'; import TaskList from './nodes/task_list';
import TaskListItem from './nodes/task_list_item'; import TaskListItem from './nodes/task_list_item';
import Video from './nodes/video';
import OrderedList from './nodes/ordered_list';
import ListItem from './nodes/list_item';
import OrderedTaskList from './nodes/ordered_task_list';
import Paragraph from './nodes/paragraph';
import Summary from './nodes/summary';
import Text from './nodes/text'; import Text from './nodes/text';
import Video from './nodes/video';
// The filters referenced in lib/banzai/pipeline/gfm_pipeline.rb transform // The filters referenced in lib/banzai/pipeline/gfm_pipeline.rb transform
// GitLab Flavored Markdown (GFM) to HTML. // GitLab Flavored Markdown (GFM) to HTML.
......
import Vue from 'vue'; import Vue from 'vue';
import VueApollo from 'vue-apollo';
import { mapActions, mapGetters } from 'vuex'; import { mapActions, mapGetters } from 'vuex';
import 'ee_else_ce/boards/models/issue'; import 'ee_else_ce/boards/models/issue';
import 'ee_else_ce/boards/models/list'; import 'ee_else_ce/boards/models/list';
import VueApollo from 'vue-apollo';
import BoardSidebar from 'ee_else_ce/boards/components/board_sidebar'; import BoardSidebar from 'ee_else_ce/boards/components/board_sidebar';
import initNewListDropdown from 'ee_else_ce/boards/components/new_list_dropdown'; import initNewListDropdown from 'ee_else_ce/boards/components/new_list_dropdown';
import boardConfigToggle from 'ee_else_ce/boards/config_toggle'; import boardConfigToggle from 'ee_else_ce/boards/config_toggle';
...@@ -15,33 +15,31 @@ import { ...@@ -15,33 +15,31 @@ import {
} from 'ee_else_ce/boards/ee_functions'; } from 'ee_else_ce/boards/ee_functions';
import toggleEpicsSwimlanes from 'ee_else_ce/boards/toggle_epics_swimlanes'; import toggleEpicsSwimlanes from 'ee_else_ce/boards/toggle_epics_swimlanes';
import toggleLabels from 'ee_else_ce/boards/toggle_labels'; import toggleLabels from 'ee_else_ce/boards/toggle_labels';
import BoardAddNewColumnTrigger from '~/boards/components/board_add_new_column_trigger.vue'; import BoardAddNewColumnTrigger from '~/boards/components/board_add_new_column_trigger.vue';
import BoardContent from '~/boards/components/board_content.vue'; import BoardContent from '~/boards/components/board_content.vue';
import BoardExtraActions from '~/boards/components/board_extra_actions.vue'; import BoardExtraActions from '~/boards/components/board_extra_actions.vue';
import { deprecatedCreateFlash as Flash } from '~/flash';
import createDefaultClient from '~/lib/graphql';
import { __ } from '~/locale';
import './models/label'; import './models/label';
import './models/assignee'; import './models/assignee';
import toggleFocusMode from '~/boards/toggle_focus';
import FilteredSearchBoards from '~/boards/filtered_search_boards';
import eventHub from '~/boards/eventhub';
import sidebarEventHub from '~/sidebar/event_hub';
import '~/boards/models/milestone'; import '~/boards/models/milestone';
import '~/boards/models/project'; import '~/boards/models/project';
import '~/boards/filters/due_date_filters';
import BoardAddIssuesModal from '~/boards/components/modal/index.vue';
import eventHub from '~/boards/eventhub';
import FilteredSearchBoards from '~/boards/filtered_search_boards';
import modalMixin from '~/boards/mixins/modal_mixins';
import store from '~/boards/stores'; import store from '~/boards/stores';
import boardsStore from '~/boards/stores/boards_store'; import boardsStore from '~/boards/stores/boards_store';
import ModalStore from '~/boards/stores/modal_store'; import ModalStore from '~/boards/stores/modal_store';
import modalMixin from '~/boards/mixins/modal_mixins'; import toggleFocusMode from '~/boards/toggle_focus';
import '~/boards/filters/due_date_filters'; import { deprecatedCreateFlash as Flash } from '~/flash';
import BoardAddIssuesModal from '~/boards/components/modal/index.vue'; import createDefaultClient from '~/lib/graphql';
import { import {
NavigationType, NavigationType,
convertObjectPropsToCamelCase, convertObjectPropsToCamelCase,
parseBoolean, parseBoolean,
} from '~/lib/utils/common_utils'; } from '~/lib/utils/common_utils';
import { __ } from '~/locale';
import sidebarEventHub from '~/sidebar/event_hub';
import mountMultipleBoardsSwitcher from './mount_multiple_boards_switcher'; import mountMultipleBoardsSwitcher from './mount_multiple_boards_switcher';
Vue.use(VueApollo); Vue.use(VueApollo);
......
<script> <script>
import { GlButton, GlLoadingIcon, GlModal, GlLink } from '@gitlab/ui'; import { GlButton, GlLoadingIcon, GlModal, GlLink } from '@gitlab/ui';
import { getParameterByName } from '~/lib/utils/common_utils'; import { getParameterByName } from '~/lib/utils/common_utils';
import SvgBlankState from '~/pipelines/components/pipelines_list/blank_state.vue';
import PipelinesTableComponent from '~/pipelines/components/pipelines_list/pipelines_table.vue';
import eventHub from '~/pipelines/event_hub'; import eventHub from '~/pipelines/event_hub';
import PipelinesMixin from '~/pipelines/mixins/pipelines_mixin'; import PipelinesMixin from '~/pipelines/mixins/pipelines_mixin';
import PipelinesService from '~/pipelines/services/pipelines_service'; import PipelinesService from '~/pipelines/services/pipelines_service';
import PipelineStore from '~/pipelines/stores/pipelines_store'; import PipelineStore from '~/pipelines/stores/pipelines_store';
import PipelinesTableComponent from '~/pipelines/components/pipelines_list/pipelines_table.vue';
import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue';
import SvgBlankState from '~/pipelines/components/pipelines_list/blank_state.vue';
export default { export default {
components: { components: {
......
/* global $ */ /* global $ */
/* eslint-disable import/order */
import jQuery from 'jquery'; import jQuery from 'jquery';
import Cookies from 'js-cookie'; import Cookies from 'js-cookie';
......
...@@ -10,13 +10,13 @@ class-methods-use-this */ ...@@ -10,13 +10,13 @@ class-methods-use-this */
old_notes_spec.js is the spec for the legacy, jQuery notes application. It has nothing to do with the new, fancy Vue notes app. old_notes_spec.js is the spec for the legacy, jQuery notes application. It has nothing to do with the new, fancy Vue notes app.
*/ */
import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui';
import Autosize from 'autosize';
import $ from 'jquery'; import $ from 'jquery';
import '~/lib/utils/jquery_at_who';
import Cookies from 'js-cookie'; import Cookies from 'js-cookie';
import { escape, uniqueId } from 'lodash'; import { escape, uniqueId } from 'lodash';
import Autosize from 'autosize';
import Vue from 'vue'; import Vue from 'vue';
import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui'; import '~/lib/utils/jquery_at_who';
import AjaxCache from '~/lib/utils/ajax_cache'; import AjaxCache from '~/lib/utils/ajax_cache';
import syntaxHighlight from '~/syntax_highlight'; import syntaxHighlight from '~/syntax_highlight';
import Autosave from './autosave'; import Autosave from './autosave';
......
import Vue from 'vue'; import Vue from 'vue';
import PipelineTourSuccessModal from '~/blob/pipeline_tour_success_modal.vue';
import BlobViewer from '~/blob/viewer/index'; import BlobViewer from '~/blob/viewer/index';
import GpgBadges from '~/gpg_badges'; import GpgBadges from '~/gpg_badges';
import initBlob from '~/pages/projects/init_blob'; import initBlob from '~/pages/projects/init_blob';
import initWebIdeLink from '~/pages/projects/shared/web_ide_link'; import initWebIdeLink from '~/pages/projects/shared/web_ide_link';
import commitPipelineStatus from '~/projects/tree/components/commit_pipeline_status_component.vue'; import commitPipelineStatus from '~/projects/tree/components/commit_pipeline_status_component.vue';
import '~/sourcegraph/load'; import '~/sourcegraph/load';
import PipelineTourSuccessModal from '~/blob/pipeline_tour_success_modal.vue';
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
new BlobViewer(); // eslint-disable-line no-new new BlobViewer(); // eslint-disable-line no-new
......
/* eslint-disable no-new */ /* eslint-disable no-new */
import $ from 'jquery'; import $ from 'jquery';
import loadAwardsHandler from '~/awards_handler';
import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation'; import ShortcutsNavigation from '~/behaviors/shortcuts/shortcuts_navigation';
import Diff from '~/diff'; import Diff from '~/diff';
import flash from '~/flash'; import flash from '~/flash';
...@@ -14,7 +14,6 @@ import { initCommitBoxInfo } from '~/projects/commit_box/info'; ...@@ -14,7 +14,6 @@ import { initCommitBoxInfo } from '~/projects/commit_box/info';
import syntaxHighlight from '~/syntax_highlight'; import syntaxHighlight from '~/syntax_highlight';
import ZenMode from '~/zen_mode'; import ZenMode from '~/zen_mode';
import '~/sourcegraph/load'; import '~/sourcegraph/load';
import loadAwardsHandler from '~/awards_handler';
const hasPerfBar = document.querySelector('.with-performance-bar'); const hasPerfBar = document.querySelector('.with-performance-bar');
const performanceHeight = hasPerfBar ? 35 : 0; const performanceHeight = hasPerfBar ? 35 : 0;
......
...@@ -10,11 +10,11 @@ import { ANY_TRIGGER_AUTHOR, RAW_TEXT_WARNING, FILTER_TAG_IDENTIFIER } from '../ ...@@ -10,11 +10,11 @@ import { ANY_TRIGGER_AUTHOR, RAW_TEXT_WARNING, FILTER_TAG_IDENTIFIER } from '../
import PipelinesMixin from '../../mixins/pipelines_mixin'; import PipelinesMixin from '../../mixins/pipelines_mixin';
import PipelinesService from '../../services/pipelines_service'; import PipelinesService from '../../services/pipelines_service';
import { validateParams } from '../../utils'; import { validateParams } from '../../utils';
import SvgBlankState from './blank_state.vue';
import EmptyState from './empty_state.vue'; import EmptyState from './empty_state.vue';
import NavigationControls from './nav_controls.vue'; import NavigationControls from './nav_controls.vue';
import PipelinesFilteredSearch from './pipelines_filtered_search.vue'; import PipelinesFilteredSearch from './pipelines_filtered_search.vue';
import PipelinesTableComponent from './pipelines_table.vue'; import PipelinesTableComponent from './pipelines_table.vue';
import SvgBlankState from './blank_state.vue';
export default { export default {
components: { components: {
......
import Visibility from 'visibilityjs'; import Visibility from 'visibilityjs';
import { deprecatedCreateFlash as createFlash } from '~/flash'; import { deprecatedCreateFlash as createFlash } from '~/flash';
import Poll from '~/lib/utils/poll';
import { historyPushState, buildUrlWithCurrentLocation } from '~/lib/utils/common_utils'; import { historyPushState, buildUrlWithCurrentLocation } from '~/lib/utils/common_utils';
import { validateParams } from '~/pipelines/utils'; import Poll from '~/lib/utils/poll';
import { __ } from '~/locale'; import { __ } from '~/locale';
import { validateParams } from '~/pipelines/utils';
import { CANCEL_REQUEST } from '../constants'; import { CANCEL_REQUEST } from '../constants';
import eventHub from '../event_hub'; import eventHub from '../event_hub';
......
<script> <script>
/* eslint-disable vue/no-v-html */ /* eslint-disable vue/no-v-html */
import { GlIcon, GlLink, GlLoadingIcon } from '@gitlab/ui';
import $ from 'jquery'; import $ from 'jquery';
import '~/behaviors/markdown/render_gfm'; import '~/behaviors/markdown/render_gfm';
import { GlIcon, GlLink, GlLoadingIcon } from '@gitlab/ui';
import { handleLocationHash } from '~/lib/utils/common_utils'; import { handleLocationHash } from '~/lib/utils/common_utils';
import readmeQuery from '../../queries/readme.query.graphql'; import readmeQuery from '../../queries/readme.query.graphql';
......
import { defaultDataIdFromObject } from 'apollo-cache-inmemory';
import { GlToast } from '@gitlab/ui'; import { GlToast } from '@gitlab/ui';
import { defaultDataIdFromObject } from 'apollo-cache-inmemory';
import Vue from 'vue'; import Vue from 'vue';
import VueApollo from 'vue-apollo'; import VueApollo from 'vue-apollo';
import createDefaultClient from '~/lib/graphql'; import createDefaultClient from '~/lib/graphql';
......
<script> <script>
/* eslint-disable vue/no-v-html */ /* eslint-disable vue/no-v-html */
import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui';
import $ from 'jquery'; import $ from 'jquery';
import '~/behaviors/markdown/render_gfm'; import '~/behaviors/markdown/render_gfm';
import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui';
import { forEach, escape } from 'lodash'; import { forEach, escape } from 'lodash';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import { __ } from '~/locale'; import { __ } from '~/locale';
......
<script> <script>
/* eslint-disable vue/no-v-html */ /* eslint-disable vue/no-v-html */
import { GlIcon } from '@gitlab/ui';
import $ from 'jquery'; import $ from 'jquery';
import '~/behaviors/markdown/render_gfm'; import '~/behaviors/markdown/render_gfm';
import { unescape } from 'lodash'; import { unescape } from 'lodash';
import { GlIcon } from '@gitlab/ui';
import { deprecatedCreateFlash as Flash } from '~/flash'; import { deprecatedCreateFlash as Flash } from '~/flash';
import GLForm from '~/gl_form'; import GLForm from '~/gl_form';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
......
import ShortcutsEpic from 'ee/behaviors/shortcuts/shortcuts_epic'; import ShortcutsEpic from 'ee/behaviors/shortcuts/shortcuts_epic';
import initEpicApp from 'ee/epic/epic_bundle'; import initEpicApp from 'ee/epic/epic_bundle';
import EpicTabs from 'ee/epic/epic_tabs'; import EpicTabs from 'ee/epic/epic_tabs';
import loadAwardsHandler from '~/awards_handler';
import ZenMode from '~/zen_mode'; import ZenMode from '~/zen_mode';
import '~/notes/index'; import '~/notes/index';
import loadAwardsHandler from '~/awards_handler';
initEpicApp(); initEpicApp();
......
/* global List */ /* global List */
/* global ListIssue */ /* global ListIssue */
import MockAdapter from 'axios-mock-adapter'; import MockAdapter from 'axios-mock-adapter';
import Vue from 'vue'; import Vue from 'vue';
import waitForPromises from 'helpers/wait_for_promises'; import waitForPromises from 'helpers/wait_for_promises';
import axios from '~/lib/utils/axios_utils';
import BoardList from '~/boards/components/board_list_deprecated.vue'; import BoardList from '~/boards/components/board_list_deprecated.vue';
import eventHub from '~/boards/eventhub'; import eventHub from '~/boards/eventhub';
import '~/boards/models/issue';
import '~/boards/models/list';
import store from '~/boards/stores'; import store from '~/boards/stores';
import boardsStore from '~/boards/stores/boards_store'; import boardsStore from '~/boards/stores/boards_store';
import axios from '~/lib/utils/axios_utils';
import '~/boards/models/issue';
import '~/boards/models/list';
import { listObj, boardsMockInterceptor } from './mock_data'; import { listObj, boardsMockInterceptor } from './mock_data';
const createComponent = ({ done, listIssueProps = {}, componentProps = {}, listProps = {} }) => { const createComponent = ({ done, listIssueProps = {}, componentProps = {}, listProps = {} }) => {
......
/* global List */ /* global List */
/* global ListIssue */ /* global ListIssue */
import MockAdapter from 'axios-mock-adapter'; import MockAdapter from 'axios-mock-adapter';
import Sortable from 'sortablejs'; import Sortable from 'sortablejs';
import Vue from 'vue'; import Vue from 'vue';
import axios from '~/lib/utils/axios_utils';
import BoardList from '~/boards/components/board_list_deprecated.vue'; import BoardList from '~/boards/components/board_list_deprecated.vue';
import '~/boards/models/issue'; import '~/boards/models/issue';
import '~/boards/models/list'; import '~/boards/models/list';
import store from '~/boards/stores'; import store from '~/boards/stores';
import boardsStore from '~/boards/stores/boards_store'; import boardsStore from '~/boards/stores/boards_store';
import axios from '~/lib/utils/axios_utils';
import { listObj, boardsMockInterceptor } from './mock_data'; import { listObj, boardsMockInterceptor } from './mock_data';
window.Sortable = Sortable; window.Sortable = Sortable;
......
/* global ListAssignee, ListLabel, ListIssue */ /* global ListAssignee, ListLabel, ListIssue */
import { GlLabel } from '@gitlab/ui';
import { mount } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import { range } from 'lodash'; import { range } from 'lodash';
import '~/boards/models/label'; import '~/boards/models/label';
import '~/boards/models/assignee'; import '~/boards/models/assignee';
import '~/boards/models/issue'; import '~/boards/models/issue';
import '~/boards/models/list'; import '~/boards/models/list';
import { GlLabel } from '@gitlab/ui';
import IssueCardInner from '~/boards/components/issue_card_inner_deprecated.vue'; import IssueCardInner from '~/boards/components/issue_card_inner_deprecated.vue';
import store from '~/boards/stores'; import store from '~/boards/stores';
import { listObj } from './mock_data'; import { listObj } from './mock_data';
......
...@@ -2,16 +2,15 @@ ...@@ -2,16 +2,15 @@
/* global ListAssignee */ /* global ListAssignee */
/* global ListIssue */ /* global ListIssue */
/* global ListLabel */ /* global ListLabel */
import MockAdapter from 'axios-mock-adapter'; import MockAdapter from 'axios-mock-adapter';
import waitForPromises from 'helpers/wait_for_promises'; import waitForPromises from 'helpers/wait_for_promises';
import axios from '~/lib/utils/axios_utils';
import '~/boards/models/label'; import '~/boards/models/label';
import '~/boards/models/assignee'; import '~/boards/models/assignee';
import '~/boards/models/issue'; import '~/boards/models/issue';
import '~/boards/models/list'; import '~/boards/models/list';
import { ListType } from '~/boards/constants'; import { ListType } from '~/boards/constants';
import boardsStore from '~/boards/stores/boards_store'; import boardsStore from '~/boards/stores/boards_store';
import axios from '~/lib/utils/axios_utils';
import { listObj, listObjDuplicate, boardsMockInterceptor } from './mock_data'; import { listObj, listObjDuplicate, boardsMockInterceptor } from './mock_data';
describe('List model', () => { describe('List model', () => {
......
import MockAdapter from 'axios-mock-adapter';
import $ from 'jquery'; import $ from 'jquery';
import 'vendor/jquery.endless-scroll'; import 'vendor/jquery.endless-scroll';
import MockAdapter from 'axios-mock-adapter';
import CommitsList from '~/commits'; import CommitsList from '~/commits';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import Pager from '~/pager'; import Pager from '~/pager';
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册