From 835f1214dcc4e08e3076f269b7b2aa854ea4257a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sun, 14 Feb 2021 18:09:20 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/frontend/__helpers__/emoji.js | 2 +- .../__helpers__/init_vue_mr_page_helper.js | 4 +-- .../components/add_context_commits_modal_spec.js | 6 ++-- .../components/review_tab_container_spec.js | 2 +- .../store/actions_spec.js | 2 +- .../store/mutations_spec.js | 2 +- .../admin/statistics_panel/components/app_spec.js | 8 +++--- .../admin/statistics_panel/store/actions_spec.js | 2 +- .../admin/statistics_panel/store/getters_spec.js | 2 +- .../admin/statistics_panel/store/mutations_spec.js | 2 +- .../admin/users/components/actions/actions_spec.js | 6 ++-- .../admin/users/components/user_actions_spec.js | 8 +++--- .../admin/users/components/users_table_spec.js | 4 +-- .../alert_management_empty_state_spec.js | 2 +- .../alert_management_list_wrapper_spec.js | 2 +- .../components/alert_management_table_spec.js | 6 ++-- .../components/alert_mapping_builder_spec.js | 2 +- .../components/alerts_integrations_list_spec.js | 2 +- .../components/alerts_settings_form_spec.js | 4 +-- .../components/alerts_settings_wrapper_spec.js | 24 ++++++++-------- .../utils/mapping_transformations_spec.js | 2 +- .../analytics/components/activity_chart_spec.js | 2 +- .../instance_statistics/components/app_spec.js | 4 +-- .../instance_statistics_count_chart_spec.js | 6 ++-- .../components/projects_and_groups_chart_spec.js | 10 +++---- .../components/users_chart_spec.js | 8 +++--- .../shared/components/metric_card_spec.js | 2 +- spec/frontend/api_spec.js | 2 +- .../keep_latest_artifact_checkbox_spec.js | 6 ++-- .../components/recovery_codes_spec.js | 8 +++--- .../authentication/two_factor_auth/index_spec.js | 4 +-- spec/frontend/avatar_helper_spec.js | 2 +- spec/frontend/awards_handler_spec.js | 4 +-- spec/frontend/badges/components/badge_form_spec.js | 10 +++---- .../badges/components/badge_list_row_spec.js | 2 +- spec/frontend/badges/components/badge_list_spec.js | 2 +- .../badges/components/badge_settings_spec.js | 8 +++--- spec/frontend/badges/store/actions_spec.js | 4 +-- .../batch_comments/components/draft_note_spec.js | 2 +- .../components/publish_dropdown_spec.js | 4 +-- .../stores/modules/batch_comments/actions_spec.js | 2 +- .../modules/batch_comments/mutations_spec.js | 4 +-- spec/frontend/behaviors/copy_as_gfm_spec.js | 2 +- spec/frontend/behaviors/gl_emoji_spec.js | 4 +-- .../frontend/blob/balsamiq/balsamiq_viewer_spec.js | 2 +- .../blob/components/blob_content_error_spec.js | 2 +- spec/frontend/blob/components/blob_content_spec.js | 2 +- .../blob/components/blob_edit_header_spec.js | 2 +- .../components/blob_header_default_actions_spec.js | 2 +- .../blob/components/blob_header_filepath_spec.js | 2 +- spec/frontend/blob/components/blob_header_spec.js | 2 +- .../components/blob_header_viewer_switcher_spec.js | 2 +- .../frontend/blob/notebook/notebook_viever_spec.js | 4 +-- spec/frontend/blob/pdf/pdf_viewer_spec.js | 2 +- .../blob/pipeline_tour_success_modal_spec.js | 4 +-- .../components/popover_spec.js | 2 +- spec/frontend/blob/utils_spec.js | 2 +- spec/frontend/blob/viewer/index_spec.js | 2 +- spec/frontend/blob_edit/edit_blob_spec.js | 2 +- spec/frontend/boards/board_list_deprecated_spec.js | 4 +-- spec/frontend/boards/board_list_helper.js | 2 +- spec/frontend/boards/board_list_spec.js | 6 ++-- .../boards/board_new_issue_deprecated_spec.js | 4 +-- spec/frontend/boards/boards_store_spec.js | 4 +-- .../components/board_assignee_dropdown_spec.js | 8 +++--- .../board_card_layout_deprecated_spec.js | 8 +++--- .../boards/components/board_card_layout_spec.js | 4 +-- spec/frontend/boards/components/board_card_spec.js | 10 +++---- .../components/board_column_deprecated_spec.js | 4 +-- .../boards/components/board_content_spec.js | 4 +-- spec/frontend/boards/components/board_form_spec.js | 11 ++++---- .../board_list_header_deprecated_spec.js | 4 +-- .../boards/components/board_list_header_spec.js | 2 +- .../boards/components/board_new_issue_spec.js | 2 +- .../components/board_settings_sidebar_spec.js | 10 +++---- .../components/boards_selector_deprecated_spec.js | 4 +-- .../boards/components/boards_selector_spec.js | 6 ++-- .../boards/components/issue_time_estimate_spec.js | 2 +- .../components/sidebar/board_editable_item_spec.js | 2 +- .../sidebar/board_sidebar_due_date_spec.js | 4 +-- .../sidebar/board_sidebar_issue_title_spec.js | 6 ++-- .../sidebar/board_sidebar_labels_select_spec.js | 6 ++-- .../sidebar/board_sidebar_milestone_select_spec.js | 4 +-- .../sidebar/board_sidebar_subscription_spec.js | 6 ++-- .../boards/components/sidebar/remove_issue_spec.js | 2 +- spec/frontend/boards/issue_card_inner_spec.js | 4 +-- spec/frontend/boards/mock_data.js | 2 +- .../boards/project_select_deprecated_spec.js | 9 +++--- spec/frontend/boards/project_select_spec.js | 7 ++--- spec/frontend/boards/stores/actions_spec.js | 14 +++++----- spec/frontend/boards/stores/getters_spec.js | 2 +- spec/frontend/boards/stores/mutations_spec.js | 2 +- spec/frontend/branches/divergence_graph_spec.js | 2 +- spec/frontend/ci_lint/components/ci_lint_spec.js | 2 +- .../components/triggers_list_spec.js | 4 +-- .../components/ci_environments_dropdown_spec.js | 4 +-- .../components/ci_variable_modal_spec.js | 6 ++-- .../components/ci_variable_popover_spec.js | 2 +- .../components/ci_variable_settings_spec.js | 2 +- .../components/ci_variable_table_spec.js | 4 +-- .../ci_variable_list/store/actions_spec.js | 6 ++-- .../ci_variable_list/store/mutations_spec.js | 4 +-- .../clusters/components/application_row_spec.js | 6 ++-- .../clusters/components/applications_spec.js | 10 +++---- .../components/fluentd_output_settings_spec.js | 2 +- .../ingress_modsecurity_settings_spec.js | 2 +- .../components/knative_domain_editor_spec.js | 2 +- .../clusters/components/new_cluster_spec.js | 2 +- .../components/remove_cluster_confirmation_spec.js | 4 +-- .../uninstall_application_button_spec.js | 2 +- ...ninstall_application_confirmation_modal_spec.js | 2 +- .../update_application_confirmation_modal_spec.js | 2 +- .../forms/components/integration_form_spec.js | 4 +-- .../services/application_state_machine_spec.js | 2 +- .../services/crossplane_provider_stack_spec.js | 2 +- .../clusters/stores/clusters_store_spec.js | 2 +- .../components/ancestor_notice_spec.js | 2 +- .../clusters_list/components/clusters_spec.js | 8 +++--- .../components/node_error_help_text_spec.js | 2 +- spec/frontend/clusters_list/store/actions_spec.js | 10 +++---- .../frontend/clusters_list/store/mutations_spec.js | 2 +- .../code_navigation/components/app_spec.js | 4 +-- .../code_navigation/components/popover_spec.js | 2 +- .../frontend/code_navigation/store/actions_spec.js | 2 +- spec/frontend/collapsed_sidebar_todo_spec.js | 4 +-- .../commit_pipeline_status_component_spec.js | 6 ++-- spec/frontend/commit/pipelines/pipelines_spec.js | 4 +-- spec/frontend/commits_spec.js | 2 +- .../commons/nav/user_merge_requests_spec.js | 2 +- .../components/dropdown_spec.js | 2 +- .../components/project_form_group_spec.js | 2 +- .../contributors/component/contributors_spec.js | 4 +-- spec/frontend/contributors/store/actions_spec.js | 4 +-- spec/frontend/contributors/store/mutations_spec.js | 4 +-- .../components/cluster_form_dropdown_spec.js | 2 +- .../components/create_eks_cluster_spec.js | 2 +- .../eks_cluster_configuration_form_spec.js | 4 +-- .../components/service_credentials_form_spec.js | 4 +-- .../services/aws_services_facade_spec.js | 2 +- .../eks_cluster/store/actions_spec.js | 8 +++--- .../eks_cluster/store/mutations_spec.js | 2 +- .../components/gke_machine_type_dropdown_spec.js | 2 +- .../components/gke_network_dropdown_spec.js | 4 +-- .../components/gke_project_id_dropdown_spec.js | 2 +- .../components/gke_submit_button_spec.js | 2 +- .../components/gke_subnetwork_dropdown_spec.js | 4 +-- .../components/gke_zone_dropdown_spec.js | 4 +-- .../gke_cluster/stores/actions_spec.js | 4 +-- .../gke_cluster/stores/mutations_spec.js | 2 +- .../create_cluster/init_create_cluster_spec.js | 2 +- .../store/cluster_dropdown/actions_spec.js | 4 +-- .../store/cluster_dropdown/mutations_spec.js | 2 +- .../frontend/create_merge_request_dropdown_spec.js | 4 +-- .../limit_warning_component_spec.js | 4 +-- .../components/deploy_freeze_modal_spec.js | 6 ++-- .../components/deploy_freeze_settings_spec.js | 4 +-- .../components/deploy_freeze_table_spec.js | 2 +- .../components/timezone_dropdown_spec.js | 6 ++-- spec/frontend/deploy_freeze/store/actions_spec.js | 6 ++-- .../frontend/deploy_freeze/store/mutations_spec.js | 4 +-- .../deploy_keys/components/action_btn_spec.js | 4 +-- spec/frontend/deploy_keys/components/app_spec.js | 6 ++-- spec/frontend/deploy_keys/components/key_spec.js | 2 +- .../deploy_keys/components/keys_panel_spec.js | 2 +- .../components/delete_button_spec.js | 2 +- .../design_notes/design_discussion_spec.js | 6 ++-- .../components/design_notes/design_note_spec.js | 4 +-- .../design_notes/toggle_replies_widget_spec.js | 4 +-- .../components/design_overlay_spec.js | 2 +- .../components/design_presentation_spec.js | 4 +-- .../components/design_scaler_spec.js | 2 +- .../components/design_sidebar_spec.js | 8 +++--- .../components/design_todo_button_spec.js | 2 +- .../design_management/components/image_spec.js | 2 +- .../design_management/components/list/item_spec.js | 2 +- .../components/toolbar/index_spec.js | 4 +-- .../components/upload/button_spec.js | 2 +- .../upload/design_version_dropdown_spec.js | 2 +- .../design_management/pages/design/index_spec.js | 20 +++++++------- .../frontend/design_management/pages/index_spec.js | 24 ++++++++-------- spec/frontend/design_management/router_spec.js | 2 +- .../utils/design_management_utils_spec.js | 4 +-- spec/frontend/diffs/components/app_spec.js | 20 +++++++------- .../components/collapsed_files_warning_spec.js | 4 +-- spec/frontend/diffs/components/commit_item_spec.js | 2 +- .../diffs/components/commit_widget_spec.js | 2 +- .../components/compare_dropdown_layout_spec.js | 2 +- .../diffs/components/compare_versions_spec.js | 2 +- .../diffs/components/diff_comment_cell_spec.js | 2 +- .../frontend/diffs/components/diff_content_spec.js | 12 ++++---- .../diffs/components/diff_discussions_spec.js | 8 +++--- .../diffs/components/diff_expansion_cell_spec.js | 8 +++--- .../diffs/components/diff_file_header_spec.js | 16 +++++------ .../diffs/components/diff_file_row_spec.js | 2 +- spec/frontend/diffs/components/diff_file_spec.js | 17 ++++++------ .../diffs/components/diff_line_note_form_spec.js | 4 +-- spec/frontend/diffs/components/diff_row_spec.js | 4 +-- spec/frontend/diffs/components/diff_stats_spec.js | 2 +- spec/frontend/diffs/components/diff_view_spec.js | 2 +- .../diffs/components/image_diff_overlay_spec.js | 2 +- .../diffs/components/inline_diff_table_row_spec.js | 6 ++-- .../diffs/components/inline_diff_view_spec.js | 8 +++--- spec/frontend/diffs/components/no_changes_spec.js | 4 +-- .../components/parallel_diff_table_row_spec.js | 10 +++---- .../diffs/components/parallel_diff_view_spec.js | 6 ++-- .../diffs/components/settings_dropdown_spec.js | 2 +- spec/frontend/diffs/components/tree_list_spec.js | 2 +- spec/frontend/diffs/store/actions_spec.js | 8 +++--- spec/frontend/diffs/store/getters_spec.js | 2 +- .../diffs/store/getters_versions_dropdowns_spec.js | 4 +-- spec/frontend/diffs/store/mutations_spec.js | 4 +-- spec/frontend/diffs/store/utils_spec.js | 4 +-- spec/frontend/diffs/utils/preferences_spec.js | 5 ++-- .../dirty_submit/dirty_submit_factory_spec.js | 2 +- spec/frontend/droplab/drop_down_spec.js | 2 +- spec/frontend/droplab/hook_spec.js | 2 +- spec/frontend/droplab/plugins/ajax_filter_spec.js | 2 +- spec/frontend/droplab/plugins/ajax_spec.js | 2 +- spec/frontend/dropzone_input_spec.js | 4 +-- spec/frontend/editor/editor_ci_schema_ext_spec.js | 2 +- spec/frontend/editor/editor_lite_spec.js | 8 +++--- spec/frontend/emoji/index_spec.js | 2 +- spec/frontend/environment.js | 4 +-- spec/frontend/environments/canary_ingress_spec.js | 4 +-- .../environments/canary_update_modal_spec.js | 2 +- .../environments/confirm_rollback_modal_spec.js | 2 +- .../environments/deploy_board_component_spec.js | 2 +- .../environments/enable_review_app_modal_spec.js | 2 +- .../environments/environment_actions_spec.js | 4 +-- .../frontend/environments/environment_item_spec.js | 4 +-- .../environments/environment_monitoring_spec.js | 2 +- spec/frontend/environments/environment_pin_spec.js | 4 +-- .../environments/environment_rollback_spec.js | 4 +-- .../frontend/environments/environment_stop_spec.js | 4 +-- .../environments/environment_table_spec.js | 4 +-- .../frontend/environments/environments_app_spec.js | 4 +-- .../components/error_details_spec.js | 14 +++++----- .../components/error_tracking_actions_spec.js | 2 +- .../components/error_tracking_list_spec.js | 4 +-- .../components/stacktrace_entry_spec.js | 2 +- spec/frontend/error_tracking/store/actions_spec.js | 4 +-- .../error_tracking/store/details/actions_spec.js | 4 +-- .../error_tracking/store/list/actions_spec.js | 6 ++-- .../error_tracking/store/list/mutation_spec.js | 2 +- .../error_tracking_settings/components/app_spec.js | 2 +- .../components/error_tracking_form_spec.js | 4 +-- .../components/project_dropdown_spec.js | 4 +-- .../error_tracking_settings/store/actions_spec.js | 8 +++--- .../error_tracking_settings/store/mutation_spec.js | 2 +- .../configure_feature_flags_modal_spec.js | 2 +- .../components/edit_feature_flag_spec.js | 10 +++---- .../components/environments_dropdown_spec.js | 6 ++-- .../feature_flags/components/feature_flags_spec.js | 12 ++++---- .../components/feature_flags_tab_spec.js | 2 +- .../components/feature_flags_table_spec.js | 4 +-- .../frontend/feature_flags/components/form_spec.js | 6 ++-- .../components/new_environments_dropdown_spec.js | 2 +- .../components/new_feature_flag_spec.js | 4 +-- .../components/strategies/flexible_rollout_spec.js | 2 +- .../components/strategies/gitlab_user_list_spec.js | 4 +-- .../strategies/parameter_form_group_spec.js | 2 +- .../components/strategies/percent_rollout_spec.js | 4 +-- .../components/strategies/users_with_id_spec.js | 2 +- .../components/strategy_parameters_spec.js | 10 +++---- .../feature_flags/components/strategy_spec.js | 12 ++++---- .../components/user_lists_table_spec.js | 2 +- .../feature_flags/store/edit/actions_spec.js | 12 ++++---- .../feature_flags/store/edit/mutations_spec.js | 4 +-- .../store/gitlab_user_lists/actions_spec.js | 2 +- .../store/gitlab_user_lists/getters_spec.js | 2 +- .../store/gitlab_user_lists/mutations_spec.js | 4 +-- spec/frontend/feature_flags/store/helpers_spec.js | 14 +++++----- .../feature_flags/store/index/actions_spec.js | 4 +-- .../feature_flags/store/index/mutations_spec.js | 6 ++-- .../feature_flags/store/new/actions_spec.js | 16 +++++------ .../feature_flags/store/new/mutations_spec.js | 4 +-- .../feature_highlight_helper_spec.js | 2 +- .../feature_highlight_popover_spec.js | 6 ++-- .../feature_highlight/feature_highlight_spec.js | 4 +-- .../recent_searches_dropdown_content_spec.js | 2 +- .../filtered_search_manager_spec.js | 12 ++++---- .../filtered_search_tokenizer_spec.js | 2 +- .../filtered_search/visual_token_value_spec.js | 4 +-- .../frontend/frequent_items/components/app_spec.js | 10 +++---- .../components/frequent_items_list_item_spec.js | 2 +- .../components/frequent_items_list_spec.js | 2 +- .../components/frequent_items_search_input_spec.js | 2 +- spec/frontend/frequent_items/store/actions_spec.js | 4 +-- spec/frontend/frequent_items/store/getters_spec.js | 2 +- .../frequent_items/store/mutations_spec.js | 4 +-- spec/frontend/frequent_items/utils_spec.js | 2 +- spec/frontend/gfm_auto_complete_spec.js | 4 +-- spec/frontend/gl_form_spec.js | 2 +- spec/frontend/gpg_badges_spec.js | 2 +- .../components/grafana_integration_spec.js | 4 +-- .../components/shared_runners_form_spec.js | 2 +- spec/frontend/groups/components/app_spec.js | 8 +++--- spec/frontend/groups/components/group_item_spec.js | 4 +-- spec/frontend/groups/components/groups_spec.js | 2 +- .../components/invite_members_banner_spec.js | 4 +-- spec/frontend/groups/components/item_caret_spec.js | 2 +- .../groups/components/item_stats_value_spec.js | 2 +- .../groups/components/item_type_icon_spec.js | 2 +- .../frontend/groups/service/groups_service_spec.js | 2 +- spec/frontend/ide/commit_icon_spec.js | 2 +- spec/frontend/ide/components/activity_bar_spec.js | 4 +-- spec/frontend/ide/components/branches/item_spec.js | 6 ++-- .../ide/components/branches/search_list_spec.js | 6 ++-- .../ide/components/commit_sidebar/actions_spec.js | 2 +- .../commit_sidebar/editor_header_spec.js | 4 +-- .../components/commit_sidebar/empty_state_spec.js | 2 +- .../ide/components/commit_sidebar/form_spec.js | 12 ++++---- .../components/commit_sidebar/list_item_spec.js | 2 +- .../ide/components/commit_sidebar/list_spec.js | 2 +- .../new_merge_request_option_spec.js | 2 +- .../components/commit_sidebar/radio_group_spec.js | 2 +- .../commit_sidebar/success_message_spec.js | 2 +- spec/frontend/ide/components/error_message_spec.js | 2 +- .../frontend/ide/components/file_row_extra_spec.js | 2 +- .../ide/components/file_templates/bar_spec.js | 2 +- .../ide/components/file_templates/dropdown_spec.js | 4 +-- spec/frontend/ide/components/ide_file_row_spec.js | 4 +-- spec/frontend/ide/components/ide_review_spec.js | 6 ++-- spec/frontend/ide/components/ide_side_bar_spec.js | 6 ++-- .../ide/components/ide_sidebar_nav_spec.js | 2 +- spec/frontend/ide/components/ide_spec.js | 6 ++-- .../frontend/ide/components/ide_status_bar_spec.js | 6 ++-- .../ide/components/ide_status_list_spec.js | 4 +-- spec/frontend/ide/components/ide_status_mr_spec.js | 2 +- spec/frontend/ide/components/ide_tree_spec.js | 2 +- .../components/jobs/detail/scroll_button_spec.js | 2 +- spec/frontend/ide/components/jobs/list_spec.js | 2 +- spec/frontend/ide/components/jobs/stage_spec.js | 4 +-- .../ide/components/merge_requests/item_spec.js | 6 ++-- .../ide/components/merge_requests/list_spec.js | 4 +-- spec/frontend/ide/components/nav_dropdown_spec.js | 4 +-- .../ide/components/new_dropdown/index_spec.js | 2 +- .../ide/components/new_dropdown/modal_spec.js | 4 +-- .../components/panes/collapsible_sidebar_spec.js | 4 +-- spec/frontend/ide/components/panes/right_spec.js | 6 ++-- .../frontend/ide/components/pipelines/list_spec.js | 6 ++-- .../ide/components/preview/clientside_spec.js | 2 +- .../ide/components/preview/navigator_spec.js | 2 +- .../ide/components/repo_commit_section_spec.js | 6 ++-- spec/frontend/ide/components/repo_editor_spec.js | 10 +++---- spec/frontend/ide/components/repo_tab_spec.js | 2 +- spec/frontend/ide/components/repo_tabs_spec.js | 4 +-- .../ide/components/resizable_panel_spec.js | 4 +-- .../ide/components/terminal/empty_state_spec.js | 2 +- .../ide/components/terminal/session_spec.js | 2 +- .../components/terminal/terminal_controls_spec.js | 2 +- .../ide/components/terminal/terminal_spec.js | 4 +-- spec/frontend/ide/components/terminal/view_spec.js | 4 +-- .../terminal_sync_status_safe_spec.js | 2 +- .../terminal_sync/terminal_sync_status_spec.js | 4 +-- spec/frontend/ide/helpers.js | 2 +- spec/frontend/ide/lib/create_diff_spec.js | 2 +- spec/frontend/ide/lib/create_file_diff_spec.js | 2 +- .../ide/lib/decorations/controller_spec.js | 4 +-- spec/frontend/ide/lib/diff/controller_spec.js | 2 +- spec/frontend/ide/lib/editor_spec.js | 4 +-- spec/frontend/ide/lib/languages/hcl_spec.js | 2 +- spec/frontend/ide/lib/languages/vue_spec.js | 2 +- spec/frontend/ide/services/index_spec.js | 4 +-- spec/frontend/ide/stores/actions/file_spec.js | 10 +++---- .../ide/stores/actions/merge_request_spec.js | 8 +++--- spec/frontend/ide/stores/actions/project_spec.js | 8 +++--- spec/frontend/ide/stores/actions/tree_spec.js | 8 +++--- spec/frontend/ide/stores/actions_spec.js | 8 +++--- spec/frontend/ide/stores/getters_spec.js | 4 +-- .../ide/stores/modules/branches/actions_spec.js | 6 ++-- .../ide/stores/modules/branches/mutations_spec.js | 4 +-- .../ide/stores/modules/clientside/actions_spec.js | 4 +-- .../ide/stores/modules/commit/actions_spec.js | 16 +++++------ .../ide/stores/modules/commit/getters_spec.js | 4 +-- .../ide/stores/modules/commit/mutations_spec.js | 4 +-- .../ide/stores/modules/editor/actions_spec.js | 2 +- .../ide/stores/modules/editor/getters_spec.js | 2 +- .../ide/stores/modules/editor/mutations_spec.js | 2 +- .../stores/modules/file_templates/actions_spec.js | 4 +-- .../stores/modules/file_templates/getters_spec.js | 2 +- .../modules/file_templates/mutations_spec.js | 2 +- .../stores/modules/merge_requests/actions_spec.js | 6 ++-- .../modules/merge_requests/mutations_spec.js | 4 +-- .../ide/stores/modules/pane/mutations_spec.js | 4 +-- .../ide/stores/modules/pipelines/actions_spec.js | 8 +++--- .../ide/stores/modules/pipelines/mutations_spec.js | 2 +- .../ide/stores/modules/router/mutations_spec.js | 2 +- .../stores/modules/terminal/actions/checks_spec.js | 4 +-- .../terminal/actions/session_controls_spec.js | 6 ++-- .../terminal/actions/session_status_spec.js | 4 +-- .../stores/modules/terminal/actions/setup_spec.js | 2 +- .../ide/stores/modules/terminal/messages_spec.js | 2 +- .../ide/stores/modules/terminal/mutations_spec.js | 2 +- .../stores/modules/terminal_sync/actions_spec.js | 2 +- .../stores/modules/terminal_sync/mutations_spec.js | 2 +- spec/frontend/ide/stores/mutations/file_spec.js | 2 +- spec/frontend/ide/stores/plugins/terminal_spec.js | 2 +- .../ide/stores/plugins/terminal_sync_spec.js | 8 +++--- spec/frontend/ide/stores/utils_spec.js | 2 +- spec/frontend/image_diff/image_badge_spec.js | 2 +- spec/frontend/image_diff/image_diff_spec.js | 2 +- .../image_diff/init_discussion_tab_spec.js | 2 +- .../image_diff/replaced_image_diff_spec.js | 4 +-- .../components/import_table_row_spec.js | 6 ++-- .../import_groups/components/import_table_spec.js | 13 ++++----- .../import_groups/graphql/client_factory_spec.js | 16 +++++------ .../graphql/services/source_groups_manager_spec.js | 4 +-- .../graphql/services/status_poller_spec.js | 6 ++-- .../components/bitbucket_status_table_spec.js | 4 +-- .../components/import_projects_table_spec.js | 8 +++--- .../components/provider_repo_table_row_spec.js | 8 +++--- .../import_projects/store/actions_spec.js | 12 ++++---- .../import_projects/store/getters_spec.js | 2 +- .../import_projects/store/mutations_spec.js | 2 +- .../import_entities/import_projects/utils_spec.js | 2 +- .../incidents/components/incidents_list_spec.js | 10 +++---- .../components/incidents_settings_service_spec.js | 6 ++-- .../components/incidents_settings_tabs_spec.js | 2 +- .../components/pagerduty_form_spec.js | 2 +- .../edit/components/active_checkbox_spec.js | 5 ++-- .../edit/components/confirmation_modal_spec.js | 5 ++-- .../edit/components/dynamic_field_spec.js | 2 +- .../edit/components/integration_form_spec.js | 16 +++++------ .../edit/components/jira_issues_fields_spec.js | 3 +- .../edit/components/jira_trigger_fields_spec.js | 2 +- .../edit/components/override_dropdown_spec.js | 7 ++--- .../edit/components/trigger_fields_spec.js | 2 +- .../integrations/edit/store/actions_spec.js | 4 +-- .../integrations/edit/store/getters_spec.js | 4 +-- .../integrations/edit/store/mutations_spec.js | 2 +- .../integrations/integration_settings_form_spec.js | 2 +- .../components/invite_member_modal_spec.js | 4 +-- .../components/invite_member_trigger_spec.js | 2 +- .../components/invite_members_modal_spec.js | 2 +- .../components/invite_members_trigger_spec.js | 2 +- .../components/members_token_select_spec.js | 4 +-- .../issuable/components/issuable_by_email_spec.js | 6 ++-- .../components/add_issuable_form_spec.js | 2 +- .../related_issues/components/issue_token_spec.js | 2 +- .../components/related_issues_block_spec.js | 2 +- .../components/related_issues_root_spec.js | 6 ++-- .../components/issuable_form_spec.js | 5 ++-- .../issuable_list/components/issuable_item_spec.js | 2 +- .../components/issuable_list_root_spec.js | 4 +-- .../issuable_list/components/issuable_tabs_spec.js | 2 +- .../issuable_show/components/issuable_body_spec.js | 2 +- .../components/issuable_description_spec.js | 2 +- .../components/issuable_edit_form_spec.js | 4 +-- .../components/issuable_header_spec.js | 2 +- .../components/issuable_show_root_spec.js | 4 +-- .../components/issuable_title_spec.js | 2 +- .../components/issuable_sidebar_root_spec.js | 2 +- .../issuable_suggestions/components/item_spec.js | 4 +-- spec/frontend/issue_show/components/app_spec.js | 8 +++--- .../issue_show/components/description_spec.js | 2 +- .../components/fields/description_spec.js | 2 +- spec/frontend/issue_show/components/form_spec.js | 2 +- .../components/incidents/highlight_bar_spec.js | 2 +- .../components/incidents/incident_tabs_spec.js | 10 +++---- .../issue_show/components/pinned_links_spec.js | 2 +- spec/frontend/issue_show/components/title_spec.js | 2 +- spec/frontend/issue_show/issue_spec.js | 2 +- spec/frontend/issue_spec.js | 4 +-- .../issues_list/components/issuable_spec.js | 8 +++--- .../components/issuables_list_app_spec.js | 14 +++++----- spec/frontend/jira_connect/api_spec.js | 3 +- spec/frontend/jira_connect/components/app_spec.js | 2 +- .../components/groups_list_item_spec.js | 4 +-- .../jira_connect/components/groups_list_spec.js | 2 +- .../components/jira_import_form_spec.js | 2 +- spec/frontend/jira_import/mock_data.js | 2 +- .../jira_import/utils/jira_import_utils_spec.js | 2 +- .../jobs/components/artifacts_block_spec.js | 2 +- spec/frontend/jobs/components/erased_block_spec.js | 4 +-- spec/frontend/jobs/components/job_app_spec.js | 12 ++++---- .../job_sidebar_details_container_spec.js | 2 +- .../jobs/components/log/line_header_spec.js | 2 +- spec/frontend/jobs/components/log/log_spec.js | 2 +- .../jobs/components/manual_variables_form_spec.js | 2 +- .../jobs/components/sidebar_detail_row_spec.js | 2 +- spec/frontend/jobs/components/sidebar_spec.js | 6 ++-- .../frontend/jobs/components/trigger_block_spec.js | 2 +- .../components/unmet_prerequisites_block_spec.js | 2 +- spec/frontend/jobs/store/actions_spec.js | 6 ++-- spec/frontend/jobs/store/mutations_spec.js | 4 +-- spec/frontend/lazy_loader_spec.js | 2 +- spec/frontend/lib/utils/ajax_cache_spec.js | 2 +- spec/frontend/lib/utils/poll_spec.js | 2 +- .../frontend/lib/utils/poll_until_complete_spec.js | 2 +- spec/frontend/line_highlighter_spec.js | 2 +- .../logs/components/environment_logs_spec.js | 2 +- .../logs/components/log_advanced_filters_spec.js | 8 +++--- .../logs/components/log_control_buttons_spec.js | 2 +- .../logs/components/log_simple_filters_spec.js | 2 +- spec/frontend/logs/stores/actions_spec.js | 13 ++++----- spec/frontend/logs/stores/mutations_spec.js | 2 +- .../access_request_action_buttons_spec.js | 2 +- .../approve_access_request_button_spec.js | 2 +- .../components/action_buttons/leave_button_spec.js | 2 +- .../remove_group_link_button_spec.js | 2 +- .../action_buttons/resend_invite_button_spec.js | 2 +- .../action_buttons/user_action_buttons_spec.js | 4 +-- spec/frontend/members/components/app_spec.js | 4 +-- .../components/avatars/group_avatar_spec.js | 4 +-- .../components/avatars/invite_avatar_spec.js | 2 +- .../members/components/avatars/user_avatar_spec.js | 4 +-- .../members_filtered_search_bar_spec.js | 2 +- .../components/filter_sort/sort_dropdown_spec.js | 4 +-- .../members/components/modals/leave_modal_spec.js | 4 +-- .../modals/remove_group_link_modal_spec.js | 4 +-- .../members/components/table/created_at_spec.js | 2 +- .../components/table/expiration_datepicker_spec.js | 4 +-- .../members/components/table/expires_at_spec.js | 2 +- .../components/table/member_action_buttons_spec.js | 8 +++--- .../members/components/table/member_avatar_spec.js | 6 ++-- .../members/components/table/member_source_spec.js | 2 +- .../components/table/members_table_cell_spec.js | 2 +- .../members/components/table/members_table_spec.js | 16 +++++------ .../members/components/table/role_dropdown_spec.js | 10 +++---- spec/frontend/members/index_spec.js | 2 +- spec/frontend/members/store/actions_spec.js | 8 +++--- spec/frontend/members/store/mutations_spec.js | 2 +- spec/frontend/members/utils_spec.js | 2 +- .../merge_request/components/status_box_spec.js | 4 +-- spec/frontend/merge_request_spec.js | 2 +- spec/frontend/merge_request_tabs_spec.js | 2 +- .../frontend/milestones/milestone_combobox_spec.js | 6 ++-- spec/frontend/milestones/stores/actions_spec.js | 2 +- spec/frontend/milestones/stores/mutations_spec.js | 4 +-- spec/frontend/mini_pipeline_graph_dropdown_spec.js | 2 +- spec/frontend/monitoring/alert_widget_spec.js | 4 +-- .../components/alert_widget_form_spec.js | 2 +- .../monitoring/components/charts/anomaly_spec.js | 4 +-- .../monitoring/components/charts/bar_spec.js | 2 +- .../monitoring/components/charts/column_spec.js | 2 +- .../monitoring/components/charts/gauge_spec.js | 2 +- .../monitoring/components/charts/heatmap_spec.js | 2 +- .../components/charts/single_stat_spec.js | 2 +- .../components/charts/stacked_column_spec.js | 4 +-- .../components/charts/time_series_spec.js | 9 +++--- .../components/create_dashboard_modal_spec.js | 2 +- .../components/dashboard_actions_menu_spec.js | 10 +++---- .../monitoring/components/dashboard_header_spec.js | 14 +++++----- .../components/dashboard_panel_builder_spec.js | 6 ++-- .../monitoring/components/dashboard_panel_spec.js | 24 ++++++++-------- .../monitoring/components/dashboard_spec.js | 24 ++++++++-------- .../components/dashboard_template_spec.js | 2 +- .../components/dashboard_url_time_spec.js | 2 +- .../components/dashboards_dropdown_spec.js | 4 +-- .../components/duplicate_dashboard_form_spec.js | 2 +- .../components/duplicate_dashboard_modal_spec.js | 8 +++--- .../components/embeds/embed_group_spec.js | 2 +- .../components/embeds/metric_embed_spec.js | 2 +- .../monitoring/components/empty_state_spec.js | 4 +-- .../monitoring/components/graph_group_spec.js | 2 +- .../monitoring/components/links_section_spec.js | 4 +-- .../monitoring/components/refresh_button_spec.js | 4 +-- .../components/variables/dropdown_field_spec.js | 2 +- .../components/variables/text_field_spec.js | 2 +- .../components/variables_section_spec.js | 4 +-- spec/frontend/monitoring/fixture_data.js | 6 ++-- spec/frontend/monitoring/graph_data.js | 2 +- .../monitoring/pages/dashboard_page_spec.js | 4 +-- .../monitoring/pages/panel_new_page_spec.js | 7 ++--- spec/frontend/monitoring/requests/index_spec.js | 2 +- spec/frontend/monitoring/router_spec.js | 4 +-- spec/frontend/monitoring/store/actions_spec.js | 32 +++++++++++----------- .../monitoring/store/embed_group/mutations_spec.js | 4 +-- spec/frontend/monitoring/store/getters_spec.js | 6 ++-- spec/frontend/monitoring/store/mutations_spec.js | 8 +++--- spec/frontend/monitoring/store/utils_spec.js | 4 +-- .../monitoring/store/variable_mapping_spec.js | 2 +- spec/frontend/monitoring/store_utils.js | 2 +- spec/frontend/monitoring/utils_spec.js | 6 ++-- spec/frontend/namespace_select_spec.js | 2 +- spec/frontend/notebook/cells/markdown_spec.js | 2 +- .../frontend/notes/components/comment_form_spec.js | 6 ++-- .../components/diff_discussion_header_spec.js | 4 +-- .../notes/components/diff_with_note_spec.js | 2 +- .../notes/components/discussion_counter_spec.js | 6 ++-- .../components/discussion_filter_note_spec.js | 2 +- .../notes/components/discussion_filter_spec.js | 4 +-- .../notes/components/discussion_navigator_spec.js | 2 +- .../notes/components/discussion_notes_spec.js | 6 ++-- .../components/discussion_resolve_button_spec.js | 2 +- .../components/multiline_comment_form_spec.js | 4 +-- .../components/note_actions/reply_button_spec.js | 2 +- .../frontend/notes/components/note_actions_spec.js | 6 ++-- .../notes/components/note_awards_list_spec.js | 4 +-- spec/frontend/notes/components/note_body_spec.js | 8 +++--- spec/frontend/notes/components/note_form_spec.js | 6 ++-- spec/frontend/notes/components/note_header_spec.js | 2 +- .../notes/components/noteable_discussion_spec.js | 8 +++--- .../notes/components/noteable_note_spec.js | 10 +++---- spec/frontend/notes/components/notes_app_spec.js | 10 +++---- .../notes/components/sort_discussion_spec.js | 4 +-- .../notes/components/timeline_toggle_spec.js | 4 +-- .../notes/mixins/discussion_navigation_spec.js | 6 ++-- spec/frontend/notes/old_notes_spec.js | 6 ++-- spec/frontend/notes/stores/actions_spec.js | 16 +++++------ spec/frontend/notes/stores/getters_spec.js | 2 +- spec/frontend/notes/stores/mutation_spec.js | 2 +- .../components/custom_notifications_modal_spec.js | 4 +-- .../components/notifications_dropdown_spec.js | 6 ++-- .../components/metrics_settings_spec.js | 14 +++++----- .../operation_settings/store/mutations_spec.js | 2 +- .../details/components/additional_metadata_spec.js | 4 +-- .../packages/details/components/app_spec.js | 25 ++++++++--------- .../components/composer_installation_spec.js | 4 +-- .../details/components/conan_installation_spec.js | 2 +- .../components/installations_commands_spec.js | 6 ++-- .../details/components/maven_installation_spec.js | 4 +-- .../details/components/npm_installation_spec.js | 6 ++-- .../details/components/nuget_installation_spec.js | 6 ++-- .../details/components/package_files_spec.js | 4 +-- .../details/components/package_history_spec.js | 8 +++--- .../details/components/package_title_spec.js | 4 +-- .../details/components/pypi_installation_spec.js | 2 +- .../packages/details/store/actions_spec.js | 2 +- .../packages/details/store/getters_spec.js | 2 +- .../packages/details/store/mutations_spec.js | 2 +- .../list/components/packages_list_app_spec.js | 10 +++---- .../packages/list/components/packages_list_spec.js | 10 +++---- .../list/components/packages_search_spec.js | 4 +-- .../list/components/packages_title_spec.js | 4 +-- .../components/tokens/package_type_token_spec.js | 2 +- spec/frontend/packages/list/stores/actions_spec.js | 2 +- .../packages/list/stores/mutations_spec.js | 4 +-- .../shared/components/package_list_row_spec.js | 2 +- spec/frontend/packages/shared/utils_spec.js | 2 +- .../group/components/group_settings_app_spec.js | 6 ++-- .../group/components/maven_settings_spec.js | 2 +- .../group/graphl/utils/cache_update_spec.js | 2 +- spec/frontend/pager_spec.js | 4 +-- .../jobs/index/components/stop_jobs_modal_spec.js | 4 +-- .../users/components/delete_user_modal_spec.js | 2 +- .../components/customize_homepage_banner_spec.js | 4 +-- .../pages/dashboard/todos/index/todos_spec.js | 2 +- .../bitbucket_server_status_table_spec.js | 4 +-- .../labels/components/promote_label_modal_spec.js | 4 +-- .../components/delete_milestone_modal_spec.js | 4 +-- .../components/promote_milestone_modal_spec.js | 6 ++-- .../new/components/fork_groups_list_item_spec.js | 2 +- .../forks/new/components/fork_groups_list_spec.js | 6 ++-- .../pages/projects/graphs/code_coverage_spec.js | 6 ++-- .../components/pipeline_schedule_callout_spec.js | 2 +- .../permissions/components/settings_panel_spec.js | 2 +- .../components/detailed_metric_spec.js | 2 +- spec/frontend/persistent_user_callout_spec.js | 2 +- .../components/commit/commit_form_spec.js | 2 +- .../components/commit/commit_section_spec.js | 8 +++--- .../editor/ci_config_merged_preview_spec.js | 4 +-- .../components/header/validation_segment_spec.js | 4 +-- .../components/lint/ci_lint_results_spec.js | 4 +-- .../components/lint/ci_lint_spec.js | 2 +- .../components/lint/ci_lint_warnings_spec.js | 2 +- .../components/pipeline_editor_tabs_spec.js | 8 +++--- .../components/ui/editor_tab_spec.js | 4 +-- .../pipeline_editor/graphql/resolvers_spec.js | 2 +- .../pipeline_editor/pipeline_editor_app_spec.js | 9 +++--- .../pipeline_editor/pipeline_editor_home_spec.js | 6 ++-- .../components/pipeline_new_form_spec.js | 6 ++-- .../pipeline_new/utils/format_refs_spec.js | 2 +- spec/frontend/pipelines/blank_state_spec.js | 2 +- .../components/dag/dag_annotations_spec.js | 2 +- .../pipelines/components/dag/dag_graph_spec.js | 4 +-- spec/frontend/pipelines/components/dag/dag_spec.js | 6 ++-- .../pipelines/components/dag/parsing_utils_spec.js | 2 +- .../components/pipelines_filtered_search_spec.js | 2 +- .../pipelines/graph/action_component_spec.js | 2 +- .../pipelines/graph/graph_component_legacy_spec.js | 10 +++---- .../pipelines/graph/graph_component_spec.js | 4 +-- .../graph/graph_component_wrapper_spec.js | 6 ++-- .../pipelines/graph/job_name_component_spec.js | 3 +- .../pipelines/graph/linked_pipeline_spec.js | 6 ++-- .../graph/linked_pipelines_column_legacy_spec.js | 4 +-- .../graph/linked_pipelines_column_spec.js | 6 ++-- .../pipelines/graph_shared/links_layer_spec.js | 4 +-- spec/frontend/pipelines/header_component_spec.js | 4 +-- .../pipeline_graph/pipeline_graph_spec.js | 6 ++-- spec/frontend/pipelines/pipeline_triggerer_spec.js | 2 +- spec/frontend/pipelines/pipeline_url_spec.js | 2 +- spec/frontend/pipelines/pipelines_actions_spec.js | 4 +-- .../frontend/pipelines/pipelines_artifacts_spec.js | 2 +- spec/frontend/pipelines/pipelines_spec.js | 21 +++++++------- spec/frontend/pipelines/stage_spec.js | 2 +- .../pipelines/test_reports/stores/actions_spec.js | 2 +- .../test_reports/test_case_details_spec.js | 2 +- .../pipelines/test_reports/test_reports_spec.js | 2 +- .../test_reports/test_suite_table_spec.js | 6 ++-- .../test_reports/test_summary_table_spec.js | 2 +- spec/frontend/pipelines/time_ago_spec.js | 2 +- spec/frontend/popovers/components/popovers_spec.js | 2 +- .../components/delete_account_modal_spec.js | 4 +-- .../account/components/update_username_spec.js | 2 +- .../components/integration_view_spec.js | 4 +-- .../components/profile_preferences_spec.js | 2 +- spec/frontend/project_find_file_spec.js | 2 +- .../commit/components/branches_dropdown_spec.js | 4 +-- .../projects/commit/components/form_modal_spec.js | 10 +++---- .../commit/components/form_trigger_spec.js | 2 +- .../frontend/projects/commit/store/actions_spec.js | 6 ++-- .../projects/commit/store/mutations_spec.js | 2 +- .../commits/components/author_select_spec.js | 2 +- .../projects/commits/store/actions_spec.js | 4 +-- .../projects/compare/components/app_spec.js | 2 +- .../compare/components/revision_dropdown_spec.js | 4 +-- .../components/shared/delete_button_spec.js | 2 +- .../components/app_spec.js | 4 +-- .../pipelines/charts/components/app_spec.js | 4 +-- .../components/ci_cd_analytics_charts_spec.js | 6 ++-- .../charts/components/pipeline_charts_spec.js | 4 +-- .../components/shared_runners_toggle_spec.js | 2 +- .../components/service_desk_setting_spec.js | 2 +- .../prometheus_alerts/components/reset_key_spec.js | 4 +-- .../prometheus_metrics/custom_metrics_spec.js | 2 +- .../prometheus_metrics/prometheus_metrics_spec.js | 2 +- spec/frontend/ref/components/ref_selector_spec.js | 6 ++-- spec/frontend/ref/stores/actions_spec.js | 2 +- spec/frontend/ref/stores/mutations_spec.js | 6 ++-- .../explorer/components/delete_button_spec.js | 2 +- .../explorer/components/delete_image_spec.js | 3 +- .../components/details_page/delete_alert_spec.js | 2 +- .../components/details_page/delete_modal_spec.js | 2 +- .../components/details_page/details_header_spec.js | 4 +-- .../components/details_page/empty_state_spec.js | 2 +- .../details_page/partial_cleanup_alert_spec.js | 2 +- .../components/details_page/status_alert_spec.js | 2 +- .../components/details_page/tags_list_row_spec.js | 10 +++---- .../components/details_page/tags_list_spec.js | 2 +- .../components/list_page/cli_commands_spec.js | 8 +++--- .../components/list_page/group_empty_state_spec.js | 4 +-- .../components/list_page/image_list_row_spec.js | 10 +++---- .../components/list_page/image_list_spec.js | 2 +- .../list_page/project_empty_state_spec.js | 6 ++-- .../components/list_page/registry_header_spec.js | 4 +-- .../registry/explorer/pages/details_spec.js | 20 +++++++------- spec/frontend/registry/explorer/pages/list_spec.js | 20 ++++++-------- .../settings/components/expiration_input_spec.js | 2 +- .../components/expiration_run_text_spec.js | 2 +- .../settings/components/expiration_toggle_spec.js | 2 +- .../components/registry_settings_app_spec.js | 4 +-- .../settings/components/settings_form_spec.js | 6 ++-- .../settings/graphql/cache_updated_spec.js | 2 +- .../components/related_merge_requests_spec.js | 2 +- .../related_merge_requests/store/actions_spec.js | 2 +- .../related_merge_requests/store/mutations_spec.js | 2 +- .../releases/components/app_edit_new_spec.js | 8 +++--- .../frontend/releases/components/app_index_spec.js | 10 +++---- spec/frontend/releases/components/app_show_spec.js | 6 ++-- .../releases/components/asset_links_form_spec.js | 4 +-- .../releases/components/evidence_block_spec.js | 4 +-- .../components/release_block_assets_spec.js | 4 +-- .../components/release_block_footer_spec.js | 6 ++-- .../components/release_block_header_spec.js | 4 +-- .../release_block_milestone_info_spec.js | 6 ++-- .../releases/components/release_block_spec.js | 8 +++--- .../components/release_skeleton_loader_spec.js | 2 +- .../components/releases_pagination_graphql_spec.js | 6 ++-- .../components/releases_pagination_rest_spec.js | 6 ++-- .../releases/components/releases_sort_spec.js | 2 +- .../releases/components/tag_field_exsting_spec.js | 2 +- .../releases/components/tag_field_new_spec.js | 4 +-- .../frontend/releases/components/tag_field_spec.js | 2 +- .../releases/stores/modules/detail/actions_spec.js | 12 ++++---- .../stores/modules/detail/mutations_spec.js | 6 ++-- .../releases/stores/modules/list/actions_spec.js | 20 +++++++------- .../releases/stores/modules/list/mutations_spec.js | 6 ++-- .../grouped_accessibility_reports_app_spec.js | 2 +- .../accessibility_report/store/actions_spec.js | 4 +-- .../accessibility_report/store/getters_spec.js | 2 +- .../accessibility_report/store/mutations_spec.js | 2 +- .../grouped_codequality_reports_app_spec.js | 2 +- .../codequality_report/store/actions_spec.js | 4 +-- .../codequality_report/store/getters_spec.js | 2 +- .../codequality_report/store/mutations_spec.js | 2 +- .../components/grouped_test_reports_app_spec.js | 6 ++-- spec/frontend/reports/components/modal_spec.js | 2 +- .../reports/components/report_item_spec.js | 6 ++-- .../reports/components/report_section_spec.js | 2 +- .../reports/components/test_issue_body_spec.js | 2 +- spec/frontend/reports/store/actions_spec.js | 4 +-- spec/frontend/reports/store/mutations_spec.js | 4 +-- spec/frontend/reports/store/utils_spec.js | 2 +- .../repository/components/breadcrumbs_spec.js | 2 +- .../repository/components/last_commit_spec.js | 2 +- .../repository/components/preview/index_spec.js | 2 +- .../repository/components/table/index_spec.js | 2 +- .../repository/components/table/parent_row_spec.js | 2 +- .../repository/components/table/row_spec.js | 2 +- .../repository/components/tree_content_spec.js | 2 +- spec/frontend/repository/utils/dom_spec.js | 2 +- spec/frontend/right_sidebar_spec.js | 2 +- .../frontend/search/sidebar/components/app_spec.js | 4 +-- .../components/confidentiality_filter_spec.js | 2 +- .../search/sidebar/components/radio_filter_spec.js | 6 ++-- .../sidebar/components/status_filter_spec.js | 4 +-- spec/frontend/search/sort/components/app_spec.js | 4 +-- spec/frontend/search/store/actions_spec.js | 6 ++-- spec/frontend/search/store/mutations_spec.js | 2 +- spec/frontend/search/topbar/components/app_spec.js | 4 +-- .../search/topbar/components/group_filter_spec.js | 2 +- .../topbar/components/project_filter_spec.js | 2 +- .../topbar/components/searchable_dropdown_spec.js | 4 +-- spec/frontend/search_autocomplete_spec.js | 2 +- .../configuration_table_spec.js | 2 +- .../security_configuration/manage_sast_spec.js | 10 +++---- .../security_configuration/upgrade_spec.js | 2 +- .../components/self_monitor_form_spec.js | 2 +- spec/frontend/sentry/index_spec.js | 2 +- spec/frontend/sentry/sentry_config_spec.js | 2 +- .../components/sentry_error_stack_trace_spec.js | 2 +- .../serverless/components/empty_state_spec.js | 2 +- .../serverless/components/function_details_spec.js | 2 +- .../serverless/components/functions_spec.js | 8 +++--- .../components/missing_prometheus_spec.js | 2 +- spec/frontend/serverless/components/url_spec.js | 2 +- spec/frontend/serverless/store/actions_spec.js | 2 +- spec/frontend/serverless/store/getters_spec.js | 2 +- spec/frontend/serverless/store/mutations_spec.js | 2 +- spec/frontend/serverless/survey_banner_spec.js | 2 +- .../set_status_modal_wrapper_spec.js | 2 +- spec/frontend/sidebar/assignee_title_spec.js | 2 +- spec/frontend/sidebar/assignees_realtime_spec.js | 4 +-- spec/frontend/sidebar/assignees_spec.js | 2 +- .../assignees/assignee_avatar_link_spec.js | 2 +- .../assignees/collapsed_assignee_list_spec.js | 4 +-- .../assignees/collapsed_assignee_spec.js | 2 +- .../assignees/uncollapsed_assignee_list_spec.js | 2 +- .../components/copy_email_to_clipboard_spec.js | 4 +-- .../reviewers/uncollapsed_reviewer_list_spec.js | 2 +- .../sidebar/components/severity/severity_spec.js | 4 +-- .../components/severity/sidebar_severity_spec.js | 8 +++--- .../components/time_tracking/time_tracker_spec.js | 2 +- .../sidebar/confidential/edit_form_buttons_spec.js | 4 +-- .../sidebar/confidential_issue_sidebar_spec.js | 6 ++-- .../sidebar/lock/edit_form_buttons_spec.js | 6 ++-- .../sidebar/lock/issuable_lock_form_spec.js | 6 ++-- spec/frontend/sidebar/reviewer_title_spec.js | 2 +- spec/frontend/sidebar/reviewers_spec.js | 2 +- spec/frontend/sidebar/sidebar_assignees_spec.js | 6 ++-- spec/frontend/sidebar/sidebar_move_issue_spec.js | 6 ++-- .../frontend/sidebar/sidebar_subscriptions_spec.js | 2 +- spec/frontend/sidebar/todo_spec.js | 2 +- spec/frontend/snippets/components/edit_spec.js | 16 +++++------ .../snippets/components/embed_dropdown_spec.js | 4 +-- spec/frontend/snippets/components/show_spec.js | 7 ++--- .../components/snippet_blob_actions_edit_spec.js | 2 +- .../snippets/components/snippet_blob_edit_spec.js | 8 +++--- .../snippets/components/snippet_blob_view_spec.js | 8 +++--- .../snippets/components/snippet_header_spec.js | 8 +++--- .../snippets/components/snippet_title_spec.js | 2 +- .../components/edit_area_spec.js | 11 ++++---- .../components/edit_drawer_spec.js | 3 +- .../components/edit_meta_controls_spec.js | 3 +- .../components/edit_meta_modal_spec.js | 6 ++-- .../components/front_matter_controls_spec.js | 2 +- .../components/submit_changes_error_spec.js | 2 +- .../resolvers/submit_content_changes_spec.js | 2 +- .../frontend/static_site_editor/pages/home_spec.js | 8 +++--- .../static_site_editor/pages/success_spec.js | 2 +- spec/frontend/task_list_spec.js | 2 +- .../terraform/components/states_table_spec.js | 2 +- spec/frontend/test_setup.js | 4 +-- spec/frontend/tooltips/components/tooltips_spec.js | 2 +- .../user_lists/components/edit_user_list_spec.js | 8 +++--- .../user_lists/components/new_user_list_spec.js | 6 ++-- .../user_lists/components/user_list_spec.js | 10 +++---- .../frontend/user_lists/store/edit/actions_spec.js | 6 ++-- .../user_lists/store/edit/mutations_spec.js | 2 +- spec/frontend/user_lists/store/new/actions_spec.js | 6 ++-- .../user_lists/store/new/mutations_spec.js | 2 +- .../frontend/user_lists/store/show/actions_spec.js | 6 ++-- .../user_lists/store/show/mutations_spec.js | 4 +-- spec/frontend/user_popovers_spec.js | 2 +- .../components/approvals/approvals_spec.js | 4 +-- .../approvals/approvals_summary_optional_spec.js | 2 +- .../components/approvals/approvals_summary_spec.js | 4 +-- .../components/artifacts_list_app_spec.js | 6 ++-- .../components/artifacts_list_spec.js | 2 +- .../components/mr_collapsible_extension_spec.js | 2 +- .../components/mr_widget_alert_message_spec.js | 2 +- .../components/mr_widget_icon_spec.js | 2 +- .../components/mr_widget_memory_usage_spec.js | 2 +- .../mr_widget_pipeline_container_spec.js | 6 ++-- .../components/mr_widget_pipeline_spec.js | 6 ++-- .../components/mr_widget_rebase_spec.js | 4 +-- .../components/mr_widget_suggest_pipeline_spec.js | 8 +++--- .../states/mr_widget_auto_merge_enabled_spec.js | 6 ++-- .../states/mr_widget_auto_merge_failed_spec.js | 4 +-- .../mr_widget_commit_message_dropdown_spec.js | 2 +- .../components/states/mr_widget_conflicts_spec.js | 4 +-- .../components/states/mr_widget_merged_spec.js | 6 ++-- .../states/mr_widget_pipeline_failed_spec.js | 2 +- .../states/mr_widget_ready_to_merge_spec.js | 14 +++++----- .../states/mr_widget_sha_mismatch_spec.js | 2 +- .../states/mr_widget_squash_before_merge_spec.js | 2 +- .../mr_widget_unresolved_discussions_spec.js | 2 +- .../components/states/mr_widget_wip_spec.js | 2 +- .../mr_widget_terraform_container_spec.js | 2 +- .../deployment/deployment_action_button_spec.js | 4 +-- .../deployment/deployment_actions_spec.js | 4 +-- .../vue_mr_widget/deployment/deployment_spec.js | 6 ++-- .../vue_mr_widget/mr_widget_options_spec.js | 10 +++---- .../stores/artifacts_list/actions_spec.js | 4 +-- .../stores/artifacts_list/mutations_spec.js | 4 +-- .../vue_shared/alert_details/alert_details_spec.js | 4 +-- .../alert_management_sidebar_todo_spec.js | 2 +- .../vue_shared/alert_details/alert_metrics_spec.js | 4 +-- .../vue_shared/alert_details/alert_status_spec.js | 4 +-- .../alert_managment_sidebar_assignees_spec.js | 2 +- .../sidebar/alert_sidebar_status_spec.js | 4 +-- .../alert_management_system_note_spec.js | 2 +- .../vue_shared/components/actions_button_spec.js | 2 +- .../components/blob_viewers/rich_viewer_spec.js | 2 +- .../components/blob_viewers/simple_viewer_spec.js | 2 +- .../components/changed_file_icon_spec.js | 2 +- .../frontend/vue_shared/components/ci_icon_spec.js | 2 +- .../vue_shared/components/clipboard_button_spec.js | 4 +-- .../vue_shared/components/clone_dropdown_spec.js | 2 +- spec/frontend/vue_shared/components/commit_spec.js | 4 +-- .../content_viewer/viewers/markdown_viewer_spec.js | 4 +-- .../diff_viewer/viewers/image_diff_viewer_spec.js | 2 +- .../components/diff_viewer/viewers/renamed_spec.js | 4 +-- .../components/dismissible_alert_spec.js | 2 +- .../components/dismissible_container_spec.js | 2 +- .../components/dismissible_feedback_alert_spec.js | 2 +- .../vue_shared/components/editor_lite_spec.js | 4 +-- .../vue_shared/components/expand_button_spec.js | 2 +- .../components/file_finder/index_spec.js | 6 ++-- .../vue_shared/components/file_finder/item_spec.js | 2 +- .../vue_shared/components/file_icon_spec.js | 2 +- .../vue_shared/components/file_row_spec.js | 4 +-- .../vue_shared/components/file_tree_spec.js | 2 +- .../filtered_search_bar_root_spec.js | 9 +++--- .../store/modules/filters/actions_spec.js | 6 ++-- .../store/modules/filters/mutations_spec.js | 6 ++-- .../tokens/author_token_spec.js | 4 +-- .../tokens/branch_token_spec.js | 4 +-- .../filtered_search_bar/tokens/label_token_spec.js | 4 +-- .../tokens/milestone_token_spec.js | 4 +-- .../vue_shared/components/gl_modal_vuex_spec.js | 4 +-- .../vue_shared/components/gl_toggle_vuex_spec.js | 2 +- .../vue_shared/components/help_popover_spec.js | 2 +- .../components/integration_help_text_spec.js | 2 +- .../issuable/issuable_header_warnings_spec.js | 4 +-- .../components/issue/issue_assignees_spec.js | 2 +- .../components/issue/issue_milestone_spec.js | 4 +-- .../components/issue/related_issuable_item_spec.js | 2 +- .../components/markdown/apply_suggestion_spec.js | 2 +- .../vue_shared/components/markdown/field_spec.js | 2 +- .../components/markdown/field_view_spec.js | 2 +- .../vue_shared/components/memory_graph_spec.js | 4 +-- .../components/modal_copy_button_spec.js | 2 +- .../components/multiselect_dropdown_spec.js | 2 +- .../vue_shared/components/navigation_tabs_spec.js | 2 +- .../components/notes/noteable_warning_spec.js | 2 +- .../components/notes/system_note_spec.js | 4 +-- .../paginated_table_with_search_and_tabs_spec.js | 6 ++-- .../vue_shared/components/pagination_links_spec.js | 4 +-- .../frontend/vue_shared/components/pikaday_spec.js | 2 +- .../project_selector/project_selector_spec.js | 5 ++-- .../components/registry/code_instruction_spec.js | 2 +- .../components/registry/details_row_spec.js | 2 +- .../components/registry/history_item_spec.js | 2 +- .../components/registry/metadata_item_spec.js | 2 +- .../resizable_chart_container_spec.js | 2 +- .../rich_content_editor/editor_service_spec.js | 4 +-- .../modals/add_image/add_image_modal_spec.js | 4 +-- .../modals/insert_video_modal_spec.js | 2 +- .../rich_content_editor_integration_spec.js | 2 +- .../rich_content_editor_spec.js | 8 +++--- .../render_font_awesome_html_inline_spec.js | 2 +- .../services/renderers/render_html_block_spec.js | 2 +- .../render_identifier_instance_text_spec.js | 2 +- .../services/renderers/render_utils_spec.js | 9 +++--- .../rich_content_editor/toolbar_item_spec.js | 2 +- .../runner_instructions_spec.js | 2 +- .../components/settings/settings_block_spec.js | 2 +- .../components/sidebar/date_picker_spec.js | 2 +- .../sidebar/issuable_move_dropdown_spec.js | 4 +-- .../components/sidebar/labels_select/base_spec.js | 2 +- .../sidebar/labels_select/dropdown_title_spec.js | 2 +- .../sidebar/labels_select/dropdown_value_spec.js | 2 +- .../labels_select_vue/dropdown_button_spec.js | 4 +-- .../dropdown_contents_create_view_spec.js | 4 +-- .../dropdown_contents_labels_view_spec.js | 9 +++--- .../labels_select_vue/dropdown_contents_spec.js | 2 +- .../labels_select_vue/dropdown_title_spec.js | 4 +-- .../labels_select_vue/dropdown_value_spec.js | 4 +-- .../sidebar/labels_select_vue/label_item_spec.js | 2 +- .../labels_select_vue/labels_select_root_spec.js | 10 +++---- .../labels_select_vue/store/actions_spec.js | 7 ++--- .../labels_select_vue/store/mutations_spec.js | 2 +- .../components/smart_virtual_list_spec.js | 2 +- .../vue_shared/components/table_pagination_spec.js | 2 +- .../vue_shared/components/tabs/tabs_spec.js | 2 +- .../vue_shared/components/todo_button_spec.js | 2 +- .../vue_shared/components/toggle_button_spec.js | 2 +- .../upload_dropzone/upload_dropzone_spec.js | 2 +- .../user_avatar/user_avatar_link_spec.js | 6 ++-- .../user_avatar/user_avatar_list_spec.js | 4 +-- .../components/user_popover/user_popover_spec.js | 2 +- .../vue_shared/components/web_ide_link_spec.js | 2 +- .../frontend/vue_shared/directives/tooltip_spec.js | 2 +- .../vue_shared/directives/track_event_spec.js | 2 +- .../security_reports/security_reports_app_spec.js | 6 ++-- .../security_reports/store/getters_spec.js | 8 +++--- .../store/modules/sast/actions_spec.js | 6 ++-- .../store/modules/sast/mutations_spec.js | 2 +- .../store/modules/secret_detection/actions_spec.js | 6 ++-- .../modules/secret_detection/mutations_spec.js | 2 +- .../vue_shared/security_reports/utils_spec.js | 2 +- .../vuex_shared/modules/modal/actions_spec.js | 2 +- .../vuex_shared/modules/modal/mutations_spec.js | 2 +- spec/frontend/whats_new/components/app_spec.js | 2 +- spec/frontend/whats_new/store/actions_spec.js | 4 +-- spec/frontend/whats_new/store/mutations_spec.js | 2 +- .../whats_new/utils/get_drawer_body_height_spec.js | 2 +- spec/frontend/zen_mode_spec.js | 4 +-- 1021 files changed, 2102 insertions(+), 2135 deletions(-) (limited to 'spec') diff --git a/spec/frontend/__helpers__/emoji.js b/spec/frontend/__helpers__/emoji.js index c8bcbee7ea5..9f9134f6f63 100644 --- a/spec/frontend/__helpers__/emoji.js +++ b/spec/frontend/__helpers__/emoji.js @@ -1,6 +1,6 @@ import MockAdapter from 'axios-mock-adapter'; -import axios from '~/lib/utils/axios_utils'; import { initEmojiMap, EMOJI_VERSION } from '~/emoji'; +import axios from '~/lib/utils/axios_utils'; export const emojiFixtureMap = { atom: { diff --git a/spec/frontend/__helpers__/init_vue_mr_page_helper.js b/spec/frontend/__helpers__/init_vue_mr_page_helper.js index b9aed63d0f6..ee01e9e6268 100644 --- a/spec/frontend/__helpers__/init_vue_mr_page_helper.js +++ b/spec/frontend/__helpers__/init_vue_mr_page_helper.js @@ -1,8 +1,8 @@ import MockAdapter from 'axios-mock-adapter'; -import initMRPage from '~/mr_notes'; import axios from '~/lib/utils/axios_utils'; -import { userDataMock, notesDataMock, noteableDataMock } from '../notes/mock_data'; +import initMRPage from '~/mr_notes'; import diffFileMockData from '../diffs/mock_data/diff_file'; +import { userDataMock, notesDataMock, noteableDataMock } from '../notes/mock_data'; export default function initVueMRPage() { const mrTestEl = document.createElement('div'); diff --git a/spec/frontend/add_context_commits_modal/components/add_context_commits_modal_spec.js b/spec/frontend/add_context_commits_modal/components/add_context_commits_modal_spec.js index 0faf0db4135..d32e582e498 100644 --- a/spec/frontend/add_context_commits_modal/components/add_context_commits_modal_spec.js +++ b/spec/frontend/add_context_commits_modal/components/add_context_commits_modal_spec.js @@ -1,11 +1,11 @@ +import { GlModal, GlSearchBoxByType } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlModal, GlSearchBoxByType } from '@gitlab/ui'; import AddReviewItemsModal from '~/add_context_commits_modal/components/add_context_commits_modal_wrapper.vue'; -import defaultState from '~/add_context_commits_modal/store/state'; -import mutations from '~/add_context_commits_modal/store/mutations'; import * as actions from '~/add_context_commits_modal/store/actions'; +import mutations from '~/add_context_commits_modal/store/mutations'; +import defaultState from '~/add_context_commits_modal/store/state'; import getDiffWithCommit from '../../diffs/mock_data/diff_with_commit'; const localVue = createLocalVue(); diff --git a/spec/frontend/add_context_commits_modal/components/review_tab_container_spec.js b/spec/frontend/add_context_commits_modal/components/review_tab_container_spec.js index 4e65713a680..75f1cc41e23 100644 --- a/spec/frontend/add_context_commits_modal/components/review_tab_container_spec.js +++ b/spec/frontend/add_context_commits_modal/components/review_tab_container_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import ReviewTabContainer from '~/add_context_commits_modal/components/review_tab_container.vue'; import CommitItem from '~/diffs/components/commit_item.vue'; import getDiffWithCommit from '../../diffs/mock_data/diff_with_commit'; diff --git a/spec/frontend/add_context_commits_modal/store/actions_spec.js b/spec/frontend/add_context_commits_modal/store/actions_spec.js index 3bb3cb68f56..fa4d52cbfbb 100644 --- a/spec/frontend/add_context_commits_modal/store/actions_spec.js +++ b/spec/frontend/add_context_commits_modal/store/actions_spec.js @@ -1,7 +1,6 @@ import MockAdapter from 'axios-mock-adapter'; import { TEST_HOST } from 'helpers/test_constants'; import testAction from 'helpers/vuex_action_helper'; -import axios from '~/lib/utils/axios_utils'; import { setBaseConfig, setTabIndex, @@ -16,6 +15,7 @@ import { resetModalState, } from '~/add_context_commits_modal/store/actions'; import * as types from '~/add_context_commits_modal/store/mutation_types'; +import axios from '~/lib/utils/axios_utils'; describe('AddContextCommitsModalStoreActions', () => { const contextCommitEndpoint = diff --git a/spec/frontend/add_context_commits_modal/store/mutations_spec.js b/spec/frontend/add_context_commits_modal/store/mutations_spec.js index 22f82570ab1..2331a4af1bc 100644 --- a/spec/frontend/add_context_commits_modal/store/mutations_spec.js +++ b/spec/frontend/add_context_commits_modal/store/mutations_spec.js @@ -1,6 +1,6 @@ import { TEST_HOST } from 'helpers/test_constants'; -import mutations from '~/add_context_commits_modal/store/mutations'; import * as types from '~/add_context_commits_modal/store/mutation_types'; +import mutations from '~/add_context_commits_modal/store/mutations'; import getDiffWithCommit from '../../diffs/mock_data/diff_with_commit'; describe('AddContextCommitsModalStoreMutations', () => { diff --git a/spec/frontend/admin/statistics_panel/components/app_spec.js b/spec/frontend/admin/statistics_panel/components/app_spec.js index a4dcfa1a480..9c424491d04 100644 --- a/spec/frontend/admin/statistics_panel/components/app_spec.js +++ b/spec/frontend/admin/statistics_panel/components/app_spec.js @@ -1,12 +1,12 @@ -import Vuex from 'vuex'; +import { GlLoadingIcon } from '@gitlab/ui'; import { createLocalVue, shallowMount } from '@vue/test-utils'; import AxiosMockAdapter from 'axios-mock-adapter'; -import { GlLoadingIcon } from '@gitlab/ui'; -import axios from '~/lib/utils/axios_utils'; -import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; +import Vuex from 'vuex'; import StatisticsPanelApp from '~/admin/statistics_panel/components/app.vue'; import statisticsLabels from '~/admin/statistics_panel/constants'; import createStore from '~/admin/statistics_panel/store'; +import axios from '~/lib/utils/axios_utils'; +import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import mockStatistics from '../mock_data'; const localVue = createLocalVue(); diff --git a/spec/frontend/admin/statistics_panel/store/actions_spec.js b/spec/frontend/admin/statistics_panel/store/actions_spec.js index ecbc823be12..c7481b664b3 100644 --- a/spec/frontend/admin/statistics_panel/store/actions_spec.js +++ b/spec/frontend/admin/statistics_panel/store/actions_spec.js @@ -1,10 +1,10 @@ import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; -import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import * as actions from '~/admin/statistics_panel/store/actions'; import * as types from '~/admin/statistics_panel/store/mutation_types'; import getInitialState from '~/admin/statistics_panel/store/state'; +import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import mockStatistics from '../mock_data'; describe('Admin statistics panel actions', () => { diff --git a/spec/frontend/admin/statistics_panel/store/getters_spec.js b/spec/frontend/admin/statistics_panel/store/getters_spec.js index 152d82531ed..6cdd40b1a98 100644 --- a/spec/frontend/admin/statistics_panel/store/getters_spec.js +++ b/spec/frontend/admin/statistics_panel/store/getters_spec.js @@ -1,5 +1,5 @@ -import createState from '~/admin/statistics_panel/store/state'; import * as getters from '~/admin/statistics_panel/store/getters'; +import createState from '~/admin/statistics_panel/store/state'; describe('Admin statistics panel getters', () => { let state; diff --git a/spec/frontend/admin/statistics_panel/store/mutations_spec.js b/spec/frontend/admin/statistics_panel/store/mutations_spec.js index 179f38d2bc5..0a3dad09c9a 100644 --- a/spec/frontend/admin/statistics_panel/store/mutations_spec.js +++ b/spec/frontend/admin/statistics_panel/store/mutations_spec.js @@ -1,5 +1,5 @@ -import mutations from '~/admin/statistics_panel/store/mutations'; import * as types from '~/admin/statistics_panel/store/mutation_types'; +import mutations from '~/admin/statistics_panel/store/mutations'; import getInitialState from '~/admin/statistics_panel/store/state'; import mockStatistics from '../mock_data'; diff --git a/spec/frontend/admin/users/components/actions/actions_spec.js b/spec/frontend/admin/users/components/actions/actions_spec.js index 22cd908449e..5e232f34311 100644 --- a/spec/frontend/admin/users/components/actions/actions_spec.js +++ b/spec/frontend/admin/users/components/actions/actions_spec.js @@ -1,10 +1,10 @@ -import { nextTick } from 'vue'; -import { shallowMount } from '@vue/test-utils'; import { GlDropdownItem } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { kebabCase } from 'lodash'; -import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; +import { nextTick } from 'vue'; import Actions from '~/admin/users/components/actions'; import SharedDeleteAction from '~/admin/users/components/actions/shared/shared_delete_action.vue'; +import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; import { CONFIRMATION_ACTIONS, DELETE_ACTIONS } from '../../constants'; diff --git a/spec/frontend/admin/users/components/user_actions_spec.js b/spec/frontend/admin/users/components/user_actions_spec.js index ec625c228be..0745d961f25 100644 --- a/spec/frontend/admin/users/components/user_actions_spec.js +++ b/spec/frontend/admin/users/components/user_actions_spec.js @@ -1,13 +1,13 @@ -import { shallowMount } from '@vue/test-utils'; import { GlDropdownDivider } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; +import Actions from '~/admin/users/components/actions'; import AdminUserActions from '~/admin/users/components/user_actions.vue'; -import { generateUserPaths } from '~/admin/users/utils'; import { I18N_USER_ACTIONS } from '~/admin/users/constants'; -import Actions from '~/admin/users/components/actions'; +import { generateUserPaths } from '~/admin/users/utils'; import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; -import { users, paths } from '../mock_data'; import { CONFIRMATION_ACTIONS, DELETE_ACTIONS, LINK_ACTIONS, LDAP, EDIT } from '../constants'; +import { users, paths } from '../mock_data'; describe('AdminUserActions component', () => { let wrapper; diff --git a/spec/frontend/admin/users/components/users_table_spec.js b/spec/frontend/admin/users/components/users_table_spec.js index ac48542cec5..f1fcc20fb65 100644 --- a/spec/frontend/admin/users/components/users_table_spec.js +++ b/spec/frontend/admin/users/components/users_table_spec.js @@ -1,10 +1,10 @@ import { GlTable } from '@gitlab/ui'; import { mount } from '@vue/test-utils'; -import AdminUsersTable from '~/admin/users/components/users_table.vue'; +import AdminUserActions from '~/admin/users/components/user_actions.vue'; import AdminUserAvatar from '~/admin/users/components/user_avatar.vue'; import AdminUserDate from '~/admin/users/components/user_date.vue'; -import AdminUserActions from '~/admin/users/components/user_actions.vue'; +import AdminUsersTable from '~/admin/users/components/users_table.vue'; import { users, paths } from '../mock_data'; diff --git a/spec/frontend/alert_management/components/alert_management_empty_state_spec.js b/spec/frontend/alert_management/components/alert_management_empty_state_spec.js index 509c67743c1..c2bf90e7635 100644 --- a/spec/frontend/alert_management/components/alert_management_empty_state_spec.js +++ b/spec/frontend/alert_management/components/alert_management_empty_state_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlEmptyState } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import AlertManagementEmptyState from '~/alert_management/components/alert_management_empty_state.vue'; import defaultProvideValues from '../mocks/alerts_provide_config.json'; diff --git a/spec/frontend/alert_management/components/alert_management_list_wrapper_spec.js b/spec/frontend/alert_management/components/alert_management_list_wrapper_spec.js index 1d79b10a796..bba5fcbbf08 100644 --- a/spec/frontend/alert_management/components/alert_management_list_wrapper_spec.js +++ b/spec/frontend/alert_management/components/alert_management_list_wrapper_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; -import AlertManagementList from '~/alert_management/components/alert_management_list_wrapper.vue'; import AlertManagementEmptyState from '~/alert_management/components/alert_management_empty_state.vue'; +import AlertManagementList from '~/alert_management/components/alert_management_list_wrapper.vue'; import AlertManagementTable from '~/alert_management/components/alert_management_table.vue'; import defaultProvideValues from '../mocks/alerts_provide_config.json'; diff --git a/spec/frontend/alert_management/components/alert_management_table_spec.js b/spec/frontend/alert_management/components/alert_management_table_spec.js index 21217e6c608..cea665aa50d 100644 --- a/spec/frontend/alert_management/components/alert_management_table_spec.js +++ b/spec/frontend/alert_management/components/alert_management_table_spec.js @@ -1,12 +1,12 @@ -import { mount } from '@vue/test-utils'; import { GlTable, GlAlert, GlLoadingIcon, GlDropdown, GlIcon, GlAvatar } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; import mockAlerts from 'jest/vue_shared/alert_details/mocks/alerts.json'; -import { visitUrl } from '~/lib/utils/url_utility'; -import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; import AlertManagementTable from '~/alert_management/components/alert_management_table.vue'; +import { visitUrl } from '~/lib/utils/url_utility'; import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; +import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; import defaultProvideValues from '../mocks/alerts_provide_config.json'; jest.mock('~/lib/utils/url_utility', () => ({ diff --git a/spec/frontend/alerts_settings/components/alert_mapping_builder_spec.js b/spec/frontend/alerts_settings/components/alert_mapping_builder_spec.js index 1ec7b5c18f6..7e1d1acb62c 100644 --- a/spec/frontend/alerts_settings/components/alert_mapping_builder_spec.js +++ b/spec/frontend/alerts_settings/components/alert_mapping_builder_spec.js @@ -2,8 +2,8 @@ import { GlIcon, GlFormInput, GlDropdown, GlSearchBoxByType, GlDropdownItem } fr import { shallowMount } from '@vue/test-utils'; import AlertMappingBuilder, { i18n } from '~/alerts_settings/components/alert_mapping_builder.vue'; import parsedMapping from '~/alerts_settings/components/mocks/parsedMapping.json'; -import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; import * as transformationUtils from '~/alerts_settings/utils/mapping_transformations'; +import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; import alertFields from '../mocks/alertFields.json'; describe('AlertMappingBuilder', () => { diff --git a/spec/frontend/alerts_settings/components/alerts_integrations_list_spec.js b/spec/frontend/alerts_settings/components/alerts_integrations_list_spec.js index 5a3874d055b..c43d78a1cf3 100644 --- a/spec/frontend/alerts_settings/components/alerts_integrations_list_spec.js +++ b/spec/frontend/alerts_settings/components/alerts_integrations_list_spec.js @@ -1,11 +1,11 @@ import { GlTable, GlIcon, GlButton } from '@gitlab/ui'; import { mount } from '@vue/test-utils'; import { useMockIntersectionObserver } from 'helpers/mock_dom_observer'; -import Tracking from '~/tracking'; import AlertIntegrationsList, { i18n, } from '~/alerts_settings/components/alerts_integrations_list.vue'; import { trackAlertIntegrationsViewsOptions } from '~/alerts_settings/constants'; +import Tracking from '~/tracking'; const mockIntegrations = [ { diff --git a/spec/frontend/alerts_settings/components/alerts_settings_form_spec.js b/spec/frontend/alerts_settings/components/alerts_settings_form_spec.js index b43c1318a86..02229b3d3da 100644 --- a/spec/frontend/alerts_settings/components/alerts_settings_form_spec.js +++ b/spec/frontend/alerts_settings/components/alerts_settings_form_spec.js @@ -1,4 +1,3 @@ -import { mount } from '@vue/test-utils'; import { GlForm, GlFormSelect, @@ -7,9 +6,10 @@ import { GlToggle, GlFormTextarea, } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import waitForPromises from 'helpers/wait_for_promises'; -import AlertsSettingsForm from '~/alerts_settings/components/alerts_settings_form.vue'; import MappingBuilder from '~/alerts_settings/components/alert_mapping_builder.vue'; +import AlertsSettingsForm from '~/alerts_settings/components/alerts_settings_form.vue'; import { typeSet } from '~/alerts_settings/constants'; import alertFields from '../mocks/alertFields.json'; import { defaultAlertSettingsConfig } from './util'; diff --git a/spec/frontend/alerts_settings/components/alerts_settings_wrapper_spec.js b/spec/frontend/alerts_settings/components/alerts_settings_wrapper_spec.js index 79a7cd93f01..80293597ab6 100644 --- a/spec/frontend/alerts_settings/components/alerts_settings_wrapper_spec.js +++ b/spec/frontend/alerts_settings/components/alerts_settings_wrapper_spec.js @@ -1,23 +1,22 @@ -import VueApollo from 'vue-apollo'; +import { GlLoadingIcon } from '@gitlab/ui'; import { mount, createLocalVue } from '@vue/test-utils'; import AxiosMockAdapter from 'axios-mock-adapter'; -import { GlLoadingIcon } from '@gitlab/ui'; +import VueApollo from 'vue-apollo'; import createMockApollo from 'helpers/mock_apollo_helper'; -import waitForPromises from 'helpers/wait_for_promises'; import { useMockIntersectionObserver } from 'helpers/mock_dom_observer'; -import axios from '~/lib/utils/axios_utils'; -import AlertsSettingsWrapper from '~/alerts_settings/components/alerts_settings_wrapper.vue'; -import AlertsSettingsForm from '~/alerts_settings/components/alerts_settings_form.vue'; +import waitForPromises from 'helpers/wait_for_promises'; import IntegrationsList from '~/alerts_settings/components/alerts_integrations_list.vue'; -import getIntegrationsQuery from '~/alerts_settings/graphql/queries/get_integrations.query.graphql'; +import AlertsSettingsForm from '~/alerts_settings/components/alerts_settings_form.vue'; +import AlertsSettingsWrapper from '~/alerts_settings/components/alerts_settings_wrapper.vue'; +import { typeSet } from '~/alerts_settings/constants'; import createHttpIntegrationMutation from '~/alerts_settings/graphql/mutations/create_http_integration.mutation.graphql'; import createPrometheusIntegrationMutation from '~/alerts_settings/graphql/mutations/create_prometheus_integration.mutation.graphql'; -import updateHttpIntegrationMutation from '~/alerts_settings/graphql/mutations/update_http_integration.mutation.graphql'; -import updatePrometheusIntegrationMutation from '~/alerts_settings/graphql/mutations/update_prometheus_integration.mutation.graphql'; import destroyHttpIntegrationMutation from '~/alerts_settings/graphql/mutations/destroy_http_integration.mutation.graphql'; import resetHttpTokenMutation from '~/alerts_settings/graphql/mutations/reset_http_token.mutation.graphql'; import resetPrometheusTokenMutation from '~/alerts_settings/graphql/mutations/reset_prometheus_token.mutation.graphql'; -import { typeSet } from '~/alerts_settings/constants'; +import updateHttpIntegrationMutation from '~/alerts_settings/graphql/mutations/update_http_integration.mutation.graphql'; +import updatePrometheusIntegrationMutation from '~/alerts_settings/graphql/mutations/update_prometheus_integration.mutation.graphql'; +import getIntegrationsQuery from '~/alerts_settings/graphql/queries/get_integrations.query.graphql'; import { ADD_INTEGRATION_ERROR, RESET_INTEGRATION_TOKEN_ERROR, @@ -26,8 +25,7 @@ import { DELETE_INTEGRATION_ERROR, } from '~/alerts_settings/utils/error_messages'; import createFlash from '~/flash'; -import { defaultAlertSettingsConfig } from './util'; -import mockIntegrations from './mocks/integrations.json'; +import axios from '~/lib/utils/axios_utils'; import { createHttpVariables, updateHttpVariables, @@ -40,6 +38,8 @@ import { integrationToDestroy, destroyIntegrationResponseWithErrors, } from './mocks/apollo_mock'; +import mockIntegrations from './mocks/integrations.json'; +import { defaultAlertSettingsConfig } from './util'; jest.mock('~/flash'); diff --git a/spec/frontend/alerts_settings/utils/mapping_transformations_spec.js b/spec/frontend/alerts_settings/utils/mapping_transformations_spec.js index f8d2a7aa23b..8c1977ffebe 100644 --- a/spec/frontend/alerts_settings/utils/mapping_transformations_spec.js +++ b/spec/frontend/alerts_settings/utils/mapping_transformations_spec.js @@ -1,9 +1,9 @@ +import parsedMapping from '~/alerts_settings/components/mocks/parsedMapping.json'; import { getMappingData, getPayloadFields, transformForSave, } from '~/alerts_settings/utils/mapping_transformations'; -import parsedMapping from '~/alerts_settings/components/mocks/parsedMapping.json'; import alertFields from '../mocks/alertFields.json'; describe('Mapping Transformation Utilities', () => { diff --git a/spec/frontend/analytics/components/activity_chart_spec.js b/spec/frontend/analytics/components/activity_chart_spec.js index 1f0f9a6c5d7..a6b45ffe20f 100644 --- a/spec/frontend/analytics/components/activity_chart_spec.js +++ b/spec/frontend/analytics/components/activity_chart_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlColumnChart } from '@gitlab/ui/dist/charts'; +import { shallowMount } from '@vue/test-utils'; import ActivityChart from '~/analytics/product_analytics/components/activity_chart.vue'; describe('Activity Chart Bundle', () => { diff --git a/spec/frontend/analytics/instance_statistics/components/app_spec.js b/spec/frontend/analytics/instance_statistics/components/app_spec.js index cc676e86e99..b945cc20bd6 100644 --- a/spec/frontend/analytics/instance_statistics/components/app_spec.js +++ b/spec/frontend/analytics/instance_statistics/components/app_spec.js @@ -1,9 +1,9 @@ import { shallowMount } from '@vue/test-utils'; -import InstanceStatisticsApp from '~/analytics/instance_statistics/components/app.vue'; import InstanceCounts from '~/analytics/instance_statistics/components//instance_counts.vue'; +import InstanceStatisticsApp from '~/analytics/instance_statistics/components/app.vue'; import InstanceStatisticsCountChart from '~/analytics/instance_statistics/components/instance_statistics_count_chart.vue'; -import UsersChart from '~/analytics/instance_statistics/components/users_chart.vue'; import ProjectsAndGroupsChart from '~/analytics/instance_statistics/components/projects_and_groups_chart.vue'; +import UsersChart from '~/analytics/instance_statistics/components/users_chart.vue'; describe('InstanceStatisticsApp', () => { let wrapper; diff --git a/spec/frontend/analytics/instance_statistics/components/instance_statistics_count_chart_spec.js b/spec/frontend/analytics/instance_statistics/components/instance_statistics_count_chart_spec.js index a69f3388cbb..e80dcdff426 100644 --- a/spec/frontend/analytics/instance_statistics/components/instance_statistics_count_chart_spec.js +++ b/spec/frontend/analytics/instance_statistics/components/instance_statistics_count_chart_spec.js @@ -1,13 +1,13 @@ -import { createLocalVue, shallowMount } from '@vue/test-utils'; -import { GlLineChart } from '@gitlab/ui/dist/charts'; import { GlAlert } from '@gitlab/ui'; +import { GlLineChart } from '@gitlab/ui/dist/charts'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; import VueApollo from 'vue-apollo'; import createMockApollo from 'helpers/mock_apollo_helper'; import InstanceStatisticsCountChart from '~/analytics/instance_statistics/components/instance_statistics_count_chart.vue'; import statsQuery from '~/analytics/instance_statistics/graphql/queries/instance_count.query.graphql'; import ChartSkeletonLoader from '~/vue_shared/components/resizable_chart/skeleton_loader.vue'; -import { mockCountsData1 } from '../mock_data'; import { mockQueryResponse, mockApolloResponse } from '../apollo_mock_data'; +import { mockCountsData1 } from '../mock_data'; const localVue = createLocalVue(); localVue.use(VueApollo); diff --git a/spec/frontend/analytics/instance_statistics/components/projects_and_groups_chart_spec.js b/spec/frontend/analytics/instance_statistics/components/projects_and_groups_chart_spec.js index 93c1e330fa7..bbfc65f19b1 100644 --- a/spec/frontend/analytics/instance_statistics/components/projects_and_groups_chart_spec.js +++ b/spec/frontend/analytics/instance_statistics/components/projects_and_groups_chart_spec.js @@ -1,14 +1,14 @@ -import { createLocalVue, shallowMount } from '@vue/test-utils'; -import { GlLineChart } from '@gitlab/ui/dist/charts'; import { GlAlert } from '@gitlab/ui'; +import { GlLineChart } from '@gitlab/ui/dist/charts'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; import VueApollo from 'vue-apollo'; import createMockApollo from 'helpers/mock_apollo_helper'; import ProjectsAndGroupChart from '~/analytics/instance_statistics/components/projects_and_groups_chart.vue'; -import ChartSkeletonLoader from '~/vue_shared/components/resizable_chart/skeleton_loader.vue'; -import projectsQuery from '~/analytics/instance_statistics/graphql/queries/projects.query.graphql'; import groupsQuery from '~/analytics/instance_statistics/graphql/queries/groups.query.graphql'; -import { mockCountsData2, roundedSortedCountsMonthlyChartData2 } from '../mock_data'; +import projectsQuery from '~/analytics/instance_statistics/graphql/queries/projects.query.graphql'; +import ChartSkeletonLoader from '~/vue_shared/components/resizable_chart/skeleton_loader.vue'; import { mockQueryResponse } from '../apollo_mock_data'; +import { mockCountsData2, roundedSortedCountsMonthlyChartData2 } from '../mock_data'; const localVue = createLocalVue(); localVue.use(VueApollo); diff --git a/spec/frontend/analytics/instance_statistics/components/users_chart_spec.js b/spec/frontend/analytics/instance_statistics/components/users_chart_spec.js index b35ab8ec646..d857b7fae61 100644 --- a/spec/frontend/analytics/instance_statistics/components/users_chart_spec.js +++ b/spec/frontend/analytics/instance_statistics/components/users_chart_spec.js @@ -1,17 +1,17 @@ -import { createLocalVue, shallowMount } from '@vue/test-utils'; -import { GlAreaChart } from '@gitlab/ui/dist/charts'; import { GlAlert } from '@gitlab/ui'; +import { GlAreaChart } from '@gitlab/ui/dist/charts'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; import VueApollo from 'vue-apollo'; import createMockApollo from 'helpers/mock_apollo_helper'; import UsersChart from '~/analytics/instance_statistics/components/users_chart.vue'; -import ChartSkeletonLoader from '~/vue_shared/components/resizable_chart/skeleton_loader.vue'; import usersQuery from '~/analytics/instance_statistics/graphql/queries/users.query.graphql'; +import ChartSkeletonLoader from '~/vue_shared/components/resizable_chart/skeleton_loader.vue'; +import { mockQueryResponse } from '../apollo_mock_data'; import { mockCountsData1, mockCountsData2, roundedSortedCountsMonthlyChartData2, } from '../mock_data'; -import { mockQueryResponse } from '../apollo_mock_data'; const localVue = createLocalVue(); localVue.use(VueApollo); diff --git a/spec/frontend/analytics/shared/components/metric_card_spec.js b/spec/frontend/analytics/shared/components/metric_card_spec.js index e89d499ed9b..7f587d227ab 100644 --- a/spec/frontend/analytics/shared/components/metric_card_spec.js +++ b/spec/frontend/analytics/shared/components/metric_card_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlDeprecatedSkeletonLoading as GlSkeletonLoading } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import MetricCard from '~/analytics/shared/components/metric_card.vue'; diff --git a/spec/frontend/api_spec.js b/spec/frontend/api_spec.js index 6bfc4a7b7c8..d2522a0124a 100644 --- a/spec/frontend/api_spec.js +++ b/spec/frontend/api_spec.js @@ -1,6 +1,6 @@ import MockAdapter from 'axios-mock-adapter'; -import axios from '~/lib/utils/axios_utils'; import Api from '~/api'; +import axios from '~/lib/utils/axios_utils'; import httpStatus from '~/lib/utils/http_status'; describe('Api', () => { diff --git a/spec/frontend/artifacts_settings/components/keep_latest_artifact_checkbox_spec.js b/spec/frontend/artifacts_settings/components/keep_latest_artifact_checkbox_spec.js index 888d14163c5..fe2886d6c95 100644 --- a/spec/frontend/artifacts_settings/components/keep_latest_artifact_checkbox_spec.js +++ b/spec/frontend/artifacts_settings/components/keep_latest_artifact_checkbox_spec.js @@ -2,10 +2,10 @@ import { GlFormCheckbox, GlLink } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import VueApollo from 'vue-apollo'; import createMockApollo from 'helpers/mock_apollo_helper'; -import KeepLatestArtifactCheckbox from '~/artifacts_settings/keep_latest_artifact_checkbox.vue'; -import GetKeepLatestArtifactProjectSetting from '~/artifacts_settings/graphql/queries/get_keep_latest_artifact_project_setting.query.graphql'; -import GetKeepLatestArtifactApplicationSetting from '~/artifacts_settings/graphql/queries/get_keep_latest_artifact_application_setting.query.graphql'; import UpdateKeepLatestArtifactProjectSetting from '~/artifacts_settings/graphql/mutations/update_keep_latest_artifact_project_setting.mutation.graphql'; +import GetKeepLatestArtifactApplicationSetting from '~/artifacts_settings/graphql/queries/get_keep_latest_artifact_application_setting.query.graphql'; +import GetKeepLatestArtifactProjectSetting from '~/artifacts_settings/graphql/queries/get_keep_latest_artifact_project_setting.query.graphql'; +import KeepLatestArtifactCheckbox from '~/artifacts_settings/keep_latest_artifact_checkbox.vue'; const localVue = createLocalVue(); localVue.use(VueApollo); diff --git a/spec/frontend/authentication/two_factor_auth/components/recovery_codes_spec.js b/spec/frontend/authentication/two_factor_auth/components/recovery_codes_spec.js index 98c8ed4b95d..b77def195b6 100644 --- a/spec/frontend/authentication/two_factor_auth/components/recovery_codes_spec.js +++ b/spec/frontend/authentication/two_factor_auth/components/recovery_codes_spec.js @@ -1,17 +1,17 @@ -import { mount } from '@vue/test-utils'; import { GlAlert, GlButton } from '@gitlab/ui'; -import { nextTick } from 'vue'; import { within } from '@testing-library/dom'; +import { mount } from '@vue/test-utils'; +import { nextTick } from 'vue'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; -import Tracking from '~/tracking'; import RecoveryCodes, { i18n, } from '~/authentication/two_factor_auth/components/recovery_codes.vue'; -import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import { RECOVERY_CODE_DOWNLOAD_FILENAME, COPY_KEYBOARD_SHORTCUT, } from '~/authentication/two_factor_auth/constants'; +import Tracking from '~/tracking'; +import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import { codes, codesFormattedString, codesDownloadHref, profileAccountPath } from '../mock_data'; describe('RecoveryCodes', () => { diff --git a/spec/frontend/authentication/two_factor_auth/index_spec.js b/spec/frontend/authentication/two_factor_auth/index_spec.js index b181170b0a1..f5345139021 100644 --- a/spec/frontend/authentication/two_factor_auth/index_spec.js +++ b/spec/frontend/authentication/two_factor_auth/index_spec.js @@ -1,8 +1,8 @@ -import { createWrapper } from '@vue/test-utils'; import { getByTestId, fireEvent } from '@testing-library/dom'; -import * as urlUtils from '~/lib/utils/url_utility'; +import { createWrapper } from '@vue/test-utils'; import { initRecoveryCodes, initClose2faSuccessMessage } from '~/authentication/two_factor_auth'; import RecoveryCodes from '~/authentication/two_factor_auth/components/recovery_codes.vue'; +import * as urlUtils from '~/lib/utils/url_utility'; import { codesJsonString, codes, profileAccountPath } from './mock_data'; describe('initRecoveryCodes', () => { diff --git a/spec/frontend/avatar_helper_spec.js b/spec/frontend/avatar_helper_spec.js index c4da7189751..91bf8e28774 100644 --- a/spec/frontend/avatar_helper_spec.js +++ b/spec/frontend/avatar_helper_spec.js @@ -1,5 +1,4 @@ import { TEST_HOST } from 'spec/test_constants'; -import { getFirstCharacterCapitalized } from '~/lib/utils/text_utility'; import { DEFAULT_SIZE_CLASS, IDENTICON_BG_COUNT, @@ -8,6 +7,7 @@ import { getIdenticonBackgroundClass, getIdenticonTitle, } from '~/helpers/avatar_helper'; +import { getFirstCharacterCapitalized } from '~/lib/utils/text_utility'; function matchAll(str) { return new RegExp(`^${str}$`); diff --git a/spec/frontend/awards_handler_spec.js b/spec/frontend/awards_handler_spec.js index 4f7b8cce949..edd17cfd810 100644 --- a/spec/frontend/awards_handler_spec.js +++ b/spec/frontend/awards_handler_spec.js @@ -1,10 +1,10 @@ +import MockAdapter from 'axios-mock-adapter'; import $ from 'jquery'; import Cookies from 'js-cookie'; -import MockAdapter from 'axios-mock-adapter'; import { useFakeRequestAnimationFrame } from 'helpers/fake_request_animation_frame'; -import axios from '~/lib/utils/axios_utils'; import loadAwardsHandler from '~/awards_handler'; import { EMOJI_VERSION } from '~/emoji'; +import axios from '~/lib/utils/axios_utils'; window.gl = window.gl || {}; window.gon = window.gon || {}; diff --git a/spec/frontend/badges/components/badge_form_spec.js b/spec/frontend/badges/components/badge_form_spec.js index 34c65d51115..e375fcb4705 100644 --- a/spec/frontend/badges/components/badge_form_spec.js +++ b/spec/frontend/badges/components/badge_form_spec.js @@ -1,11 +1,11 @@ -import Vue from 'vue'; import MockAdapter from 'axios-mock-adapter'; -import { mountComponentWithStore } from 'helpers/vue_mount_component_helper'; +import Vue from 'vue'; import { DUMMY_IMAGE_URL, TEST_HOST } from 'helpers/test_constants'; -import axios from '~/lib/utils/axios_utils'; -import store from '~/badges/store'; -import createEmptyBadge from '~/badges/empty_badge'; +import { mountComponentWithStore } from 'helpers/vue_mount_component_helper'; import BadgeForm from '~/badges/components/badge_form.vue'; +import createEmptyBadge from '~/badges/empty_badge'; +import store from '~/badges/store'; +import axios from '~/lib/utils/axios_utils'; // avoid preview background process BadgeForm.methods.debouncedPreview = () => {}; diff --git a/spec/frontend/badges/components/badge_list_row_spec.js b/spec/frontend/badges/components/badge_list_row_spec.js index c559c979cb3..372663017e2 100644 --- a/spec/frontend/badges/components/badge_list_row_spec.js +++ b/spec/frontend/badges/components/badge_list_row_spec.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import { mountComponentWithStore } from 'helpers/vue_mount_component_helper'; +import BadgeListRow from '~/badges/components/badge_list_row.vue'; import { GROUP_BADGE, PROJECT_BADGE } from '~/badges/constants'; import store from '~/badges/store'; -import BadgeListRow from '~/badges/components/badge_list_row.vue'; import { createDummyBadge } from '../dummy_badge'; describe('BadgeListRow component', () => { diff --git a/spec/frontend/badges/components/badge_list_spec.js b/spec/frontend/badges/components/badge_list_spec.js index da59e13e1e9..6cc90c6de46 100644 --- a/spec/frontend/badges/components/badge_list_spec.js +++ b/spec/frontend/badges/components/badge_list_spec.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import { mountComponentWithStore } from 'helpers/vue_mount_component_helper'; +import BadgeList from '~/badges/components/badge_list.vue'; import { GROUP_BADGE, PROJECT_BADGE } from '~/badges/constants'; import store from '~/badges/store'; -import BadgeList from '~/badges/components/badge_list.vue'; import { createDummyBadge } from '../dummy_badge'; describe('BadgeList component', () => { diff --git a/spec/frontend/badges/components/badge_settings_spec.js b/spec/frontend/badges/components/badge_settings_spec.js index 769be7cb1bd..0c29379763e 100644 --- a/spec/frontend/badges/components/badge_settings_spec.js +++ b/spec/frontend/badges/components/badge_settings_spec.js @@ -1,10 +1,10 @@ -import Vuex from 'vuex'; -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { GlModal } from '@gitlab/ui'; -import store from '~/badges/store'; -import BadgeSettings from '~/badges/components/badge_settings.vue'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import BadgeList from '~/badges/components/badge_list.vue'; import BadgeListRow from '~/badges/components/badge_list_row.vue'; +import BadgeSettings from '~/badges/components/badge_settings.vue'; +import store from '~/badges/store'; import { createDummyBadge } from '../dummy_badge'; const localVue = createLocalVue(); diff --git a/spec/frontend/badges/store/actions_spec.js b/spec/frontend/badges/store/actions_spec.js index 52ae29affac..75699f24463 100644 --- a/spec/frontend/badges/store/actions_spec.js +++ b/spec/frontend/badges/store/actions_spec.js @@ -1,10 +1,10 @@ import MockAdapter from 'axios-mock-adapter'; -import { TEST_HOST } from 'spec/test_constants'; import testAction from 'helpers/vuex_action_helper'; -import axios from '~/lib/utils/axios_utils'; +import { TEST_HOST } from 'spec/test_constants'; import actions, { transformBackendBadge } from '~/badges/store/actions'; import mutationTypes from '~/badges/store/mutation_types'; import createState from '~/badges/store/state'; +import axios from '~/lib/utils/axios_utils'; import { createDummyBadge, createDummyBadgeResponse } from '../dummy_badge'; describe('Badges store actions', () => { diff --git a/spec/frontend/batch_comments/components/draft_note_spec.js b/spec/frontend/batch_comments/components/draft_note_spec.js index 9e56b8aeb36..c2d488a465e 100644 --- a/spec/frontend/batch_comments/components/draft_note_spec.js +++ b/spec/frontend/batch_comments/components/draft_note_spec.js @@ -1,5 +1,5 @@ -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { getByRole } from '@testing-library/dom'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; import DraftNote from '~/batch_comments/components/draft_note.vue'; import { createStore } from '~/batch_comments/stores'; import NoteableNote from '~/notes/components/noteable_note.vue'; diff --git a/spec/frontend/batch_comments/components/publish_dropdown_spec.js b/spec/frontend/batch_comments/components/publish_dropdown_spec.js index f235867f002..bd8091c20e0 100644 --- a/spec/frontend/batch_comments/components/publish_dropdown_spec.js +++ b/spec/frontend/batch_comments/components/publish_dropdown_spec.js @@ -1,6 +1,6 @@ -import Vuex from 'vuex'; -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { GlDropdown, GlDropdownItem } from '@gitlab/ui'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import PreviewDropdown from '~/batch_comments/components/preview_dropdown.vue'; import { createStore } from '~/mr_notes/stores'; import '~/behaviors/markdown/render_gfm'; diff --git a/spec/frontend/batch_comments/stores/modules/batch_comments/actions_spec.js b/spec/frontend/batch_comments/stores/modules/batch_comments/actions_spec.js index 3ad131de24e..885e02ef60f 100644 --- a/spec/frontend/batch_comments/stores/modules/batch_comments/actions_spec.js +++ b/spec/frontend/batch_comments/stores/modules/batch_comments/actions_spec.js @@ -1,6 +1,6 @@ import MockAdapter from 'axios-mock-adapter'; -import testAction from 'helpers/vuex_action_helper'; import { TEST_HOST } from 'helpers/test_constants'; +import testAction from 'helpers/vuex_action_helper'; import * as actions from '~/batch_comments/stores/modules/batch_comments/actions'; import axios from '~/lib/utils/axios_utils'; diff --git a/spec/frontend/batch_comments/stores/modules/batch_comments/mutations_spec.js b/spec/frontend/batch_comments/stores/modules/batch_comments/mutations_spec.js index 1406f66fd10..fe01de638c2 100644 --- a/spec/frontend/batch_comments/stores/modules/batch_comments/mutations_spec.js +++ b/spec/frontend/batch_comments/stores/modules/batch_comments/mutations_spec.js @@ -1,6 +1,6 @@ -import createState from '~/batch_comments/stores/modules/batch_comments/state'; -import mutations from '~/batch_comments/stores/modules/batch_comments/mutations'; import * as types from '~/batch_comments/stores/modules/batch_comments/mutation_types'; +import mutations from '~/batch_comments/stores/modules/batch_comments/mutations'; +import createState from '~/batch_comments/stores/modules/batch_comments/state'; describe('Batch comments mutations', () => { let state; diff --git a/spec/frontend/behaviors/copy_as_gfm_spec.js b/spec/frontend/behaviors/copy_as_gfm_spec.js index 16ea4ba8624..acff990e84a 100644 --- a/spec/frontend/behaviors/copy_as_gfm_spec.js +++ b/spec/frontend/behaviors/copy_as_gfm_spec.js @@ -1,5 +1,5 @@ -import * as commonUtils from '~/lib/utils/common_utils'; import initCopyAsGFM, { CopyAsGFM } from '~/behaviors/markdown/copy_as_gfm'; +import * as commonUtils from '~/lib/utils/common_utils'; describe('CopyAsGFM', () => { describe('CopyAsGFM.pasteGFM', () => { diff --git a/spec/frontend/behaviors/gl_emoji_spec.js b/spec/frontend/behaviors/gl_emoji_spec.js index 6e476d84501..286ed269421 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 'helpers/wait_for_promises'; -import axios from '~/lib/utils/axios_utils'; -import { initEmojiMap, EMOJI_VERSION } from '~/emoji'; import installGlEmojiElement from '~/behaviors/gl_emoji'; +import { initEmojiMap, EMOJI_VERSION } from '~/emoji'; import * as EmojiUnicodeSupport from '~/emoji/support'; +import axios from '~/lib/utils/axios_utils'; jest.mock('~/emoji/support'); diff --git a/spec/frontend/blob/balsamiq/balsamiq_viewer_spec.js b/spec/frontend/blob/balsamiq/balsamiq_viewer_spec.js index 09c49617bc5..d7531d15b9a 100644 --- a/spec/frontend/blob/balsamiq/balsamiq_viewer_spec.js +++ b/spec/frontend/blob/balsamiq/balsamiq_viewer_spec.js @@ -1,7 +1,7 @@ import sqljs from 'sql.js'; import ClassSpecHelper from 'helpers/class_spec_helper'; -import axios from '~/lib/utils/axios_utils'; import BalsamiqViewer from '~/blob/balsamiq/balsamiq_viewer'; +import axios from '~/lib/utils/axios_utils'; jest.mock('sql.js'); diff --git a/spec/frontend/blob/components/blob_content_error_spec.js b/spec/frontend/blob/components/blob_content_error_spec.js index 95686be8294..0f5885c2acf 100644 --- a/spec/frontend/blob/components/blob_content_error_spec.js +++ b/spec/frontend/blob/components/blob_content_error_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlSprintf } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import BlobContentError from '~/blob/components/blob_content_error.vue'; import { BLOB_RENDER_ERRORS } from '~/blob/components/constants'; diff --git a/spec/frontend/blob/components/blob_content_spec.js b/spec/frontend/blob/components/blob_content_spec.js index 44e2742745f..8450c6b9332 100644 --- a/spec/frontend/blob/components/blob_content_spec.js +++ b/spec/frontend/blob/components/blob_content_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import BlobContent from '~/blob/components/blob_content.vue'; import BlobContentError from '~/blob/components/blob_content_error.vue'; import { diff --git a/spec/frontend/blob/components/blob_edit_header_spec.js b/spec/frontend/blob/components/blob_edit_header_spec.js index 22e8e6d986c..ac3080c65a5 100644 --- a/spec/frontend/blob/components/blob_edit_header_spec.js +++ b/spec/frontend/blob/components/blob_edit_header_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlFormInput, GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import BlobEditHeader from '~/blob/components/blob_edit_header.vue'; describe('Blob Header Editing', () => { diff --git a/spec/frontend/blob/components/blob_header_default_actions_spec.js b/spec/frontend/blob/components/blob_header_default_actions_spec.js index e2c73a5d5d9..bce65899c43 100644 --- a/spec/frontend/blob/components/blob_header_default_actions_spec.js +++ b/spec/frontend/blob/components/blob_header_default_actions_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlButtonGroup, GlButton } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import BlobHeaderActions from '~/blob/components/blob_header_default_actions.vue'; import { BTN_COPY_CONTENTS_TITLE, diff --git a/spec/frontend/blob/components/blob_header_filepath_spec.js b/spec/frontend/blob/components/blob_header_filepath_spec.js index ed2d214c307..d935f73c0d1 100644 --- a/spec/frontend/blob/components/blob_header_filepath_spec.js +++ b/spec/frontend/blob/components/blob_header_filepath_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; import BlobHeaderFilepath from '~/blob/components/blob_header_filepath.vue'; -import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import { numberToHumanSize } from '~/lib/utils/number_utils'; +import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import { Blob as MockBlob } from './mock_data'; jest.mock('~/lib/utils/number_utils', () => ({ diff --git a/spec/frontend/blob/components/blob_header_spec.js b/spec/frontend/blob/components/blob_header_spec.js index b3f80183f6b..865e8ab1124 100644 --- a/spec/frontend/blob/components/blob_header_spec.js +++ b/spec/frontend/blob/components/blob_header_spec.js @@ -1,8 +1,8 @@ import { shallowMount, mount } from '@vue/test-utils'; import BlobHeader from '~/blob/components/blob_header.vue'; -import ViewerSwitcher from '~/blob/components/blob_header_viewer_switcher.vue'; import DefaultActions from '~/blob/components/blob_header_default_actions.vue'; import BlobFilepath from '~/blob/components/blob_header_filepath.vue'; +import ViewerSwitcher from '~/blob/components/blob_header_viewer_switcher.vue'; import { Blob } from './mock_data'; diff --git a/spec/frontend/blob/components/blob_header_viewer_switcher_spec.js b/spec/frontend/blob/components/blob_header_viewer_switcher_spec.js index cf1101bc22c..9a560ec11f7 100644 --- a/spec/frontend/blob/components/blob_header_viewer_switcher_spec.js +++ b/spec/frontend/blob/components/blob_header_viewer_switcher_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlButtonGroup, GlButton } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import BlobHeaderViewerSwitcher from '~/blob/components/blob_header_viewer_switcher.vue'; import { RICH_BLOB_VIEWER, diff --git a/spec/frontend/blob/notebook/notebook_viever_spec.js b/spec/frontend/blob/notebook/notebook_viever_spec.js index f6a926a5ecb..604104bb31f 100644 --- a/spec/frontend/blob/notebook/notebook_viever_spec.js +++ b/spec/frontend/blob/notebook/notebook_viever_spec.js @@ -1,9 +1,9 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import waitForPromises from 'helpers/wait_for_promises'; -import axios from '~/lib/utils/axios_utils'; import component from '~/blob/notebook/notebook_viewer.vue'; +import axios from '~/lib/utils/axios_utils'; import NotebookLab from '~/notebook/index.vue'; describe('iPython notebook renderer', () => { diff --git a/spec/frontend/blob/pdf/pdf_viewer_spec.js b/spec/frontend/blob/pdf/pdf_viewer_spec.js index 0eea3aea639..e332ea49fa6 100644 --- a/spec/frontend/blob/pdf/pdf_viewer_spec.js +++ b/spec/frontend/blob/pdf/pdf_viewer_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { FIXTURES_PATH } from 'spec/test_constants'; import component from '~/blob/pdf/pdf_viewer.vue'; diff --git a/spec/frontend/blob/pipeline_tour_success_modal_spec.js b/spec/frontend/blob/pipeline_tour_success_modal_spec.js index d4562019302..f4af57de41f 100644 --- a/spec/frontend/blob/pipeline_tour_success_modal_spec.js +++ b/spec/frontend/blob/pipeline_tour_success_modal_spec.js @@ -1,8 +1,8 @@ +import { GlSprintf, GlModal, GlLink } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import Cookies from 'js-cookie'; -import { GlSprintf, GlModal, GlLink } from '@gitlab/ui'; -import { mockTracking, triggerEvent, unmockTracking } from 'helpers/tracking_helper'; import { stubComponent } from 'helpers/stub_component'; +import { mockTracking, triggerEvent, unmockTracking } from 'helpers/tracking_helper'; import pipelineTourSuccess from '~/blob/pipeline_tour_success_modal.vue'; import modalProps from './pipeline_tour_success_mock_data'; diff --git a/spec/frontend/blob/suggest_gitlab_ci_yml/components/popover_spec.js b/spec/frontend/blob/suggest_gitlab_ci_yml/components/popover_spec.js index c3e32f24d7f..7e13994f2b7 100644 --- a/spec/frontend/blob/suggest_gitlab_ci_yml/components/popover_spec.js +++ b/spec/frontend/blob/suggest_gitlab_ci_yml/components/popover_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { mockTracking, unmockTracking, triggerEvent } from 'helpers/tracking_helper'; import Popover from '~/blob/suggest_gitlab_ci_yml/components/popover.vue'; import * as utils from '~/lib/utils/common_utils'; diff --git a/spec/frontend/blob/utils_spec.js b/spec/frontend/blob/utils_spec.js index fa83690c104..3ff2e47e0b6 100644 --- a/spec/frontend/blob/utils_spec.js +++ b/spec/frontend/blob/utils_spec.js @@ -1,5 +1,5 @@ -import Editor from '~/editor/editor_lite'; import * as utils from '~/blob/utils'; +import Editor from '~/editor/editor_lite'; jest.mock('~/editor/editor_lite'); diff --git a/spec/frontend/blob/viewer/index_spec.js b/spec/frontend/blob/viewer/index_spec.js index 4a5eb31602d..7449de48ec0 100644 --- a/spec/frontend/blob/viewer/index_spec.js +++ b/spec/frontend/blob/viewer/index_spec.js @@ -1,7 +1,7 @@ /* eslint-disable no-new */ -import $ from 'jquery'; import MockAdapter from 'axios-mock-adapter'; +import $ from 'jquery'; import { setTestTimeout } from 'helpers/timeout'; import BlobViewer from '~/blob/viewer/index'; import axios from '~/lib/utils/axios_utils'; diff --git a/spec/frontend/blob_edit/edit_blob_spec.js b/spec/frontend/blob_edit/edit_blob_spec.js index 7927c14d2ac..3134feedcf3 100644 --- a/spec/frontend/blob_edit/edit_blob_spec.js +++ b/spec/frontend/blob_edit/edit_blob_spec.js @@ -1,8 +1,8 @@ import waitForPromises from 'helpers/wait_for_promises'; import EditBlob from '~/blob_edit/edit_blob'; import EditorLite from '~/editor/editor_lite'; -import { EditorMarkdownExtension } from '~/editor/extensions/editor_markdown_ext'; import { FileTemplateExtension } from '~/editor/extensions/editor_file_template_ext'; +import { EditorMarkdownExtension } from '~/editor/extensions/editor_markdown_ext'; jest.mock('~/editor/editor_lite'); jest.mock('~/editor/extensions/editor_markdown_ext'); diff --git a/spec/frontend/boards/board_list_deprecated_spec.js b/spec/frontend/boards/board_list_deprecated_spec.js index d1c9d648c96..da3d24de1be 100644 --- a/spec/frontend/boards/board_list_deprecated_spec.js +++ b/spec/frontend/boards/board_list_deprecated_spec.js @@ -1,12 +1,12 @@ /* global List */ /* global ListIssue */ -import Vue from 'vue'; import MockAdapter from 'axios-mock-adapter'; +import Vue from 'vue'; import waitForPromises from 'helpers/wait_for_promises'; import axios from '~/lib/utils/axios_utils'; -import eventHub from '~/boards/eventhub'; import BoardList from '~/boards/components/board_list_deprecated.vue'; +import eventHub from '~/boards/eventhub'; import '~/boards/models/issue'; import '~/boards/models/list'; import store from '~/boards/stores'; diff --git a/spec/frontend/boards/board_list_helper.js b/spec/frontend/boards/board_list_helper.js index 7f0bad030fe..fc02262ea26 100644 --- a/spec/frontend/boards/board_list_helper.js +++ b/spec/frontend/boards/board_list_helper.js @@ -2,8 +2,8 @@ /* global ListIssue */ import MockAdapter from 'axios-mock-adapter'; -import Vue from 'vue'; import Sortable from 'sortablejs'; +import Vue from 'vue'; import axios from '~/lib/utils/axios_utils'; import BoardList from '~/boards/components/board_list_deprecated.vue'; diff --git a/spec/frontend/boards/board_list_spec.js b/spec/frontend/boards/board_list_spec.js index 05f4479959e..7ed20f20882 100644 --- a/spec/frontend/boards/board_list_spec.js +++ b/spec/frontend/boards/board_list_spec.js @@ -1,9 +1,9 @@ -import Vuex from 'vuex'; import { createLocalVue, mount } from '@vue/test-utils'; +import Vuex from 'vuex'; import { useFakeRequestAnimationFrame } from 'helpers/fake_request_animation_frame'; -import eventHub from '~/boards/eventhub'; -import BoardList from '~/boards/components/board_list.vue'; import BoardCard from '~/boards/components/board_card.vue'; +import BoardList from '~/boards/components/board_list.vue'; +import eventHub from '~/boards/eventhub'; import defaultState from '~/boards/stores/state'; import { mockList, mockIssuesByListId, issues, mockIssues } from './mock_data'; diff --git a/spec/frontend/boards/board_new_issue_deprecated_spec.js b/spec/frontend/boards/board_new_issue_deprecated_spec.js index 8236b468189..1a29f680166 100644 --- a/spec/frontend/boards/board_new_issue_deprecated_spec.js +++ b/spec/frontend/boards/board_new_issue_deprecated_spec.js @@ -1,11 +1,11 @@ /* global List */ -import Vue from 'vue'; import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; -import axios from '~/lib/utils/axios_utils'; +import Vue from 'vue'; import boardNewIssue from '~/boards/components/board_new_issue_deprecated.vue'; import boardsStore from '~/boards/stores/boards_store'; +import axios from '~/lib/utils/axios_utils'; import '~/boards/models/list'; import { listObj, boardsMockInterceptor } from './mock_data'; diff --git a/spec/frontend/boards/boards_store_spec.js b/spec/frontend/boards/boards_store_spec.js index b7a18c6c0ce..02881333273 100644 --- a/spec/frontend/boards/boards_store_spec.js +++ b/spec/frontend/boards/boards_store_spec.js @@ -1,11 +1,11 @@ import AxiosMockAdapter from 'axios-mock-adapter'; import { TEST_HOST } from 'helpers/test_constants'; -import axios from '~/lib/utils/axios_utils'; -import boardsStore from '~/boards/stores/boards_store'; import eventHub from '~/boards/eventhub'; import ListIssue from '~/boards/models/issue'; import List from '~/boards/models/list'; +import boardsStore from '~/boards/stores/boards_store'; +import axios from '~/lib/utils/axios_utils'; import { listObj, listObjDuplicate } from './mock_data'; jest.mock('js-cookie'); diff --git a/spec/frontend/boards/components/board_assignee_dropdown_spec.js b/spec/frontend/boards/components/board_assignee_dropdown_spec.js index 77d48c42d4b..629c2b3be83 100644 --- a/spec/frontend/boards/components/board_assignee_dropdown_spec.js +++ b/spec/frontend/boards/components/board_assignee_dropdown_spec.js @@ -1,4 +1,3 @@ -import { mount, createLocalVue } from '@vue/test-utils'; import { GlDropdownItem, GlAvatarLink, @@ -6,15 +5,16 @@ import { GlSearchBoxByType, GlLoadingIcon, } from '@gitlab/ui'; +import { mount, createLocalVue } from '@vue/test-utils'; import VueApollo from 'vue-apollo'; import createMockApollo from 'helpers/mock_apollo_helper'; import BoardAssigneeDropdown from '~/boards/components/board_assignee_dropdown.vue'; -import IssuableAssignees from '~/sidebar/components/assignees/issuable_assignees.vue'; -import MultiSelectDropdown from '~/vue_shared/components/sidebar/multiselect_dropdown.vue'; import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue'; +import searchUsers from '~/boards/graphql/users_search.query.graphql'; import store from '~/boards/stores'; +import IssuableAssignees from '~/sidebar/components/assignees/issuable_assignees.vue'; +import MultiSelectDropdown from '~/vue_shared/components/sidebar/multiselect_dropdown.vue'; import getIssueParticipants from '~/vue_shared/components/sidebar/queries/getIssueParticipants.query.graphql'; -import searchUsers from '~/boards/graphql/users_search.query.graphql'; import { participants } from '../mock_data'; const localVue = createLocalVue(); diff --git a/spec/frontend/boards/components/board_card_layout_deprecated_spec.js b/spec/frontend/boards/components/board_card_layout_deprecated_spec.js index 80f9c1a0545..426c5289ba6 100644 --- a/spec/frontend/boards/components/board_card_layout_deprecated_spec.js +++ b/spec/frontend/boards/components/board_card_layout_deprecated_spec.js @@ -1,21 +1,21 @@ /* global List */ /* global ListLabel */ -import Vuex from 'vuex'; import { createLocalVue, shallowMount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; +import Vuex from 'vuex'; import waitForPromises from 'helpers/wait_for_promises'; -import axios from '~/lib/utils/axios_utils'; import '~/boards/models/label'; import '~/boards/models/assignee'; import '~/boards/models/list'; -import boardsVuexStore from '~/boards/stores'; -import boardsStore from '~/boards/stores/boards_store'; import BoardCardLayout from '~/boards/components/board_card_layout_deprecated.vue'; import issueCardInner from '~/boards/components/issue_card_inner.vue'; import { ISSUABLE } from '~/boards/constants'; +import boardsVuexStore from '~/boards/stores'; +import boardsStore from '~/boards/stores/boards_store'; +import axios from '~/lib/utils/axios_utils'; import { listObj, boardsMockInterceptor, setMockEndpoints } from '../mock_data'; describe('Board card layout', () => { diff --git a/spec/frontend/boards/components/board_card_layout_spec.js b/spec/frontend/boards/components/board_card_layout_spec.js index 3ce3d0100f8..3fa8714807c 100644 --- a/spec/frontend/boards/components/board_card_layout_spec.js +++ b/spec/frontend/boards/components/board_card_layout_spec.js @@ -1,10 +1,10 @@ -import Vuex from 'vuex'; import { createLocalVue, shallowMount } from '@vue/test-utils'; +import Vuex from 'vuex'; -import defaultState from '~/boards/stores/state'; import BoardCardLayout from '~/boards/components/board_card_layout.vue'; import IssueCardInner from '~/boards/components/issue_card_inner.vue'; import { ISSUABLE } from '~/boards/constants'; +import defaultState from '~/boards/stores/state'; import { mockLabelList, mockIssue } from '../mock_data'; describe('Board card layout', () => { diff --git a/spec/frontend/boards/components/board_card_spec.js b/spec/frontend/boards/components/board_card_spec.js index 1084009caad..5f26ae1bb3b 100644 --- a/spec/frontend/boards/components/board_card_spec.js +++ b/spec/frontend/boards/components/board_card_spec.js @@ -6,17 +6,17 @@ import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import waitForPromises from 'helpers/wait_for_promises'; +import BoardCard from '~/boards/components/board_card.vue'; +import issueCardInner from '~/boards/components/issue_card_inner.vue'; +import eventHub from '~/boards/eventhub'; +import store from '~/boards/stores'; +import boardsStore from '~/boards/stores/boards_store'; import axios from '~/lib/utils/axios_utils'; -import eventHub from '~/boards/eventhub'; import sidebarEventHub from '~/sidebar/event_hub'; import '~/boards/models/label'; import '~/boards/models/assignee'; import '~/boards/models/list'; -import store from '~/boards/stores'; -import boardsStore from '~/boards/stores/boards_store'; -import BoardCard from '~/boards/components/board_card.vue'; -import issueCardInner from '~/boards/components/issue_card_inner.vue'; import userAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; import { listObj, boardsMockInterceptor, setMockEndpoints } from '../mock_data'; diff --git a/spec/frontend/boards/components/board_column_deprecated_spec.js b/spec/frontend/boards/components/board_column_deprecated_spec.js index a703caca4eb..4466e966302 100644 --- a/spec/frontend/boards/components/board_column_deprecated_spec.js +++ b/spec/frontend/boards/components/board_column_deprecated_spec.js @@ -1,12 +1,12 @@ -import Vue from 'vue'; import { shallowMount } from '@vue/test-utils'; import AxiosMockAdapter from 'axios-mock-adapter'; +import Vue from 'vue'; import { TEST_HOST } from 'helpers/test_constants'; import { listObj } from 'jest/boards/mock_data'; import Board from '~/boards/components/board_column_deprecated.vue'; -import List from '~/boards/models/list'; import { ListType } from '~/boards/constants'; +import List from '~/boards/models/list'; import axios from '~/lib/utils/axios_utils'; describe('Board Column Component', () => { diff --git a/spec/frontend/boards/components/board_content_spec.js b/spec/frontend/boards/components/board_content_spec.js index ef2795030a0..159b67ccc67 100644 --- a/spec/frontend/boards/components/board_content_spec.js +++ b/spec/frontend/boards/components/board_content_spec.js @@ -1,7 +1,7 @@ -import Vuex from 'vuex'; -import { createLocalVue, shallowMount } from '@vue/test-utils'; import { GlAlert } from '@gitlab/ui'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; import Draggable from 'vuedraggable'; +import Vuex from 'vuex'; import EpicsSwimlanes from 'ee_component/boards/components/epics_swimlanes.vue'; import getters from 'ee_else_ce/boards/stores/getters'; import BoardColumnDeprecated from '~/boards/components/board_column_deprecated.vue'; diff --git a/spec/frontend/boards/components/board_form_spec.js b/spec/frontend/boards/components/board_form_spec.js index 5324a95bcad..858efea99ad 100644 --- a/spec/frontend/boards/components/board_form_spec.js +++ b/spec/frontend/boards/components/board_form_spec.js @@ -1,16 +1,15 @@ -import { shallowMount } from '@vue/test-utils'; - import { GlModal } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; import waitForPromises from 'helpers/wait_for_promises'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; -import { visitUrl } from '~/lib/utils/url_utility'; -import { formType } from '~/boards/constants'; import BoardForm from '~/boards/components/board_form.vue'; -import updateBoardMutation from '~/boards/graphql/board_update.mutation.graphql'; +import { formType } from '~/boards/constants'; import createBoardMutation from '~/boards/graphql/board_create.mutation.graphql'; import destroyBoardMutation from '~/boards/graphql/board_destroy.mutation.graphql'; +import updateBoardMutation from '~/boards/graphql/board_update.mutation.graphql'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; +import { visitUrl } from '~/lib/utils/url_utility'; jest.mock('~/lib/utils/url_utility', () => ({ visitUrl: jest.fn().mockName('visitUrlMock'), diff --git a/spec/frontend/boards/components/board_list_header_deprecated_spec.js b/spec/frontend/boards/components/board_list_header_deprecated_spec.js index 15e767e9d91..fdc7cd2b1d4 100644 --- a/spec/frontend/boards/components/board_list_header_deprecated_spec.js +++ b/spec/frontend/boards/components/board_list_header_deprecated_spec.js @@ -1,12 +1,12 @@ -import Vue from 'vue'; import { shallowMount } from '@vue/test-utils'; import AxiosMockAdapter from 'axios-mock-adapter'; +import Vue from 'vue'; import { TEST_HOST } from 'helpers/test_constants'; import { listObj } from 'jest/boards/mock_data'; import BoardListHeader from '~/boards/components/board_list_header_deprecated.vue'; -import List from '~/boards/models/list'; import { ListType } from '~/boards/constants'; +import List from '~/boards/models/list'; import axios from '~/lib/utils/axios_utils'; describe('Board List Header Component', () => { diff --git a/spec/frontend/boards/components/board_list_header_spec.js b/spec/frontend/boards/components/board_list_header_spec.js index 6d8c9e51d3f..f30e3792435 100644 --- a/spec/frontend/boards/components/board_list_header_spec.js +++ b/spec/frontend/boards/components/board_list_header_spec.js @@ -1,5 +1,5 @@ -import Vuex from 'vuex'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import { mockLabelList } from 'jest/boards/mock_data'; import BoardListHeader from '~/boards/components/board_list_header.vue'; diff --git a/spec/frontend/boards/components/board_new_issue_spec.js b/spec/frontend/boards/components/board_new_issue_spec.js index 5a01221a5be..ce8c95527e9 100644 --- a/spec/frontend/boards/components/board_new_issue_spec.js +++ b/spec/frontend/boards/components/board_new_issue_spec.js @@ -1,5 +1,5 @@ -import Vuex from 'vuex'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import BoardNewIssue from '~/boards/components/board_new_issue.vue'; import '~/boards/models/list'; diff --git a/spec/frontend/boards/components/board_settings_sidebar_spec.js b/spec/frontend/boards/components/board_settings_sidebar_spec.js index 12c9431f2d4..52b4d71f7b9 100644 --- a/spec/frontend/boards/components/board_settings_sidebar_spec.js +++ b/spec/frontend/boards/components/board_settings_sidebar_spec.js @@ -1,14 +1,14 @@ import '~/boards/models/list'; -import MockAdapter from 'axios-mock-adapter'; +import { GlDrawer, GlLabel } from '@gitlab/ui'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; import axios from 'axios'; +import MockAdapter from 'axios-mock-adapter'; import Vuex from 'vuex'; -import { shallowMount, createLocalVue } from '@vue/test-utils'; -import { GlDrawer, GlLabel } from '@gitlab/ui'; import BoardSettingsSidebar from '~/boards/components/board_settings_sidebar.vue'; -import boardsStore from '~/boards/stores/boards_store'; +import { inactiveId, LIST } from '~/boards/constants'; import { createStore } from '~/boards/stores'; +import boardsStore from '~/boards/stores/boards_store'; import sidebarEventHub from '~/sidebar/event_hub'; -import { inactiveId, LIST } from '~/boards/constants'; const localVue = createLocalVue(); diff --git a/spec/frontend/boards/components/boards_selector_deprecated_spec.js b/spec/frontend/boards/components/boards_selector_deprecated_spec.js index 13492fa4882..cc078861d75 100644 --- a/spec/frontend/boards/components/boards_selector_deprecated_spec.js +++ b/spec/frontend/boards/components/boards_selector_deprecated_spec.js @@ -1,6 +1,6 @@ -import { nextTick } from 'vue'; -import { mount } from '@vue/test-utils'; import { GlDropdown, GlLoadingIcon, GlDropdownSectionHeader } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; +import { nextTick } from 'vue'; import { TEST_HOST } from 'spec/test_constants'; import BoardsSelector from '~/boards/components/boards_selector_deprecated.vue'; import boardsStore from '~/boards/stores/boards_store'; diff --git a/spec/frontend/boards/components/boards_selector_spec.js b/spec/frontend/boards/components/boards_selector_spec.js index 573984797db..bf317b51e83 100644 --- a/spec/frontend/boards/components/boards_selector_spec.js +++ b/spec/frontend/boards/components/boards_selector_spec.js @@ -1,10 +1,10 @@ -import { nextTick } from 'vue'; -import { mount } from '@vue/test-utils'; import { GlDropdown, GlLoadingIcon, GlDropdownSectionHeader } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; +import { nextTick } from 'vue'; import { TEST_HOST } from 'spec/test_constants'; -import axios from '~/lib/utils/axios_utils'; import BoardsSelector from '~/boards/components/boards_selector.vue'; +import axios from '~/lib/utils/axios_utils'; const throttleDuration = 1; diff --git a/spec/frontend/boards/components/issue_time_estimate_spec.js b/spec/frontend/boards/components/issue_time_estimate_spec.js index 9ac8fae3fcc..2e253d24125 100644 --- a/spec/frontend/boards/components/issue_time_estimate_spec.js +++ b/spec/frontend/boards/components/issue_time_estimate_spec.js @@ -1,5 +1,5 @@ -import { config as vueConfig } from 'vue'; import { shallowMount } from '@vue/test-utils'; +import { config as vueConfig } from 'vue'; import IssueTimeEstimate from '~/boards/components/issue_time_estimate.vue'; describe('Issue Time Estimate component', () => { diff --git a/spec/frontend/boards/components/sidebar/board_editable_item_spec.js b/spec/frontend/boards/components/sidebar/board_editable_item_spec.js index de414bb929e..12e9a9ba365 100644 --- a/spec/frontend/boards/components/sidebar/board_editable_item_spec.js +++ b/spec/frontend/boards/components/sidebar/board_editable_item_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import BoardSidebarItem from '~/boards/components/sidebar/board_editable_item.vue'; describe('boards sidebar remove issue', () => { diff --git a/spec/frontend/boards/components/sidebar/board_sidebar_due_date_spec.js b/spec/frontend/boards/components/sidebar/board_sidebar_due_date_spec.js index b034c8cb11d..7838b5a0b2f 100644 --- a/spec/frontend/boards/components/sidebar/board_sidebar_due_date_spec.js +++ b/spec/frontend/boards/components/sidebar/board_sidebar_due_date_spec.js @@ -1,7 +1,7 @@ -import { shallowMount } from '@vue/test-utils'; import { GlDatepicker } from '@gitlab/ui'; -import BoardSidebarDueDate from '~/boards/components/sidebar/board_sidebar_due_date.vue'; +import { shallowMount } from '@vue/test-utils'; import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue'; +import BoardSidebarDueDate from '~/boards/components/sidebar/board_sidebar_due_date.vue'; import { createStore } from '~/boards/stores'; import createFlash from '~/flash'; diff --git a/spec/frontend/boards/components/sidebar/board_sidebar_issue_title_spec.js b/spec/frontend/boards/components/sidebar/board_sidebar_issue_title_spec.js index 86895c648a4..bc7df1c76c6 100644 --- a/spec/frontend/boards/components/sidebar/board_sidebar_issue_title_spec.js +++ b/spec/frontend/boards/components/sidebar/board_sidebar_issue_title_spec.js @@ -1,9 +1,9 @@ -import { shallowMount } from '@vue/test-utils'; import { GlAlert, GlFormInput, GlForm } from '@gitlab/ui'; -import BoardSidebarIssueTitle from '~/boards/components/sidebar/board_sidebar_issue_title.vue'; +import { shallowMount } from '@vue/test-utils'; import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue'; -import createFlash from '~/flash'; +import BoardSidebarIssueTitle from '~/boards/components/sidebar/board_sidebar_issue_title.vue'; import { createStore } from '~/boards/stores'; +import createFlash from '~/flash'; const TEST_TITLE = 'New issue title'; const TEST_ISSUE_A = { diff --git a/spec/frontend/boards/components/sidebar/board_sidebar_labels_select_spec.js b/spec/frontend/boards/components/sidebar/board_sidebar_labels_select_spec.js index 2342caa9dfd..12b873ba7d8 100644 --- a/spec/frontend/boards/components/sidebar/board_sidebar_labels_select_spec.js +++ b/spec/frontend/boards/components/sidebar/board_sidebar_labels_select_spec.js @@ -1,12 +1,12 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLabel } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; import { labels as TEST_LABELS, mockIssue as TEST_ISSUE } from 'jest/boards/mock_data'; -import BoardSidebarLabelsSelect from '~/boards/components/sidebar/board_sidebar_labels_select.vue'; import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue'; -import { getIdFromGraphQLId } from '~/graphql_shared/utils'; +import BoardSidebarLabelsSelect from '~/boards/components/sidebar/board_sidebar_labels_select.vue'; import { createStore } from '~/boards/stores'; import createFlash from '~/flash'; +import { getIdFromGraphQLId } from '~/graphql_shared/utils'; jest.mock('~/flash'); diff --git a/spec/frontend/boards/components/sidebar/board_sidebar_milestone_select_spec.js b/spec/frontend/boards/components/sidebar/board_sidebar_milestone_select_spec.js index 820a70e84c0..8820ec7ae63 100644 --- a/spec/frontend/boards/components/sidebar/board_sidebar_milestone_select_spec.js +++ b/spec/frontend/boards/components/sidebar/board_sidebar_milestone_select_spec.js @@ -1,8 +1,8 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon, GlDropdown } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { mockMilestone as TEST_MILESTONE } from 'jest/boards/mock_data'; -import BoardSidebarMilestoneSelect from '~/boards/components/sidebar/board_sidebar_milestone_select.vue'; import BoardEditableItem from '~/boards/components/sidebar/board_editable_item.vue'; +import BoardSidebarMilestoneSelect from '~/boards/components/sidebar/board_sidebar_milestone_select.vue'; import { createStore } from '~/boards/stores'; import createFlash from '~/flash'; diff --git a/spec/frontend/boards/components/sidebar/board_sidebar_subscription_spec.js b/spec/frontend/boards/components/sidebar/board_sidebar_subscription_spec.js index 8e1285dcd07..3e6b0be0267 100644 --- a/spec/frontend/boards/components/sidebar/board_sidebar_subscription_spec.js +++ b/spec/frontend/boards/components/sidebar/board_sidebar_subscription_spec.js @@ -1,9 +1,9 @@ -import Vuex from 'vuex'; -import { mount, createLocalVue } from '@vue/test-utils'; import { GlToggle, GlLoadingIcon } from '@gitlab/ui'; +import { mount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import BoardSidebarSubscription from '~/boards/components/sidebar/board_sidebar_subscription.vue'; -import * as types from '~/boards/stores/mutation_types'; import { createStore } from '~/boards/stores'; +import * as types from '~/boards/stores/mutation_types'; import createFlash from '~/flash'; import { mockActiveIssue } from '../../mock_data'; diff --git a/spec/frontend/boards/components/sidebar/remove_issue_spec.js b/spec/frontend/boards/components/sidebar/remove_issue_spec.js index 1b7a78e6e58..1f740c10106 100644 --- a/spec/frontend/boards/components/sidebar/remove_issue_spec.js +++ b/spec/frontend/boards/components/sidebar/remove_issue_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import RemoveIssue from '~/boards/components/sidebar/remove_issue.vue'; diff --git a/spec/frontend/boards/issue_card_inner_spec.js b/spec/frontend/boards/issue_card_inner_spec.js index aa8f6b826b6..b9f84fed6b3 100644 --- a/spec/frontend/boards/issue_card_inner_spec.js +++ b/spec/frontend/boards/issue_card_inner_spec.js @@ -1,9 +1,9 @@ +import { GlLabel } from '@gitlab/ui'; import { mount } from '@vue/test-utils'; import { range } from 'lodash'; -import { GlLabel } from '@gitlab/ui'; import IssueCardInner from '~/boards/components/issue_card_inner.vue'; -import defaultStore from '~/boards/stores'; import eventHub from '~/boards/eventhub'; +import defaultStore from '~/boards/stores'; import { updateHistory } from '~/lib/utils/url_utility'; import { mockLabelList } from './mock_data'; diff --git a/spec/frontend/boards/mock_data.js b/spec/frontend/boards/mock_data.js index 6d60937f850..e106b9235d6 100644 --- a/spec/frontend/boards/mock_data.js +++ b/spec/frontend/boards/mock_data.js @@ -1,7 +1,7 @@ /* global List */ -import Vue from 'vue'; import { keyBy } from 'lodash'; +import Vue from 'vue'; import '~/boards/models/list'; import boardsStore from '~/boards/stores/boards_store'; diff --git a/spec/frontend/boards/project_select_deprecated_spec.js b/spec/frontend/boards/project_select_deprecated_spec.js index e4f8f96bd33..9042c4bf9ba 100644 --- a/spec/frontend/boards/project_select_deprecated_spec.js +++ b/spec/frontend/boards/project_select_deprecated_spec.js @@ -1,14 +1,13 @@ +import { GlDropdown, GlDropdownItem, GlSearchBoxByType, GlLoadingIcon } from '@gitlab/ui'; import { mount } from '@vue/test-utils'; import axios from 'axios'; import AxiosMockAdapter from 'axios-mock-adapter'; -import { GlDropdown, GlDropdownItem, GlSearchBoxByType, GlLoadingIcon } from '@gitlab/ui'; -import httpStatus from '~/lib/utils/http_status'; -import { featureAccessLevel } from '~/pages/projects/shared/permissions/constants'; +import ProjectSelect from '~/boards/components/project_select_deprecated.vue'; import { ListType } from '~/boards/constants'; import eventHub from '~/boards/eventhub'; import { deprecatedCreateFlash as flash } from '~/flash'; - -import ProjectSelect from '~/boards/components/project_select_deprecated.vue'; +import httpStatus from '~/lib/utils/http_status'; +import { featureAccessLevel } from '~/pages/projects/shared/permissions/constants'; import { listObj, mockRawGroupProjects } from './mock_data'; diff --git a/spec/frontend/boards/project_select_spec.js b/spec/frontend/boards/project_select_spec.js index 14ddab3542b..aa71952c42b 100644 --- a/spec/frontend/boards/project_select_spec.js +++ b/spec/frontend/boards/project_select_spec.js @@ -1,9 +1,8 @@ -import Vuex from 'vuex'; -import { createLocalVue, mount } from '@vue/test-utils'; import { GlDropdown, GlDropdownItem, GlSearchBoxByType, GlLoadingIcon } from '@gitlab/ui'; -import defaultState from '~/boards/stores/state'; - +import { createLocalVue, mount } from '@vue/test-utils'; +import Vuex from 'vuex'; import ProjectSelect from '~/boards/components/project_select.vue'; +import defaultState from '~/boards/stores/state'; import { mockList, mockGroupProjects } from './mock_data'; diff --git a/spec/frontend/boards/stores/actions_spec.js b/spec/frontend/boards/stores/actions_spec.js index 60bcbd1ec92..21c2356d5cb 100644 --- a/spec/frontend/boards/stores/actions_spec.js +++ b/spec/frontend/boards/stores/actions_spec.js @@ -1,18 +1,18 @@ import testAction from 'helpers/vuex_action_helper'; -import actions, { gqlClient } from '~/boards/stores/actions'; -import * as types from '~/boards/stores/mutation_types'; -import { inactiveId } from '~/boards/constants'; -import issueMoveListMutation from '~/boards/graphql/issue_move_list.mutation.graphql'; -import destroyBoardListMutation from '~/boards/graphql/board_list_destroy.mutation.graphql'; -import issueCreateMutation from '~/boards/graphql/issue_create.mutation.graphql'; -import updateAssignees from '~/vue_shared/components/sidebar/queries/updateAssignees.mutation.graphql'; import { fullBoardId, formatListIssues, formatBoardLists, formatIssueInput, } from '~/boards/boards_util'; +import { inactiveId } from '~/boards/constants'; +import destroyBoardListMutation from '~/boards/graphql/board_list_destroy.mutation.graphql'; +import issueCreateMutation from '~/boards/graphql/issue_create.mutation.graphql'; +import issueMoveListMutation from '~/boards/graphql/issue_move_list.mutation.graphql'; +import actions, { gqlClient } from '~/boards/stores/actions'; +import * as types from '~/boards/stores/mutation_types'; import createFlash from '~/flash'; +import updateAssignees from '~/vue_shared/components/sidebar/queries/updateAssignees.mutation.graphql'; import { mockLists, mockListsById, diff --git a/spec/frontend/boards/stores/getters_spec.js b/spec/frontend/boards/stores/getters_spec.js index 74d597b9046..d5a19bf613f 100644 --- a/spec/frontend/boards/stores/getters_spec.js +++ b/spec/frontend/boards/stores/getters_spec.js @@ -1,5 +1,5 @@ -import getters from '~/boards/stores/getters'; import { inactiveId } from '~/boards/constants'; +import getters from '~/boards/stores/getters'; import { mockIssue, mockIssue2, diff --git a/spec/frontend/boards/stores/mutations_spec.js b/spec/frontend/boards/stores/mutations_spec.js index 2b6548534c3..9423f2ed583 100644 --- a/spec/frontend/boards/stores/mutations_spec.js +++ b/spec/frontend/boards/stores/mutations_spec.js @@ -1,5 +1,5 @@ -import mutations from '~/boards/stores/mutations'; import * as types from '~/boards/stores/mutation_types'; +import mutations from '~/boards/stores/mutations'; import defaultState from '~/boards/stores/state'; import { mockLists, diff --git a/spec/frontend/branches/divergence_graph_spec.js b/spec/frontend/branches/divergence_graph_spec.js index adf39a2216a..be97a1724d3 100644 --- a/spec/frontend/branches/divergence_graph_spec.js +++ b/spec/frontend/branches/divergence_graph_spec.js @@ -1,6 +1,6 @@ import MockAdapter from 'axios-mock-adapter'; -import axios from '~/lib/utils/axios_utils'; import init from '~/branches/divergence_graph'; +import axios from '~/lib/utils/axios_utils'; describe('Divergence graph', () => { let mock; diff --git a/spec/frontend/ci_lint/components/ci_lint_spec.js b/spec/frontend/ci_lint/components/ci_lint_spec.js index 1c99fdb3505..8a065436da0 100644 --- a/spec/frontend/ci_lint/components/ci_lint_spec.js +++ b/spec/frontend/ci_lint/components/ci_lint_spec.js @@ -1,10 +1,10 @@ import { GlAlert } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import waitForPromises from 'helpers/wait_for_promises'; -import EditorLite from '~/vue_shared/components/editor_lite.vue'; import CiLint from '~/ci_lint/components/ci_lint.vue'; import CiLintResults from '~/pipeline_editor/components/lint/ci_lint_results.vue'; import lintCIMutation from '~/pipeline_editor/graphql/mutations/lint_ci.mutation.graphql'; +import EditorLite from '~/vue_shared/components/editor_lite.vue'; import { mockLintDataValid } from '../mock_data'; describe('CI Lint', () => { diff --git a/spec/frontend/ci_settings_pipeline_triggers/components/triggers_list_spec.js b/spec/frontend/ci_settings_pipeline_triggers/components/triggers_list_spec.js index 30aa634fc81..41af257ad89 100644 --- a/spec/frontend/ci_settings_pipeline_triggers/components/triggers_list_spec.js +++ b/spec/frontend/ci_settings_pipeline_triggers/components/triggers_list_spec.js @@ -1,9 +1,9 @@ -import { mount } from '@vue/test-utils'; import { GlTable, GlBadge } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; +import TriggersList from '~/ci_settings_pipeline_triggers/components/triggers_list.vue'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; -import TriggersList from '~/ci_settings_pipeline_triggers/components/triggers_list.vue'; import { triggers } from '../mock_data'; describe('TriggersList', () => { diff --git a/spec/frontend/ci_variable_list/components/ci_environments_dropdown_spec.js b/spec/frontend/ci_variable_list/components/ci_environments_dropdown_spec.js index faa88394447..75c6e8e4540 100644 --- a/spec/frontend/ci_variable_list/components/ci_environments_dropdown_spec.js +++ b/spec/frontend/ci_variable_list/components/ci_environments_dropdown_spec.js @@ -1,6 +1,6 @@ -import Vuex from 'vuex'; -import { mount, createLocalVue } from '@vue/test-utils'; import { GlDropdownItem, GlIcon } from '@gitlab/ui'; +import { mount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import CiEnvironmentsDropdown from '~/ci_variable_list/components/ci_environments_dropdown.vue'; const localVue = createLocalVue(); diff --git a/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js b/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js index b2e51029a06..991dc8592e9 100644 --- a/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js +++ b/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js @@ -1,8 +1,8 @@ -import Vuex from 'vuex'; -import { createLocalVue, shallowMount, mount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; -import { AWS_ACCESS_KEY_ID } from '~/ci_variable_list/constants'; +import { createLocalVue, shallowMount, mount } from '@vue/test-utils'; +import Vuex from 'vuex'; import CiVariableModal from '~/ci_variable_list/components/ci_variable_modal.vue'; +import { AWS_ACCESS_KEY_ID } from '~/ci_variable_list/constants'; import createStore from '~/ci_variable_list/store'; import mockData from '../services/mock_data'; import ModalStub from '../stubs'; diff --git a/spec/frontend/ci_variable_list/components/ci_variable_popover_spec.js b/spec/frontend/ci_variable_list/components/ci_variable_popover_spec.js index 5d37f059161..b43153d3d7c 100644 --- a/spec/frontend/ci_variable_list/components/ci_variable_popover_spec.js +++ b/spec/frontend/ci_variable_list/components/ci_variable_popover_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import CiVariablePopover from '~/ci_variable_list/components/ci_variable_popover.vue'; import mockData from '../services/mock_data'; diff --git a/spec/frontend/ci_variable_list/components/ci_variable_settings_spec.js b/spec/frontend/ci_variable_list/components/ci_variable_settings_spec.js index 12449fc7615..03f90f72d87 100644 --- a/spec/frontend/ci_variable_list/components/ci_variable_settings_spec.js +++ b/spec/frontend/ci_variable_list/components/ci_variable_settings_spec.js @@ -1,5 +1,5 @@ -import Vuex from 'vuex'; import { createLocalVue, shallowMount } from '@vue/test-utils'; +import Vuex from 'vuex'; import CiVariableSettings from '~/ci_variable_list/components/ci_variable_settings.vue'; import createStore from '~/ci_variable_list/store'; diff --git a/spec/frontend/ci_variable_list/components/ci_variable_table_spec.js b/spec/frontend/ci_variable_list/components/ci_variable_table_spec.js index fbc34528d4d..ade2d65b857 100644 --- a/spec/frontend/ci_variable_list/components/ci_variable_table_spec.js +++ b/spec/frontend/ci_variable_list/components/ci_variable_table_spec.js @@ -1,6 +1,6 @@ -import Vuex from 'vuex'; -import { createLocalVue, mount } from '@vue/test-utils'; import { GlTable } from '@gitlab/ui'; +import { createLocalVue, mount } from '@vue/test-utils'; +import Vuex from 'vuex'; import CiVariableTable from '~/ci_variable_list/components/ci_variable_table.vue'; import createStore from '~/ci_variable_list/store'; import mockData from '../services/mock_data'; diff --git a/spec/frontend/ci_variable_list/store/actions_spec.js b/spec/frontend/ci_variable_list/store/actions_spec.js index 03a2e37ed55..be3640936dc 100644 --- a/spec/frontend/ci_variable_list/store/actions_spec.js +++ b/spec/frontend/ci_variable_list/store/actions_spec.js @@ -1,12 +1,12 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; import Api from '~/api'; -import axios from '~/lib/utils/axios_utils'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; -import getInitialState from '~/ci_variable_list/store/state'; import * as actions from '~/ci_variable_list/store/actions'; import * as types from '~/ci_variable_list/store/mutation_types'; +import getInitialState from '~/ci_variable_list/store/state'; import { prepareDataForDisplay, prepareEnvironments } from '~/ci_variable_list/store/utils'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import mockData from '../services/mock_data'; jest.mock('~/api.js'); diff --git a/spec/frontend/ci_variable_list/store/mutations_spec.js b/spec/frontend/ci_variable_list/store/mutations_spec.js index a333fb7d8f9..ae750ff426d 100644 --- a/spec/frontend/ci_variable_list/store/mutations_spec.js +++ b/spec/frontend/ci_variable_list/store/mutations_spec.js @@ -1,6 +1,6 @@ -import state from '~/ci_variable_list/store/state'; -import mutations from '~/ci_variable_list/store/mutations'; import * as types from '~/ci_variable_list/store/mutation_types'; +import mutations from '~/ci_variable_list/store/mutations'; +import state from '~/ci_variable_list/store/state'; describe('CI variable list mutations', () => { let stateCopy; diff --git a/spec/frontend/clusters/components/application_row_spec.js b/spec/frontend/clusters/components/application_row_spec.js index 49a299cfb3c..eff3493d7bd 100644 --- a/spec/frontend/clusters/components/application_row_spec.js +++ b/spec/frontend/clusters/components/application_row_spec.js @@ -1,10 +1,10 @@ -import { shallowMount } from '@vue/test-utils'; import { GlSprintf } from '@gitlab/ui'; -import eventHub from '~/clusters/event_hub'; -import { APPLICATION_STATUS, ELASTIC_STACK } from '~/clusters/constants'; +import { shallowMount } from '@vue/test-utils'; import ApplicationRow from '~/clusters/components/application_row.vue'; import UninstallApplicationConfirmationModal from '~/clusters/components/uninstall_application_confirmation_modal.vue'; import UpdateApplicationConfirmationModal from '~/clusters/components/update_application_confirmation_modal.vue'; +import { APPLICATION_STATUS, ELASTIC_STACK } from '~/clusters/constants'; +import eventHub from '~/clusters/event_hub'; import { DEFAULT_APPLICATION_STATE } from '../services/mock_data'; diff --git a/spec/frontend/clusters/components/applications_spec.js b/spec/frontend/clusters/components/applications_spec.js index 78f08430554..db5915cb1eb 100644 --- a/spec/frontend/clusters/components/applications_spec.js +++ b/spec/frontend/clusters/components/applications_spec.js @@ -1,12 +1,12 @@ import { shallowMount, mount } from '@vue/test-utils'; -import Applications from '~/clusters/components/applications.vue'; -import { CLUSTER_TYPE, PROVIDER_TYPE } from '~/clusters/constants'; -import eventHub from '~/clusters/event_hub'; import ApplicationRow from '~/clusters/components/application_row.vue'; -import KnativeDomainEditor from '~/clusters/components/knative_domain_editor.vue'; +import Applications from '~/clusters/components/applications.vue'; import CrossplaneProviderStack from '~/clusters/components/crossplane_provider_stack.vue'; -import IngressModsecuritySettings from '~/clusters/components/ingress_modsecurity_settings.vue'; import FluentdOutputSettings from '~/clusters/components/fluentd_output_settings.vue'; +import IngressModsecuritySettings from '~/clusters/components/ingress_modsecurity_settings.vue'; +import KnativeDomainEditor from '~/clusters/components/knative_domain_editor.vue'; +import { CLUSTER_TYPE, PROVIDER_TYPE } from '~/clusters/constants'; +import eventHub from '~/clusters/event_hub'; import { APPLICATIONS_MOCK_STATE } from '../services/mock_data'; describe('Applications', () => { diff --git a/spec/frontend/clusters/components/fluentd_output_settings_spec.js b/spec/frontend/clusters/components/fluentd_output_settings_spec.js index cd996ae915b..2c6e5bbd46a 100644 --- a/spec/frontend/clusters/components/fluentd_output_settings_spec.js +++ b/spec/frontend/clusters/components/fluentd_output_settings_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlAlert, GlDropdown, GlFormCheckbox } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import FluentdOutputSettings from '~/clusters/components/fluentd_output_settings.vue'; import { APPLICATION_STATUS, FLUENTD } from '~/clusters/constants'; import eventHub from '~/clusters/event_hub'; diff --git a/spec/frontend/clusters/components/ingress_modsecurity_settings_spec.js b/spec/frontend/clusters/components/ingress_modsecurity_settings_spec.js index 1f07a0b7908..fd6d9854868 100644 --- a/spec/frontend/clusters/components/ingress_modsecurity_settings_spec.js +++ b/spec/frontend/clusters/components/ingress_modsecurity_settings_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlAlert, GlToggle, GlDropdown } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import IngressModsecuritySettings from '~/clusters/components/ingress_modsecurity_settings.vue'; import { APPLICATION_STATUS, INGRESS } from '~/clusters/constants'; import eventHub from '~/clusters/event_hub'; diff --git a/spec/frontend/clusters/components/knative_domain_editor_spec.js b/spec/frontend/clusters/components/knative_domain_editor_spec.js index b7f76211fd6..207eb071171 100644 --- a/spec/frontend/clusters/components/knative_domain_editor_spec.js +++ b/spec/frontend/clusters/components/knative_domain_editor_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlDropdownItem, GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import KnativeDomainEditor from '~/clusters/components/knative_domain_editor.vue'; import { APPLICATION_STATUS } from '~/clusters/constants'; diff --git a/spec/frontend/clusters/components/new_cluster_spec.js b/spec/frontend/clusters/components/new_cluster_spec.js index bb4898f98ba..e4bca5eaaa5 100644 --- a/spec/frontend/clusters/components/new_cluster_spec.js +++ b/spec/frontend/clusters/components/new_cluster_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLink, GlSprintf } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import NewCluster from '~/clusters/components/new_cluster.vue'; import createClusterStore from '~/clusters/stores/new_cluster'; diff --git a/spec/frontend/clusters/components/remove_cluster_confirmation_spec.js b/spec/frontend/clusters/components/remove_cluster_confirmation_spec.js index f448948843a..e2726b93ea5 100644 --- a/spec/frontend/clusters/components/remove_cluster_confirmation_spec.js +++ b/spec/frontend/clusters/components/remove_cluster_confirmation_spec.js @@ -1,7 +1,7 @@ -import { mount } from '@vue/test-utils'; import { GlModal } from '@gitlab/ui'; -import SplitButton from '~/vue_shared/components/split_button.vue'; +import { mount } from '@vue/test-utils'; import RemoveClusterConfirmation from '~/clusters/components/remove_cluster_confirmation.vue'; +import SplitButton from '~/vue_shared/components/split_button.vue'; describe('Remove cluster confirmation modal', () => { let wrapper; diff --git a/spec/frontend/clusters/components/uninstall_application_button_spec.js b/spec/frontend/clusters/components/uninstall_application_button_spec.js index c106292965e..2596820e5ac 100644 --- a/spec/frontend/clusters/components/uninstall_application_button_spec.js +++ b/spec/frontend/clusters/components/uninstall_application_button_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import UninstallApplicationButton from '~/clusters/components/uninstall_application_button.vue'; import { APPLICATION_STATUS } from '~/clusters/constants'; diff --git a/spec/frontend/clusters/components/uninstall_application_confirmation_modal_spec.js b/spec/frontend/clusters/components/uninstall_application_confirmation_modal_spec.js index c07f6851826..74ae4ecc486 100644 --- a/spec/frontend/clusters/components/uninstall_application_confirmation_modal_spec.js +++ b/spec/frontend/clusters/components/uninstall_application_confirmation_modal_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlModal } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import UninstallApplicationConfirmationModal from '~/clusters/components/uninstall_application_confirmation_modal.vue'; import { INGRESS } from '~/clusters/constants'; diff --git a/spec/frontend/clusters/components/update_application_confirmation_modal_spec.js b/spec/frontend/clusters/components/update_application_confirmation_modal_spec.js index dd3aaf6f946..e933f17a980 100644 --- a/spec/frontend/clusters/components/update_application_confirmation_modal_spec.js +++ b/spec/frontend/clusters/components/update_application_confirmation_modal_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlModal } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import UpdateApplicationConfirmationModal from '~/clusters/components/update_application_confirmation_modal.vue'; import { ELASTIC_STACK } from '~/clusters/constants'; diff --git a/spec/frontend/clusters/forms/components/integration_form_spec.js b/spec/frontend/clusters/forms/components/integration_form_spec.js index 3a3700eb0b7..0323245244d 100644 --- a/spec/frontend/clusters/forms/components/integration_form_spec.js +++ b/spec/frontend/clusters/forms/components/integration_form_spec.js @@ -1,6 +1,6 @@ -import Vuex from 'vuex'; -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { GlToggle, GlButton } from '@gitlab/ui'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import IntegrationForm from '~/clusters/forms/components/integration_form.vue'; import { createStore } from '~/clusters/forms/stores/index'; diff --git a/spec/frontend/clusters/services/application_state_machine_spec.js b/spec/frontend/clusters/services/application_state_machine_spec.js index a3850a64f3b..55230625ba4 100644 --- a/spec/frontend/clusters/services/application_state_machine_spec.js +++ b/spec/frontend/clusters/services/application_state_machine_spec.js @@ -1,10 +1,10 @@ -import transitionApplicationState from '~/clusters/services/application_state_machine'; import { APPLICATION_STATUS, UNINSTALL_EVENT, UPDATE_EVENT, INSTALL_EVENT, } from '~/clusters/constants'; +import transitionApplicationState from '~/clusters/services/application_state_machine'; const { NO_STATUS, diff --git a/spec/frontend/clusters/services/crossplane_provider_stack_spec.js b/spec/frontend/clusters/services/crossplane_provider_stack_spec.js index 3e5f8de8e7b..f95b175ca64 100644 --- a/spec/frontend/clusters/services/crossplane_provider_stack_spec.js +++ b/spec/frontend/clusters/services/crossplane_provider_stack_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlDropdownItem, GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import CrossplaneProviderStack from '~/clusters/components/crossplane_provider_stack.vue'; describe('CrossplaneProviderStack component', () => { diff --git a/spec/frontend/clusters/stores/clusters_store_spec.js b/spec/frontend/clusters/stores/clusters_store_spec.js index df10d9af273..c80949531c8 100644 --- a/spec/frontend/clusters/stores/clusters_store_spec.js +++ b/spec/frontend/clusters/stores/clusters_store_spec.js @@ -1,5 +1,5 @@ -import ClustersStore from '~/clusters/stores/clusters_store'; import { APPLICATION_INSTALLED_STATUSES, APPLICATION_STATUS, RUNNER } from '~/clusters/constants'; +import ClustersStore from '~/clusters/stores/clusters_store'; import { CLUSTERS_MOCK_DATA } from '../services/mock_data'; describe('Clusters Store', () => { diff --git a/spec/frontend/clusters_list/components/ancestor_notice_spec.js b/spec/frontend/clusters_list/components/ancestor_notice_spec.js index 79f917d4601..c7ee2a00f5b 100644 --- a/spec/frontend/clusters_list/components/ancestor_notice_spec.js +++ b/spec/frontend/clusters_list/components/ancestor_notice_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLink, GlSprintf, GlAlert } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import AncestorNotice from '~/clusters_list/components/ancestor_notice.vue'; import ClusterStore from '~/clusters_list/store'; diff --git a/spec/frontend/clusters_list/components/clusters_spec.js b/spec/frontend/clusters_list/components/clusters_spec.js index d61f79071d5..f398d7a0965 100644 --- a/spec/frontend/clusters_list/components/clusters_spec.js +++ b/spec/frontend/clusters_list/components/clusters_spec.js @@ -1,15 +1,15 @@ -import MockAdapter from 'axios-mock-adapter'; -import { mount } from '@vue/test-utils'; import { GlLoadingIcon, GlPagination, GlDeprecatedSkeletonLoading as GlSkeletonLoading, GlTable, } from '@gitlab/ui'; -import * as Sentry from '~/sentry/wrapper'; -import axios from '~/lib/utils/axios_utils'; +import { mount } from '@vue/test-utils'; +import MockAdapter from 'axios-mock-adapter'; import Clusters from '~/clusters_list/components/clusters.vue'; import ClusterStore from '~/clusters_list/store'; +import axios from '~/lib/utils/axios_utils'; +import * as Sentry from '~/sentry/wrapper'; import { apiData } from '../mock_data'; describe('Clusters', () => { diff --git a/spec/frontend/clusters_list/components/node_error_help_text_spec.js b/spec/frontend/clusters_list/components/node_error_help_text_spec.js index fa566c2dc57..18d27f3fd80 100644 --- a/spec/frontend/clusters_list/components/node_error_help_text_spec.js +++ b/spec/frontend/clusters_list/components/node_error_help_text_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlPopover } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import NodeErrorHelpText from '~/clusters_list/components/node_error_help_text.vue'; describe('NodeErrorHelpText', () => { diff --git a/spec/frontend/clusters_list/store/actions_spec.js b/spec/frontend/clusters_list/store/actions_spec.js index 60d6bb46e3c..00b998166aa 100644 --- a/spec/frontend/clusters_list/store/actions_spec.js +++ b/spec/frontend/clusters_list/store/actions_spec.js @@ -1,13 +1,13 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; import waitForPromises from 'helpers/wait_for_promises'; -import * as Sentry from '~/sentry/wrapper'; -import Poll from '~/lib/utils/poll'; -import { deprecatedCreateFlash as flashError } from '~/flash'; -import axios from '~/lib/utils/axios_utils'; import { MAX_REQUESTS } from '~/clusters_list/constants'; -import * as types from '~/clusters_list/store/mutation_types'; import * as actions from '~/clusters_list/store/actions'; +import * as types from '~/clusters_list/store/mutation_types'; +import { deprecatedCreateFlash as flashError } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; +import Poll from '~/lib/utils/poll'; +import * as Sentry from '~/sentry/wrapper'; import { apiData } from '../mock_data'; jest.mock('~/flash.js'); diff --git a/spec/frontend/clusters_list/store/mutations_spec.js b/spec/frontend/clusters_list/store/mutations_spec.js index 2ca1c20ad56..c0fe634a703 100644 --- a/spec/frontend/clusters_list/store/mutations_spec.js +++ b/spec/frontend/clusters_list/store/mutations_spec.js @@ -1,6 +1,6 @@ import * as types from '~/clusters_list/store/mutation_types'; -import getInitialState from '~/clusters_list/store/state'; import mutations from '~/clusters_list/store/mutations'; +import getInitialState from '~/clusters_list/store/state'; import { apiData } from '../mock_data'; describe('Admin statistics panel mutations', () => { diff --git a/spec/frontend/code_navigation/components/app_spec.js b/spec/frontend/code_navigation/components/app_spec.js index 6dfc81dcc40..ea389fa35c0 100644 --- a/spec/frontend/code_navigation/components/app_spec.js +++ b/spec/frontend/code_navigation/components/app_spec.js @@ -1,8 +1,8 @@ -import Vuex from 'vuex'; import { shallowMount, createLocalVue } from '@vue/test-utils'; -import createState from '~/code_navigation/store/state'; +import Vuex from 'vuex'; import App from '~/code_navigation/components/app.vue'; import Popover from '~/code_navigation/components/popover.vue'; +import createState from '~/code_navigation/store/state'; const localVue = createLocalVue(); const fetchData = jest.fn(); diff --git a/spec/frontend/code_navigation/components/popover_spec.js b/spec/frontend/code_navigation/components/popover_spec.js index 7b323cfab72..c038c04a0f8 100644 --- a/spec/frontend/code_navigation/components/popover_spec.js +++ b/spec/frontend/code_navigation/components/popover_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; -import Popover from '~/code_navigation/components/popover.vue'; import DocLine from '~/code_navigation/components/doc_line.vue'; +import Popover from '~/code_navigation/components/popover.vue'; const DEFINITION_PATH_PREFIX = 'http://gitlab.com'; diff --git a/spec/frontend/code_navigation/store/actions_spec.js b/spec/frontend/code_navigation/store/actions_spec.js index 39cf4acd5ce..73f935deeca 100644 --- a/spec/frontend/code_navigation/store/actions_spec.js +++ b/spec/frontend/code_navigation/store/actions_spec.js @@ -1,8 +1,8 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; import actions from '~/code_navigation/store/actions'; -import axios from '~/lib/utils/axios_utils'; import { setCurrentHoverElement, addInteractionClass } from '~/code_navigation/utils'; +import axios from '~/lib/utils/axios_utils'; jest.mock('~/code_navigation/utils'); diff --git a/spec/frontend/collapsed_sidebar_todo_spec.js b/spec/frontend/collapsed_sidebar_todo_spec.js index 52447939ac4..ef53cc9e103 100644 --- a/spec/frontend/collapsed_sidebar_todo_spec.js +++ b/spec/frontend/collapsed_sidebar_todo_spec.js @@ -1,8 +1,8 @@ /* eslint-disable no-new */ -import { clone } from 'lodash'; import MockAdapter from 'axios-mock-adapter'; -import { TEST_HOST } from 'spec/test_constants'; +import { clone } from 'lodash'; import waitForPromises from 'helpers/wait_for_promises'; +import { TEST_HOST } from 'spec/test_constants'; import axios from '~/lib/utils/axios_utils'; import Sidebar from '~/right_sidebar'; import { fixTitle } from '~/tooltips'; diff --git a/spec/frontend/commit/commit_pipeline_status_component_spec.js b/spec/frontend/commit/commit_pipeline_status_component_spec.js index 6e4368b5de8..2a2d51cf6b4 100644 --- a/spec/frontend/commit/commit_pipeline_status_component_spec.js +++ b/spec/frontend/commit/commit_pipeline_status_component_spec.js @@ -1,11 +1,11 @@ -import Visibility from 'visibilityjs'; import { GlLoadingIcon } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; +import Visibility from 'visibilityjs'; import { getJSONFixture } from 'helpers/fixtures'; -import Poll from '~/lib/utils/poll'; import { deprecatedCreateFlash as flash } from '~/flash'; -import CiIcon from '~/vue_shared/components/ci_icon.vue'; +import Poll from '~/lib/utils/poll'; import CommitPipelineStatus from '~/projects/tree/components/commit_pipeline_status_component.vue'; +import CiIcon from '~/vue_shared/components/ci_icon.vue'; jest.mock('~/lib/utils/poll'); jest.mock('visibilityjs'); diff --git a/spec/frontend/commit/pipelines/pipelines_spec.js b/spec/frontend/commit/pipelines/pipelines_spec.js index 15b1f224699..f8bdd00f5da 100644 --- a/spec/frontend/commit/pipelines/pipelines_spec.js +++ b/spec/frontend/commit/pipelines/pipelines_spec.js @@ -1,9 +1,9 @@ -import Vue from 'vue'; import MockAdapter from 'axios-mock-adapter'; +import Vue from 'vue'; import mountComponent from 'helpers/vue_mount_component_helper'; -import axios from '~/lib/utils/axios_utils'; import Api from '~/api'; import pipelinesTable from '~/commit/pipelines/pipelines_table.vue'; +import axios from '~/lib/utils/axios_utils'; describe('Pipelines table in Commits and Merge requests', () => { const jsonFixtureName = 'pipelines/pipelines.json'; diff --git a/spec/frontend/commits_spec.js b/spec/frontend/commits_spec.js index e1b947ddd0d..714ff4504a5 100644 --- a/spec/frontend/commits_spec.js +++ b/spec/frontend/commits_spec.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import 'vendor/jquery.endless-scroll'; import MockAdapter from 'axios-mock-adapter'; -import axios from '~/lib/utils/axios_utils'; import CommitsList from '~/commits'; +import axios from '~/lib/utils/axios_utils'; import Pager from '~/pager'; describe('Commits List', () => { diff --git a/spec/frontend/commons/nav/user_merge_requests_spec.js b/spec/frontend/commons/nav/user_merge_requests_spec.js index c441668f7c7..8f974051232 100644 --- a/spec/frontend/commons/nav/user_merge_requests_spec.js +++ b/spec/frontend/commons/nav/user_merge_requests_spec.js @@ -1,9 +1,9 @@ +import * as UserApi from '~/api/user_api'; import { openUserCountsBroadcast, closeUserCountsBroadcast, refreshUserMergeRequestCounts, } from '~/commons/nav/user_merge_requests'; -import * as UserApi from '~/api/user_api'; jest.mock('~/api'); diff --git a/spec/frontend/confidential_merge_request/components/dropdown_spec.js b/spec/frontend/confidential_merge_request/components/dropdown_spec.js index 401948e24e4..14a0b98a0d5 100644 --- a/spec/frontend/confidential_merge_request/components/dropdown_spec.js +++ b/spec/frontend/confidential_merge_request/components/dropdown_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlDropdown, GlDropdownItem } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import Dropdown from '~/confidential_merge_request/components/dropdown.vue'; let vm; diff --git a/spec/frontend/confidential_merge_request/components/project_form_group_spec.js b/spec/frontend/confidential_merge_request/components/project_form_group_spec.js index 975701ebd96..67f6d360f52 100644 --- a/spec/frontend/confidential_merge_request/components/project_form_group_spec.js +++ b/spec/frontend/confidential_merge_request/components/project_form_group_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; -import axios from '~/lib/utils/axios_utils'; import ProjectFormGroup from '~/confidential_merge_request/components/project_form_group.vue'; +import axios from '~/lib/utils/axios_utils'; const mockData = [ { diff --git a/spec/frontend/contributors/component/contributors_spec.js b/spec/frontend/contributors/component/contributors_spec.js index 24816e4e8ac..de55be4aa72 100644 --- a/spec/frontend/contributors/component/contributors_spec.js +++ b/spec/frontend/contributors/component/contributors_spec.js @@ -1,9 +1,9 @@ -import Vue from 'vue'; import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; +import Vue from 'vue'; +import ContributorsCharts from '~/contributors/components/contributors.vue'; import { createStore } from '~/contributors/stores'; import axios from '~/lib/utils/axios_utils'; -import ContributorsCharts from '~/contributors/components/contributors.vue'; let wrapper; let mock; diff --git a/spec/frontend/contributors/store/actions_spec.js b/spec/frontend/contributors/store/actions_spec.js index 7d2f93c4940..82b6492b779 100644 --- a/spec/frontend/contributors/store/actions_spec.js +++ b/spec/frontend/contributors/store/actions_spec.js @@ -1,9 +1,9 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; -import axios from '~/lib/utils/axios_utils'; -import { deprecatedCreateFlash as flashError } from '~/flash'; import * as actions from '~/contributors/stores/actions'; import * as types from '~/contributors/stores/mutation_types'; +import { deprecatedCreateFlash as flashError } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; jest.mock('~/flash.js'); diff --git a/spec/frontend/contributors/store/mutations_spec.js b/spec/frontend/contributors/store/mutations_spec.js index e9e756d4a65..e8da1a48c5c 100644 --- a/spec/frontend/contributors/store/mutations_spec.js +++ b/spec/frontend/contributors/store/mutations_spec.js @@ -1,6 +1,6 @@ -import state from '~/contributors/stores/state'; -import mutations from '~/contributors/stores/mutations'; import * as types from '~/contributors/stores/mutation_types'; +import mutations from '~/contributors/stores/mutations'; +import state from '~/contributors/stores/state'; describe('Contributors mutations', () => { let stateCopy; diff --git a/spec/frontend/create_cluster/components/cluster_form_dropdown_spec.js b/spec/frontend/create_cluster/components/cluster_form_dropdown_spec.js index 90c0e2d7827..0c6095e601f 100644 --- a/spec/frontend/create_cluster/components/cluster_form_dropdown_spec.js +++ b/spec/frontend/create_cluster/components/cluster_form_dropdown_spec.js @@ -1,7 +1,7 @@ +import { GlIcon } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import $ from 'jquery'; -import { GlIcon } from '@gitlab/ui'; import ClusterFormDropdown from '~/create_cluster/components/cluster_form_dropdown.vue'; import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue'; import DropdownSearchInput from '~/vue_shared/components/dropdown/dropdown_search_input.vue'; diff --git a/spec/frontend/create_cluster/eks_cluster/components/create_eks_cluster_spec.js b/spec/frontend/create_cluster/eks_cluster/components/create_eks_cluster_spec.js index e0913fe2e88..95810e882a1 100644 --- a/spec/frontend/create_cluster/eks_cluster/components/create_eks_cluster_spec.js +++ b/spec/frontend/create_cluster/eks_cluster/components/create_eks_cluster_spec.js @@ -1,5 +1,5 @@ -import Vuex from 'vuex'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import CreateEksCluster from '~/create_cluster/eks_cluster/components/create_eks_cluster.vue'; import EksClusterConfigurationForm from '~/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue'; diff --git a/spec/frontend/create_cluster/eks_cluster/components/eks_cluster_configuration_form_spec.js b/spec/frontend/create_cluster/eks_cluster/components/eks_cluster_configuration_form_spec.js index a4835f8c1c1..53a6f12c381 100644 --- a/spec/frontend/create_cluster/eks_cluster/components/eks_cluster_configuration_form_spec.js +++ b/spec/frontend/create_cluster/eks_cluster/components/eks_cluster_configuration_form_spec.js @@ -1,7 +1,7 @@ +import { GlFormCheckbox } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; -import Vuex from 'vuex'; import Vue from 'vue'; -import { GlFormCheckbox } from '@gitlab/ui'; +import Vuex from 'vuex'; import EksClusterConfigurationForm from '~/create_cluster/eks_cluster/components/eks_cluster_configuration_form.vue'; import eksClusterFormState from '~/create_cluster/eks_cluster/store/state'; diff --git a/spec/frontend/create_cluster/eks_cluster/components/service_credentials_form_spec.js b/spec/frontend/create_cluster/eks_cluster/components/service_credentials_form_spec.js index d2d6db31d1b..d866ffd4efb 100644 --- a/spec/frontend/create_cluster/eks_cluster/components/service_credentials_form_spec.js +++ b/spec/frontend/create_cluster/eks_cluster/components/service_credentials_form_spec.js @@ -1,6 +1,6 @@ -import Vuex from 'vuex'; -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import ServiceCredentialsForm from '~/create_cluster/eks_cluster/components/service_credentials_form.vue'; import eksClusterState from '~/create_cluster/eks_cluster/store/state'; diff --git a/spec/frontend/create_cluster/eks_cluster/services/aws_services_facade_spec.js b/spec/frontend/create_cluster/eks_cluster/services/aws_services_facade_spec.js index 2853d18e2cb..7b93b6d0a09 100644 --- a/spec/frontend/create_cluster/eks_cluster/services/aws_services_facade_spec.js +++ b/spec/frontend/create_cluster/eks_cluster/services/aws_services_facade_spec.js @@ -1,5 +1,5 @@ -import AWS from 'aws-sdk/global'; import EC2 from 'aws-sdk/clients/ec2'; +import AWS from 'aws-sdk/global'; import { setAWSConfig, fetchRoles, diff --git a/spec/frontend/create_cluster/eks_cluster/store/actions_spec.js b/spec/frontend/create_cluster/eks_cluster/store/actions_spec.js index fd5db1c6a29..f10cf4b4140 100644 --- a/spec/frontend/create_cluster/eks_cluster/store/actions_spec.js +++ b/spec/frontend/create_cluster/eks_cluster/store/actions_spec.js @@ -1,7 +1,7 @@ import MockAdapter from 'axios-mock-adapter'; -import testAction from 'helpers/vuex_action_helper'; import { useMockLocationHelper } from 'helpers/mock_window_location_helper'; -import createState from '~/create_cluster/eks_cluster/store/state'; +import testAction from 'helpers/vuex_action_helper'; +import { DEFAULT_REGION } from '~/create_cluster/eks_cluster/constants'; import * as actions from '~/create_cluster/eks_cluster/store/actions'; import { SET_CLUSTER_NAME, @@ -23,9 +23,9 @@ import { REQUEST_CREATE_CLUSTER, CREATE_CLUSTER_ERROR, } from '~/create_cluster/eks_cluster/store/mutation_types'; -import { DEFAULT_REGION } from '~/create_cluster/eks_cluster/constants'; -import axios from '~/lib/utils/axios_utils'; +import createState from '~/create_cluster/eks_cluster/store/state'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; jest.mock('~/flash'); diff --git a/spec/frontend/create_cluster/eks_cluster/store/mutations_spec.js b/spec/frontend/create_cluster/eks_cluster/store/mutations_spec.js index 633cea595d1..54d66e79be7 100644 --- a/spec/frontend/create_cluster/eks_cluster/store/mutations_spec.js +++ b/spec/frontend/create_cluster/eks_cluster/store/mutations_spec.js @@ -17,8 +17,8 @@ import { REQUEST_CREATE_CLUSTER, CREATE_CLUSTER_ERROR, } from '~/create_cluster/eks_cluster/store/mutation_types'; -import createState from '~/create_cluster/eks_cluster/store/state'; import mutations from '~/create_cluster/eks_cluster/store/mutations'; +import createState from '~/create_cluster/eks_cluster/store/state'; describe('Create EKS cluster store mutations', () => { let clusterName; diff --git a/spec/frontend/create_cluster/gke_cluster/components/gke_machine_type_dropdown_spec.js b/spec/frontend/create_cluster/gke_cluster/components/gke_machine_type_dropdown_spec.js index e97e0a6686d..8f4903dd91b 100644 --- a/spec/frontend/create_cluster/gke_cluster/components/gke_machine_type_dropdown_spec.js +++ b/spec/frontend/create_cluster/gke_cluster/components/gke_machine_type_dropdown_spec.js @@ -1,9 +1,9 @@ import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; +import GkeMachineTypeDropdown from '~/create_cluster/gke_cluster/components/gke_machine_type_dropdown.vue'; import createState from '~/create_cluster/gke_cluster/store/state'; import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue'; import DropdownHiddenInput from '~/vue_shared/components/dropdown/dropdown_hidden_input.vue'; -import GkeMachineTypeDropdown from '~/create_cluster/gke_cluster/components/gke_machine_type_dropdown.vue'; import { selectedMachineTypeMock, gapiMachineTypesResponseMock } from '../mock_data'; const componentConfig = { diff --git a/spec/frontend/create_cluster/gke_cluster/components/gke_network_dropdown_spec.js b/spec/frontend/create_cluster/gke_cluster/components/gke_network_dropdown_spec.js index ce24d186511..23a56766037 100644 --- a/spec/frontend/create_cluster/gke_cluster/components/gke_network_dropdown_spec.js +++ b/spec/frontend/create_cluster/gke_cluster/components/gke_network_dropdown_spec.js @@ -1,7 +1,7 @@ -import Vuex from 'vuex'; import { shallowMount, createLocalVue } from '@vue/test-utils'; -import GkeNetworkDropdown from '~/create_cluster/gke_cluster/components/gke_network_dropdown.vue'; +import Vuex from 'vuex'; import ClusterFormDropdown from '~/create_cluster/components/cluster_form_dropdown.vue'; +import GkeNetworkDropdown from '~/create_cluster/gke_cluster/components/gke_network_dropdown.vue'; import createClusterDropdownState from '~/create_cluster/store/cluster_dropdown/state'; const localVue = createLocalVue(); diff --git a/spec/frontend/create_cluster/gke_cluster/components/gke_project_id_dropdown_spec.js b/spec/frontend/create_cluster/gke_cluster/components/gke_project_id_dropdown_spec.js index 90f96c98427..b191b107609 100644 --- a/spec/frontend/create_cluster/gke_cluster/components/gke_project_id_dropdown_spec.js +++ b/spec/frontend/create_cluster/gke_cluster/components/gke_project_id_dropdown_spec.js @@ -1,7 +1,7 @@ import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import createState from '~/create_cluster/gke_cluster/store/state'; import GkeProjectIdDropdown from '~/create_cluster/gke_cluster/components/gke_project_id_dropdown.vue'; +import createState from '~/create_cluster/gke_cluster/store/state'; import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue'; import DropdownHiddenInput from '~/vue_shared/components/dropdown/dropdown_hidden_input.vue'; import { selectedProjectMock, gapiProjectsResponseMock } from '../mock_data'; diff --git a/spec/frontend/create_cluster/gke_cluster/components/gke_submit_button_spec.js b/spec/frontend/create_cluster/gke_cluster/components/gke_submit_button_spec.js index 9401ba83ef4..014ed6013bd 100644 --- a/spec/frontend/create_cluster/gke_cluster/components/gke_submit_button_spec.js +++ b/spec/frontend/create_cluster/gke_cluster/components/gke_submit_button_spec.js @@ -1,5 +1,5 @@ -import Vuex from 'vuex'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import GkeSubmitButton from '~/create_cluster/gke_cluster/components/gke_submit_button.vue'; const localVue = createLocalVue(); diff --git a/spec/frontend/create_cluster/gke_cluster/components/gke_subnetwork_dropdown_spec.js b/spec/frontend/create_cluster/gke_cluster/components/gke_subnetwork_dropdown_spec.js index 35e43d5b033..cfa8a678a9b 100644 --- a/spec/frontend/create_cluster/gke_cluster/components/gke_subnetwork_dropdown_spec.js +++ b/spec/frontend/create_cluster/gke_cluster/components/gke_subnetwork_dropdown_spec.js @@ -1,7 +1,7 @@ -import Vuex from 'vuex'; import { shallowMount, createLocalVue } from '@vue/test-utils'; -import GkeSubnetworkDropdown from '~/create_cluster/gke_cluster/components/gke_subnetwork_dropdown.vue'; +import Vuex from 'vuex'; import ClusterFormDropdown from '~/create_cluster/components/cluster_form_dropdown.vue'; +import GkeSubnetworkDropdown from '~/create_cluster/gke_cluster/components/gke_subnetwork_dropdown.vue'; import createClusterDropdownState from '~/create_cluster/store/cluster_dropdown/state'; const localVue = createLocalVue(); diff --git a/spec/frontend/create_cluster/gke_cluster/components/gke_zone_dropdown_spec.js b/spec/frontend/create_cluster/gke_cluster/components/gke_zone_dropdown_spec.js index c07e3f81964..4054b768e34 100644 --- a/spec/frontend/create_cluster/gke_cluster/components/gke_zone_dropdown_spec.js +++ b/spec/frontend/create_cluster/gke_cluster/components/gke_zone_dropdown_spec.js @@ -1,13 +1,13 @@ import { shallowMount } from '@vue/test-utils'; import GkeZoneDropdown from '~/create_cluster/gke_cluster/components/gke_zone_dropdown.vue'; -import DropdownHiddenInput from '~/vue_shared/components/dropdown/dropdown_hidden_input.vue'; -import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue'; import { createStore } from '~/create_cluster/gke_cluster/store'; import { SET_PROJECT, SET_ZONES, SET_PROJECT_BILLING_STATUS, } from '~/create_cluster/gke_cluster/store/mutation_types'; +import DropdownButton from '~/vue_shared/components/dropdown/dropdown_button.vue'; +import DropdownHiddenInput from '~/vue_shared/components/dropdown/dropdown_hidden_input.vue'; import { selectedZoneMock, selectedProjectMock, gapiZonesResponseMock } from '../mock_data'; const propsData = { diff --git a/spec/frontend/create_cluster/gke_cluster/stores/actions_spec.js b/spec/frontend/create_cluster/gke_cluster/stores/actions_spec.js index 8852baafec7..55c502b96bb 100644 --- a/spec/frontend/create_cluster/gke_cluster/stores/actions_spec.js +++ b/spec/frontend/create_cluster/gke_cluster/stores/actions_spec.js @@ -1,7 +1,7 @@ import testAction from 'helpers/vuex_action_helper'; -import createState from '~/create_cluster/gke_cluster/store/state'; -import * as types from '~/create_cluster/gke_cluster/store/mutation_types'; import * as actions from '~/create_cluster/gke_cluster/store/actions'; +import * as types from '~/create_cluster/gke_cluster/store/mutation_types'; +import createState from '~/create_cluster/gke_cluster/store/state'; import gapi from '../helpers'; import { selectedProjectMock, diff --git a/spec/frontend/create_cluster/gke_cluster/stores/mutations_spec.js b/spec/frontend/create_cluster/gke_cluster/stores/mutations_spec.js index 2a742b6ed8f..4493d49af43 100644 --- a/spec/frontend/create_cluster/gke_cluster/stores/mutations_spec.js +++ b/spec/frontend/create_cluster/gke_cluster/stores/mutations_spec.js @@ -1,6 +1,6 @@ -import createState from '~/create_cluster/gke_cluster/store/state'; import * as types from '~/create_cluster/gke_cluster/store/mutation_types'; import mutations from '~/create_cluster/gke_cluster/store/mutations'; +import createState from '~/create_cluster/gke_cluster/store/state'; import { gapiProjectsResponseMock, gapiZonesResponseMock, diff --git a/spec/frontend/create_cluster/init_create_cluster_spec.js b/spec/frontend/create_cluster/init_create_cluster_spec.js index 1fdcb57492d..42d1ceed864 100644 --- a/spec/frontend/create_cluster/init_create_cluster_spec.js +++ b/spec/frontend/create_cluster/init_create_cluster_spec.js @@ -1,6 +1,6 @@ -import initCreateCluster from '~/create_cluster/init_create_cluster'; import initGkeDropdowns from '~/create_cluster/gke_cluster'; import initGkeNamespace from '~/create_cluster/gke_cluster_namespace'; +import initCreateCluster from '~/create_cluster/init_create_cluster'; import PersistentUserCallout from '~/persistent_user_callout'; // This import is loaded dynamically in `init_create_cluster`. diff --git a/spec/frontend/create_cluster/store/cluster_dropdown/actions_spec.js b/spec/frontend/create_cluster/store/cluster_dropdown/actions_spec.js index 014b527161f..c0e8b11cf1e 100644 --- a/spec/frontend/create_cluster/store/cluster_dropdown/actions_spec.js +++ b/spec/frontend/create_cluster/store/cluster_dropdown/actions_spec.js @@ -1,8 +1,8 @@ import testAction from 'helpers/vuex_action_helper'; -import createState from '~/create_cluster/store/cluster_dropdown/state'; -import * as types from '~/create_cluster/store/cluster_dropdown/mutation_types'; import actionsFactory from '~/create_cluster/store/cluster_dropdown/actions'; +import * as types from '~/create_cluster/store/cluster_dropdown/mutation_types'; +import createState from '~/create_cluster/store/cluster_dropdown/state'; describe('Cluster dropdown Store Actions', () => { const items = [{ name: 'item 1' }]; diff --git a/spec/frontend/create_cluster/store/cluster_dropdown/mutations_spec.js b/spec/frontend/create_cluster/store/cluster_dropdown/mutations_spec.js index 4b700e31675..197fcfc2600 100644 --- a/spec/frontend/create_cluster/store/cluster_dropdown/mutations_spec.js +++ b/spec/frontend/create_cluster/store/cluster_dropdown/mutations_spec.js @@ -3,8 +3,8 @@ import { RECEIVE_ITEMS_SUCCESS, RECEIVE_ITEMS_ERROR, } from '~/create_cluster/store/cluster_dropdown/mutation_types'; -import createState from '~/create_cluster/store/cluster_dropdown/state'; import mutations from '~/create_cluster/store/cluster_dropdown/mutations'; +import createState from '~/create_cluster/store/cluster_dropdown/state'; describe('Cluster dropdown store mutations', () => { let state; diff --git a/spec/frontend/create_merge_request_dropdown_spec.js b/spec/frontend/create_merge_request_dropdown_spec.js index 698725b769d..08c05c6ec38 100644 --- a/spec/frontend/create_merge_request_dropdown_spec.js +++ b/spec/frontend/create_merge_request_dropdown_spec.js @@ -1,8 +1,8 @@ import MockAdapter from 'axios-mock-adapter'; import { TEST_HOST } from 'helpers/test_constants'; -import axios from '~/lib/utils/axios_utils'; -import CreateMergeRequestDropdown from '~/create_merge_request_dropdown'; import confidentialState from '~/confidential_merge_request/state'; +import CreateMergeRequestDropdown from '~/create_merge_request_dropdown'; +import axios from '~/lib/utils/axios_utils'; describe('CreateMergeRequestDropdown', () => { let axiosMock; diff --git a/spec/frontend/cycle_analytics/limit_warning_component_spec.js b/spec/frontend/cycle_analytics/limit_warning_component_spec.js index edde3725dd6..3dac7438909 100644 --- a/spec/frontend/cycle_analytics/limit_warning_component_spec.js +++ b/spec/frontend/cycle_analytics/limit_warning_component_spec.js @@ -1,7 +1,7 @@ -import Vue from 'vue'; import { shallowMount } from '@vue/test-utils'; -import Translate from '~/vue_shared/translate'; +import Vue from 'vue'; import LimitWarningComponent from '~/cycle_analytics/components/limit_warning_component.vue'; +import Translate from '~/vue_shared/translate'; Vue.use(Translate); diff --git a/spec/frontend/deploy_freeze/components/deploy_freeze_modal_spec.js b/spec/frontend/deploy_freeze/components/deploy_freeze_modal_spec.js index 650825d1cb7..d8ce184940a 100644 --- a/spec/frontend/deploy_freeze/components/deploy_freeze_modal_spec.js +++ b/spec/frontend/deploy_freeze/components/deploy_freeze_modal_spec.js @@ -1,9 +1,9 @@ -import Vuex from 'vuex'; -import { createLocalVue, shallowMount } from '@vue/test-utils'; import { GlButton, GlModal } from '@gitlab/ui'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; +import Vuex from 'vuex'; import DeployFreezeModal from '~/deploy_freeze/components/deploy_freeze_modal.vue'; -import TimezoneDropdown from '~/vue_shared/components/timezone_dropdown.vue'; import createStore from '~/deploy_freeze/store'; +import TimezoneDropdown from '~/vue_shared/components/timezone_dropdown.vue'; import { freezePeriodsFixture, timezoneDataFixture } from '../helpers'; const localVue = createLocalVue(); diff --git a/spec/frontend/deploy_freeze/components/deploy_freeze_settings_spec.js b/spec/frontend/deploy_freeze/components/deploy_freeze_settings_spec.js index c29a0c0ca73..392652292cf 100644 --- a/spec/frontend/deploy_freeze/components/deploy_freeze_settings_spec.js +++ b/spec/frontend/deploy_freeze/components/deploy_freeze_settings_spec.js @@ -1,8 +1,8 @@ -import Vuex from 'vuex'; import { createLocalVue, shallowMount } from '@vue/test-utils'; +import Vuex from 'vuex'; +import DeployFreezeModal from '~/deploy_freeze/components/deploy_freeze_modal.vue'; import DeployFreezeSettings from '~/deploy_freeze/components/deploy_freeze_settings.vue'; import DeployFreezeTable from '~/deploy_freeze/components/deploy_freeze_table.vue'; -import DeployFreezeModal from '~/deploy_freeze/components/deploy_freeze_modal.vue'; import createStore from '~/deploy_freeze/store'; import { timezoneDataFixture } from '../helpers'; diff --git a/spec/frontend/deploy_freeze/components/deploy_freeze_table_spec.js b/spec/frontend/deploy_freeze/components/deploy_freeze_table_spec.js index 3b8e8f8485e..e4ee1b9ad26 100644 --- a/spec/frontend/deploy_freeze/components/deploy_freeze_table_spec.js +++ b/spec/frontend/deploy_freeze/components/deploy_freeze_table_spec.js @@ -1,5 +1,5 @@ -import Vuex from 'vuex'; import { createLocalVue, mount } from '@vue/test-utils'; +import Vuex from 'vuex'; import DeployFreezeTable from '~/deploy_freeze/components/deploy_freeze_table.vue'; import createStore from '~/deploy_freeze/store'; import { freezePeriodsFixture, timezoneDataFixture } from '../helpers'; diff --git a/spec/frontend/deploy_freeze/components/timezone_dropdown_spec.js b/spec/frontend/deploy_freeze/components/timezone_dropdown_spec.js index 1b03cc03d02..4dd5c29a917 100644 --- a/spec/frontend/deploy_freeze/components/timezone_dropdown_spec.js +++ b/spec/frontend/deploy_freeze/components/timezone_dropdown_spec.js @@ -1,8 +1,8 @@ -import Vuex from 'vuex'; -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { GlDropdownItem, GlDropdown } from '@gitlab/ui'; -import TimezoneDropdown from '~/vue_shared/components/timezone_dropdown.vue'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import createStore from '~/deploy_freeze/store'; +import TimezoneDropdown from '~/vue_shared/components/timezone_dropdown.vue'; import { findTzByName, formatTz, timezoneDataFixture } from '../helpers'; const localVue = createLocalVue(); diff --git a/spec/frontend/deploy_freeze/store/actions_spec.js b/spec/frontend/deploy_freeze/store/actions_spec.js index 3c9d25c4f5c..f4d9802e39a 100644 --- a/spec/frontend/deploy_freeze/store/actions_spec.js +++ b/spec/frontend/deploy_freeze/store/actions_spec.js @@ -1,11 +1,11 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; import Api from '~/api'; -import axios from '~/lib/utils/axios_utils'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; -import getInitialState from '~/deploy_freeze/store/state'; import * as actions from '~/deploy_freeze/store/actions'; import * as types from '~/deploy_freeze/store/mutation_types'; +import getInitialState from '~/deploy_freeze/store/state'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { freezePeriodsFixture, timezoneDataFixture } from '../helpers'; jest.mock('~/api.js'); diff --git a/spec/frontend/deploy_freeze/store/mutations_spec.js b/spec/frontend/deploy_freeze/store/mutations_spec.js index 7cb208f16b2..54cbdfcb64c 100644 --- a/spec/frontend/deploy_freeze/store/mutations_spec.js +++ b/spec/frontend/deploy_freeze/store/mutations_spec.js @@ -1,6 +1,6 @@ -import state from '~/deploy_freeze/store/state'; -import mutations from '~/deploy_freeze/store/mutations'; import * as types from '~/deploy_freeze/store/mutation_types'; +import mutations from '~/deploy_freeze/store/mutations'; +import state from '~/deploy_freeze/store/state'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { findTzByName, formatTz, freezePeriodsFixture, timezoneDataFixture } from '../helpers'; diff --git a/spec/frontend/deploy_keys/components/action_btn_spec.js b/spec/frontend/deploy_keys/components/action_btn_spec.js index b8211b02464..21281ff15b1 100644 --- a/spec/frontend/deploy_keys/components/action_btn_spec.js +++ b/spec/frontend/deploy_keys/components/action_btn_spec.js @@ -1,7 +1,7 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; -import eventHub from '~/deploy_keys/eventhub'; +import { shallowMount } from '@vue/test-utils'; import actionBtn from '~/deploy_keys/components/action_btn.vue'; +import eventHub from '~/deploy_keys/eventhub'; describe('Deploy keys action btn', () => { const data = getJSONFixture('deploy_keys/keys.json'); diff --git a/spec/frontend/deploy_keys/components/app_spec.js b/spec/frontend/deploy_keys/components/app_spec.js index 479320f92f2..b48e0424580 100644 --- a/spec/frontend/deploy_keys/components/app_spec.js +++ b/spec/frontend/deploy_keys/components/app_spec.js @@ -1,10 +1,10 @@ import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; -import { TEST_HOST } from 'spec/test_constants'; import waitForPromises from 'helpers/wait_for_promises'; -import axios from '~/lib/utils/axios_utils'; -import eventHub from '~/deploy_keys/eventhub'; +import { TEST_HOST } from 'spec/test_constants'; import deployKeysApp from '~/deploy_keys/components/app.vue'; +import eventHub from '~/deploy_keys/eventhub'; +import axios from '~/lib/utils/axios_utils'; const TEST_ENDPOINT = `${TEST_HOST}/dummy/`; diff --git a/spec/frontend/deploy_keys/components/key_spec.js b/spec/frontend/deploy_keys/components/key_spec.js index f783fdd6476..5420f9a01f9 100644 --- a/spec/frontend/deploy_keys/components/key_spec.js +++ b/spec/frontend/deploy_keys/components/key_spec.js @@ -1,6 +1,6 @@ import { mount } from '@vue/test-utils'; -import DeployKeysStore from '~/deploy_keys/store'; import key from '~/deploy_keys/components/key.vue'; +import DeployKeysStore from '~/deploy_keys/store'; import { getTimeago } from '~/lib/utils/datetime_utility'; describe('Deploy keys key', () => { diff --git a/spec/frontend/deploy_keys/components/keys_panel_spec.js b/spec/frontend/deploy_keys/components/keys_panel_spec.js index 34b592017e9..d6419356166 100644 --- a/spec/frontend/deploy_keys/components/keys_panel_spec.js +++ b/spec/frontend/deploy_keys/components/keys_panel_spec.js @@ -1,6 +1,6 @@ import { mount } from '@vue/test-utils'; -import DeployKeysStore from '~/deploy_keys/store'; import deployKeysPanel from '~/deploy_keys/components/keys_panel.vue'; +import DeployKeysStore from '~/deploy_keys/store'; describe('Deploy keys panel', () => { const data = getJSONFixture('deploy_keys/keys.json'); diff --git a/spec/frontend/design_management/components/delete_button_spec.js b/spec/frontend/design_management/components/delete_button_spec.js index 961f5bdd2ae..8f7d8e0b214 100644 --- a/spec/frontend/design_management/components/delete_button_spec.js +++ b/spec/frontend/design_management/components/delete_button_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton, GlModal, GlModalDirective } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import BatchDeleteButton from '~/design_management/components/delete_button.vue'; describe('Batch delete button component', () => { diff --git a/spec/frontend/design_management/components/design_notes/design_discussion_spec.js b/spec/frontend/design_management/components/design_notes/design_discussion_spec.js index a414eb04ab4..92e188f4bcc 100644 --- a/spec/frontend/design_management/components/design_notes/design_discussion_spec.js +++ b/spec/frontend/design_management/components/design_notes/design_discussion_spec.js @@ -1,14 +1,14 @@ -import { mount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import DesignDiscussion from '~/design_management/components/design_notes/design_discussion.vue'; import DesignNote from '~/design_management/components/design_notes/design_note.vue'; import DesignReplyForm from '~/design_management/components/design_notes/design_reply_form.vue'; +import ToggleRepliesWidget from '~/design_management/components/design_notes/toggle_replies_widget.vue'; import createNoteMutation from '~/design_management/graphql/mutations/create_note.mutation.graphql'; import toggleResolveDiscussionMutation from '~/design_management/graphql/mutations/toggle_resolve_discussion.mutation.graphql'; import ReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vue'; -import ToggleRepliesWidget from '~/design_management/components/design_notes/toggle_replies_widget.vue'; -import notes from '../../mock_data/notes'; import mockDiscussion from '../../mock_data/discussion'; +import notes from '../../mock_data/notes'; const defaultMockDiscussion = { id: '0', diff --git a/spec/frontend/design_management/components/design_notes/design_note_spec.js b/spec/frontend/design_management/components/design_notes/design_note_spec.js index 043091e3dc2..1cd556eabb4 100644 --- a/spec/frontend/design_management/components/design_notes/design_note_spec.js +++ b/spec/frontend/design_management/components/design_notes/design_note_spec.js @@ -1,9 +1,9 @@ import { shallowMount } from '@vue/test-utils'; import { ApolloMutation } from 'vue-apollo'; import DesignNote from '~/design_management/components/design_notes/design_note.vue'; -import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; -import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import DesignReplyForm from '~/design_management/components/design_notes/design_reply_form.vue'; +import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; +import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; const scrollIntoViewMock = jest.fn(); const note = { diff --git a/spec/frontend/design_management/components/design_notes/toggle_replies_widget_spec.js b/spec/frontend/design_management/components/design_notes/toggle_replies_widget_spec.js index 7eda294d2d3..f87228663b6 100644 --- a/spec/frontend/design_management/components/design_notes/toggle_replies_widget_spec.js +++ b/spec/frontend/design_management/components/design_notes/toggle_replies_widget_spec.js @@ -1,7 +1,7 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon, GlButton, GlLink } from '@gitlab/ui'; -import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; +import { shallowMount } from '@vue/test-utils'; import ToggleRepliesWidget from '~/design_management/components/design_notes/toggle_replies_widget.vue'; +import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import notes from '../../mock_data/notes'; describe('Toggle replies widget component', () => { diff --git a/spec/frontend/design_management/components/design_overlay_spec.js b/spec/frontend/design_management/components/design_overlay_spec.js index ecb1fdbf534..d3119be7159 100644 --- a/spec/frontend/design_management/components/design_overlay_spec.js +++ b/spec/frontend/design_management/components/design_overlay_spec.js @@ -1,7 +1,7 @@ import { mount } from '@vue/test-utils'; import DesignOverlay from '~/design_management/components/design_overlay.vue'; -import updateActiveDiscussion from '~/design_management/graphql/mutations/update_active_discussion.mutation.graphql'; import { ACTIVE_DISCUSSION_SOURCE_TYPES } from '~/design_management/constants'; +import updateActiveDiscussion from '~/design_management/graphql/mutations/update_active_discussion.mutation.graphql'; import notes from '../mock_data/notes'; const mutate = jest.fn(() => Promise.resolve()); diff --git a/spec/frontend/design_management/components/design_presentation_spec.js b/spec/frontend/design_management/components/design_presentation_spec.js index 31fd154dc4b..edf8b965153 100644 --- a/spec/frontend/design_management/components/design_presentation_spec.js +++ b/spec/frontend/design_management/components/design_presentation_spec.js @@ -1,7 +1,7 @@ -import { nextTick } from 'vue'; import { shallowMount } from '@vue/test-utils'; -import DesignPresentation from '~/design_management/components/design_presentation.vue'; +import { nextTick } from 'vue'; import DesignOverlay from '~/design_management/components/design_overlay.vue'; +import DesignPresentation from '~/design_management/components/design_presentation.vue'; const mockOverlayData = { overlayDimensions: { diff --git a/spec/frontend/design_management/components/design_scaler_spec.js b/spec/frontend/design_management/components/design_scaler_spec.js index 40f53e8d0bf..8a123b2d1e5 100644 --- a/spec/frontend/design_management/components/design_scaler_spec.js +++ b/spec/frontend/design_management/components/design_scaler_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import DesignScaler from '~/design_management/components/design_scaler.vue'; describe('Design management design scaler component', () => { diff --git a/spec/frontend/design_management/components/design_sidebar_spec.js b/spec/frontend/design_management/components/design_sidebar_spec.js index 3d520ea721a..8eb993ec7b5 100644 --- a/spec/frontend/design_management/components/design_sidebar_spec.js +++ b/spec/frontend/design_management/components/design_sidebar_spec.js @@ -1,11 +1,11 @@ -import { shallowMount } from '@vue/test-utils'; import { GlCollapse, GlPopover } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import Cookies from 'js-cookie'; -import DesignSidebar from '~/design_management/components/design_sidebar.vue'; -import Participants from '~/sidebar/components/participants/participants.vue'; import DesignDiscussion from '~/design_management/components/design_notes/design_discussion.vue'; -import updateActiveDiscussionMutation from '~/design_management/graphql/mutations/update_active_discussion.mutation.graphql'; +import DesignSidebar from '~/design_management/components/design_sidebar.vue'; import DesignTodoButton from '~/design_management/components/design_todo_button.vue'; +import updateActiveDiscussionMutation from '~/design_management/graphql/mutations/update_active_discussion.mutation.graphql'; +import Participants from '~/sidebar/components/participants/participants.vue'; import design from '../mock_data/design'; const scrollIntoViewMock = jest.fn(); diff --git a/spec/frontend/design_management/components/design_todo_button_spec.js b/spec/frontend/design_management/components/design_todo_button_spec.js index 0c7516c55df..20686d0ae6c 100644 --- a/spec/frontend/design_management/components/design_todo_button_spec.js +++ b/spec/frontend/design_management/components/design_todo_button_spec.js @@ -1,8 +1,8 @@ import { shallowMount, mount } from '@vue/test-utils'; -import TodoButton from '~/vue_shared/components/todo_button.vue'; import DesignTodoButton from '~/design_management/components/design_todo_button.vue'; import createDesignTodoMutation from '~/design_management/graphql/mutations/create_design_todo.mutation.graphql'; import todoMarkDoneMutation from '~/graphql_shared/mutations/todo_mark_done.mutation.graphql'; +import TodoButton from '~/vue_shared/components/todo_button.vue'; import mockDesign from '../mock_data/design'; const mockDesignWithPendingTodos = { diff --git a/spec/frontend/design_management/components/image_spec.js b/spec/frontend/design_management/components/image_spec.js index 52d60b04a8a..765d902f9a6 100644 --- a/spec/frontend/design_management/components/image_spec.js +++ b/spec/frontend/design_management/components/image_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import DesignImage from '~/design_management/components/image.vue'; describe('Design management large image component', () => { diff --git a/spec/frontend/design_management/components/list/item_spec.js b/spec/frontend/design_management/components/list/item_spec.js index a89d05127c7..caf0f8bb5bc 100644 --- a/spec/frontend/design_management/components/list/item_spec.js +++ b/spec/frontend/design_management/components/list/item_spec.js @@ -1,5 +1,5 @@ -import { createLocalVue, shallowMount } from '@vue/test-utils'; import { GlIcon, GlLoadingIcon, GlIntersectionObserver } from '@gitlab/ui'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; import VueRouter from 'vue-router'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import Item from '~/design_management/components/list/item.vue'; diff --git a/spec/frontend/design_management/components/toolbar/index_spec.js b/spec/frontend/design_management/components/toolbar/index_spec.js index 6ac088a2c53..44c865d976d 100644 --- a/spec/frontend/design_management/components/toolbar/index_spec.js +++ b/spec/frontend/design_management/components/toolbar/index_spec.js @@ -1,8 +1,8 @@ +import { GlButton } from '@gitlab/ui'; import { createLocalVue, shallowMount } from '@vue/test-utils'; import VueRouter from 'vue-router'; -import { GlButton } from '@gitlab/ui'; -import Toolbar from '~/design_management/components/toolbar/index.vue'; import DeleteButton from '~/design_management/components/delete_button.vue'; +import Toolbar from '~/design_management/components/toolbar/index.vue'; import { DESIGNS_ROUTE_NAME } from '~/design_management/router/constants'; const localVue = createLocalVue(); diff --git a/spec/frontend/design_management/components/upload/button_spec.js b/spec/frontend/design_management/components/upload/button_spec.js index ea738496ad6..d123db43ce6 100644 --- a/spec/frontend/design_management/components/upload/button_spec.js +++ b/spec/frontend/design_management/components/upload/button_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import UploadButton from '~/design_management/components/upload/button.vue'; describe('Design management upload button component', () => { diff --git a/spec/frontend/design_management/components/upload/design_version_dropdown_spec.js b/spec/frontend/design_management/components/upload/design_version_dropdown_spec.js index d841aabf2f3..1b01a363688 100644 --- a/spec/frontend/design_management/components/upload/design_version_dropdown_spec.js +++ b/spec/frontend/design_management/components/upload/design_version_dropdown_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlDropdown, GlDropdownItem, GlSprintf } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import DesignVersionDropdown from '~/design_management/components/upload/design_version_dropdown.vue'; import mockAllVersions from './mock_data/all_versions'; diff --git a/spec/frontend/design_management/pages/design/index_spec.js b/spec/frontend/design_management/pages/design/index_spec.js index 63e1c712d6b..11c88c3d0f5 100644 --- a/spec/frontend/design_management/pages/design/index_spec.js +++ b/spec/frontend/design_management/pages/design/index_spec.js @@ -1,32 +1,32 @@ -import { shallowMount, createLocalVue } from '@vue/test-utils'; -import VueRouter from 'vue-router'; import { GlAlert } from '@gitlab/ui'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; import { ApolloMutation } from 'vue-apollo'; +import VueRouter from 'vue-router'; import { mockTracking, unmockTracking } from 'helpers/tracking_helper'; -import createFlash from '~/flash'; import Api from '~/api'; -import DesignIndex from '~/design_management/pages/design/index.vue'; -import DesignSidebar from '~/design_management/components/design_sidebar.vue'; import DesignPresentation from '~/design_management/components/design_presentation.vue'; +import DesignSidebar from '~/design_management/components/design_sidebar.vue'; +import { DESIGN_DETAIL_LAYOUT_CLASSLIST } from '~/design_management/constants'; import createImageDiffNoteMutation from '~/design_management/graphql/mutations/create_image_diff_note.mutation.graphql'; import updateActiveDiscussion from '~/design_management/graphql/mutations/update_active_discussion.mutation.graphql'; +import DesignIndex from '~/design_management/pages/design/index.vue'; +import createRouter from '~/design_management/router'; +import { DESIGNS_ROUTE_NAME, DESIGN_ROUTE_NAME } from '~/design_management/router/constants'; +import * as utils from '~/design_management/utils/design_management_utils'; import { DESIGN_NOT_FOUND_ERROR, DESIGN_VERSION_NOT_EXIST_ERROR, } from '~/design_management/utils/error_messages'; -import { DESIGNS_ROUTE_NAME, DESIGN_ROUTE_NAME } from '~/design_management/router/constants'; -import createRouter from '~/design_management/router'; -import * as utils from '~/design_management/utils/design_management_utils'; -import { DESIGN_DETAIL_LAYOUT_CLASSLIST } from '~/design_management/constants'; import { DESIGN_TRACKING_PAGE_NAME, DESIGN_SNOWPLOW_EVENT_TYPES, DESIGN_USAGE_PING_EVENT_TYPES, } from '~/design_management/utils/tracking'; +import createFlash from '~/flash'; +import mockAllVersions from '../../mock_data/all_versions'; import design from '../../mock_data/design'; import mockResponseWithDesigns from '../../mock_data/designs'; import mockResponseNoDesigns from '../../mock_data/no_designs'; -import mockAllVersions from '../../mock_data/all_versions'; jest.mock('~/flash'); jest.mock('~/api.js'); diff --git a/spec/frontend/design_management/pages/index_spec.js b/spec/frontend/design_management/pages/index_spec.js index 94d75f018f9..4f162ca8e7f 100644 --- a/spec/frontend/design_management/pages/index_spec.js +++ b/spec/frontend/design_management/pages/index_spec.js @@ -1,32 +1,32 @@ -import { nextTick } from 'vue'; +import { GlEmptyState } from '@gitlab/ui'; import { createLocalVue, shallowMount } from '@vue/test-utils'; +import { nextTick } from 'vue'; import VueApollo, { ApolloMutation } from 'vue-apollo'; -import VueDraggable from 'vuedraggable'; import VueRouter from 'vue-router'; -import { GlEmptyState } from '@gitlab/ui'; +import VueDraggable from 'vuedraggable'; import createMockApollo from 'helpers/mock_apollo_helper'; import { mockTracking, unmockTracking } from 'helpers/tracking_helper'; -import getDesignListQuery from 'shared_queries/design_management/get_design_list.query.graphql'; import permissionsQuery from 'shared_queries/design_management/design_permissions.query.graphql'; -import Index from '~/design_management/pages/index.vue'; -import uploadDesignMutation from '~/design_management/graphql/mutations/upload_design.mutation.graphql'; -import DesignDestroyer from '~/design_management/components/design_destroyer.vue'; -import DesignDropzone from '~/vue_shared/components/upload_dropzone/upload_dropzone.vue'; +import getDesignListQuery from 'shared_queries/design_management/get_design_list.query.graphql'; import DeleteButton from '~/design_management/components/delete_button.vue'; +import DesignDestroyer from '~/design_management/components/design_destroyer.vue'; import Design from '~/design_management/components/list/item.vue'; +import moveDesignMutation from '~/design_management/graphql/mutations/move_design.mutation.graphql'; +import uploadDesignMutation from '~/design_management/graphql/mutations/upload_design.mutation.graphql'; +import Index from '~/design_management/pages/index.vue'; +import createRouter from '~/design_management/router'; import { DESIGNS_ROUTE_NAME } from '~/design_management/router/constants'; +import * as utils from '~/design_management/utils/design_management_utils'; import { EXISTING_DESIGN_DROP_MANY_FILES_MESSAGE, EXISTING_DESIGN_DROP_INVALID_FILENAME_MESSAGE, } from '~/design_management/utils/error_messages'; -import createFlash from '~/flash'; -import createRouter from '~/design_management/router'; -import * as utils from '~/design_management/utils/design_management_utils'; -import moveDesignMutation from '~/design_management/graphql/mutations/move_design.mutation.graphql'; import { DESIGN_TRACKING_PAGE_NAME, DESIGN_SNOWPLOW_EVENT_TYPES, } from '~/design_management/utils/tracking'; +import createFlash from '~/flash'; +import DesignDropzone from '~/vue_shared/components/upload_dropzone/upload_dropzone.vue'; import { designListQueryResponse, designUploadMutationCreatedResponse, diff --git a/spec/frontend/design_management/router_spec.js b/spec/frontend/design_management/router_spec.js index 0b4e68eea78..ac5e6895408 100644 --- a/spec/frontend/design_management/router_spec.js +++ b/spec/frontend/design_management/router_spec.js @@ -2,8 +2,8 @@ import { mount, createLocalVue } from '@vue/test-utils'; import { nextTick } from 'vue'; import VueRouter from 'vue-router'; import App from '~/design_management/components/app.vue'; -import Designs from '~/design_management/pages/index.vue'; import DesignDetail from '~/design_management/pages/design/index.vue'; +import Designs from '~/design_management/pages/index.vue'; import createRouter from '~/design_management/router'; import { DESIGNS_ROUTE_NAME, DESIGN_ROUTE_NAME } from '~/design_management/router/constants'; import '~/commons/bootstrap'; diff --git a/spec/frontend/design_management/utils/design_management_utils_spec.js b/spec/frontend/design_management/utils/design_management_utils_spec.js index 368448ead10..5b7f99e9d96 100644 --- a/spec/frontend/design_management/utils/design_management_utils_spec.js +++ b/spec/frontend/design_management/utils/design_management_utils_spec.js @@ -8,9 +8,9 @@ import { extractDesign, extractDesignNoteId, } from '~/design_management/utils/design_management_utils'; -import mockResponseNoDesigns from '../mock_data/no_designs'; -import mockResponseWithDesigns from '../mock_data/designs'; import mockDesign from '../mock_data/design'; +import mockResponseWithDesigns from '../mock_data/designs'; +import mockResponseNoDesigns from '../mock_data/no_designs'; jest.mock('lodash/uniqueId', () => () => 1); diff --git a/spec/frontend/diffs/components/app_spec.js b/spec/frontend/diffs/components/app_spec.js index e84fa6fb0ae..d2b5338a0cc 100644 --- a/spec/frontend/diffs/components/app_spec.js +++ b/spec/frontend/diffs/components/app_spec.js @@ -1,26 +1,26 @@ -import Vue, { nextTick } from 'vue'; -import Vuex from 'vuex'; -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon, GlPagination } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import Mousetrap from 'mousetrap'; +import Vue, { nextTick } from 'vue'; +import Vuex from 'vuex'; import { TEST_HOST } from 'spec/test_constants'; import App from '~/diffs/components/app.vue'; -import NoChanges from '~/diffs/components/no_changes.vue'; -import DiffFile from '~/diffs/components/diff_file.vue'; -import CompareVersions from '~/diffs/components/compare_versions.vue'; -import HiddenFilesWarning from '~/diffs/components/hidden_files_warning.vue'; import CollapsedFilesWarning from '~/diffs/components/collapsed_files_warning.vue'; import CommitWidget from '~/diffs/components/commit_widget.vue'; +import CompareVersions from '~/diffs/components/compare_versions.vue'; +import DiffFile from '~/diffs/components/diff_file.vue'; +import HiddenFilesWarning from '~/diffs/components/hidden_files_warning.vue'; +import NoChanges from '~/diffs/components/no_changes.vue'; import TreeList from '~/diffs/components/tree_list.vue'; -import axios from '~/lib/utils/axios_utils'; -import * as urlUtils from '~/lib/utils/url_utility'; import { EVT_VIEW_FILE_BY_FILE } from '~/diffs/constants'; import eventHub from '~/diffs/event_hub'; -import diffsMockData from '../mock_data/merge_request_diffs'; +import axios from '~/lib/utils/axios_utils'; +import * as urlUtils from '~/lib/utils/url_utility'; import createDiffsStore from '../create_diffs_store'; +import diffsMockData from '../mock_data/merge_request_diffs'; const mergeRequestDiff = { version_index: 1 }; const TEST_ENDPOINT = `${TEST_HOST}/diff/endpoint`; diff --git a/spec/frontend/diffs/components/collapsed_files_warning_spec.js b/spec/frontend/diffs/components/collapsed_files_warning_spec.js index 75e76d88b6b..77c2e19cb68 100644 --- a/spec/frontend/diffs/components/collapsed_files_warning_spec.js +++ b/spec/frontend/diffs/components/collapsed_files_warning_spec.js @@ -1,9 +1,9 @@ -import Vuex from 'vuex'; import { shallowMount, mount, createLocalVue } from '@vue/test-utils'; -import createStore from '~/diffs/store/modules'; +import Vuex from 'vuex'; import CollapsedFilesWarning from '~/diffs/components/collapsed_files_warning.vue'; import { CENTERED_LIMITED_CONTAINER_CLASSES, EVT_EXPAND_ALL_FILES } from '~/diffs/constants'; import eventHub from '~/diffs/event_hub'; +import createStore from '~/diffs/store/modules'; const propsData = { limited: true, diff --git a/spec/frontend/diffs/components/commit_item_spec.js b/spec/frontend/diffs/components/commit_item_spec.js index f588f65dafd..8cb4fd20063 100644 --- a/spec/frontend/diffs/components/commit_item_spec.js +++ b/spec/frontend/diffs/components/commit_item_spec.js @@ -1,8 +1,8 @@ import { mount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; import { trimText } from 'helpers/text_helper'; -import { getTimeago } from '~/lib/utils/datetime_utility'; import Component from '~/diffs/components/commit_item.vue'; +import { getTimeago } from '~/lib/utils/datetime_utility'; import CommitPipelineStatus from '~/projects/tree/components/commit_pipeline_status_component.vue'; import getDiffWithCommit from '../mock_data/diff_with_commit'; diff --git a/spec/frontend/diffs/components/commit_widget_spec.js b/spec/frontend/diffs/components/commit_widget_spec.js index 54e7596b726..fbff473e4df 100644 --- a/spec/frontend/diffs/components/commit_widget_spec.js +++ b/spec/frontend/diffs/components/commit_widget_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; -import CommitWidget from '~/diffs/components/commit_widget.vue'; import CommitItem from '~/diffs/components/commit_item.vue'; +import CommitWidget from '~/diffs/components/commit_widget.vue'; describe('diffs/components/commit_widget', () => { let wrapper; diff --git a/spec/frontend/diffs/components/compare_dropdown_layout_spec.js b/spec/frontend/diffs/components/compare_dropdown_layout_spec.js index f050d924000..98f88226742 100644 --- a/spec/frontend/diffs/components/compare_dropdown_layout_spec.js +++ b/spec/frontend/diffs/components/compare_dropdown_layout_spec.js @@ -1,7 +1,7 @@ import { mount } from '@vue/test-utils'; import { trimText } from 'helpers/text_helper'; -import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; import CompareDropdownLayout from '~/diffs/components/compare_dropdown_layout.vue'; +import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; const TEST_COMMIT_TEXT = '1 commit'; const TEST_CREATED_AT = '2018-10-23T11:49:16.611Z'; diff --git a/spec/frontend/diffs/components/compare_versions_spec.js b/spec/frontend/diffs/components/compare_versions_spec.js index adb695b8a64..c93a3771ec0 100644 --- a/spec/frontend/diffs/components/compare_versions_spec.js +++ b/spec/frontend/diffs/components/compare_versions_spec.js @@ -3,8 +3,8 @@ import Vuex from 'vuex'; import { trimText } from 'helpers/text_helper'; import CompareVersionsComponent from '~/diffs/components/compare_versions.vue'; import { createStore } from '~/mr_notes/stores'; -import diffsMockData from '../mock_data/merge_request_diffs'; import getDiffWithCommit from '../mock_data/diff_with_commit'; +import diffsMockData from '../mock_data/merge_request_diffs'; const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/spec/frontend/diffs/components/diff_comment_cell_spec.js b/spec/frontend/diffs/components/diff_comment_cell_spec.js index d6b68fc52d7..b636a178593 100644 --- a/spec/frontend/diffs/components/diff_comment_cell_spec.js +++ b/spec/frontend/diffs/components/diff_comment_cell_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; import DiffCommentCell from '~/diffs/components/diff_comment_cell.vue'; -import DiffDiscussions from '~/diffs/components/diff_discussions.vue'; import DiffDiscussionReply from '~/diffs/components/diff_discussion_reply.vue'; +import DiffDiscussions from '~/diffs/components/diff_discussions.vue'; describe('DiffCommentCell', () => { const createWrapper = (props = {}) => { diff --git a/spec/frontend/diffs/components/diff_content_spec.js b/spec/frontend/diffs/components/diff_content_spec.js index 7b2b8996808..db4d69f0176 100644 --- a/spec/frontend/diffs/components/diff_content_spec.js +++ b/spec/frontend/diffs/components/diff_content_spec.js @@ -1,16 +1,16 @@ +import { GlLoadingIcon } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlLoadingIcon } from '@gitlab/ui'; import DiffContentComponent from '~/diffs/components/diff_content.vue'; +import DiffDiscussions from '~/diffs/components/diff_discussions.vue'; +import DiffView from '~/diffs/components/diff_view.vue'; import InlineDiffView from '~/diffs/components/inline_diff_view.vue'; -import NotDiffableViewer from '~/vue_shared/components/diff_viewer/viewers/not_diffable.vue'; -import NoPreviewViewer from '~/vue_shared/components/diff_viewer/viewers/no_preview.vue'; import ParallelDiffView from '~/diffs/components/parallel_diff_view.vue'; -import NoteForm from '~/notes/components/note_form.vue'; -import DiffDiscussions from '~/diffs/components/diff_discussions.vue'; import { IMAGE_DIFF_POSITION_TYPE } from '~/diffs/constants'; import { diffViewerModes } from '~/ide/constants'; -import DiffView from '~/diffs/components/diff_view.vue'; +import NoteForm from '~/notes/components/note_form.vue'; +import NoPreviewViewer from '~/vue_shared/components/diff_viewer/viewers/no_preview.vue'; +import NotDiffableViewer from '~/vue_shared/components/diff_viewer/viewers/not_diffable.vue'; import diffFileMockData from '../mock_data/diff_file'; const localVue = createLocalVue(); diff --git a/spec/frontend/diffs/components/diff_discussions_spec.js b/spec/frontend/diffs/components/diff_discussions_spec.js index 5c390054247..bd6f4cd2545 100644 --- a/spec/frontend/diffs/components/diff_discussions_spec.js +++ b/spec/frontend/diffs/components/diff_discussions_spec.js @@ -1,10 +1,10 @@ -import { mount, createLocalVue } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { mount, createLocalVue } from '@vue/test-utils'; import DiffDiscussions from '~/diffs/components/diff_discussions.vue'; -import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue'; -import NoteableDiscussion from '~/notes/components/noteable_discussion.vue'; -import DiscussionNotes from '~/notes/components/discussion_notes.vue'; import { createStore } from '~/mr_notes/stores'; +import DiscussionNotes from '~/notes/components/discussion_notes.vue'; +import NoteableDiscussion from '~/notes/components/noteable_discussion.vue'; +import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue'; import '~/behaviors/markdown/render_gfm'; import discussionsMockData from '../mock_data/diff_discussions'; diff --git a/spec/frontend/diffs/components/diff_expansion_cell_spec.js b/spec/frontend/diffs/components/diff_expansion_cell_spec.js index 62e85b31f76..f53f10d955d 100644 --- a/spec/frontend/diffs/components/diff_expansion_cell_spec.js +++ b/spec/frontend/diffs/components/diff_expansion_cell_spec.js @@ -1,10 +1,10 @@ -import { cloneDeep } from 'lodash'; -import { mount } from '@vue/test-utils'; import { getByText } from '@testing-library/dom'; -import { createStore } from '~/mr_notes/stores'; +import { mount } from '@vue/test-utils'; +import { cloneDeep } from 'lodash'; import DiffExpansionCell from '~/diffs/components/diff_expansion_cell.vue'; -import { getPreviousLineIndex } from '~/diffs/store/utils'; import { INLINE_DIFF_VIEW_TYPE } from '~/diffs/constants'; +import { getPreviousLineIndex } from '~/diffs/store/utils'; +import { createStore } from '~/mr_notes/stores'; import diffFileMockData from '../mock_data/diff_file'; const EXPAND_UP_CLASS = '.js-unfold'; diff --git a/spec/frontend/diffs/components/diff_file_header_spec.js b/spec/frontend/diffs/components/diff_file_header_spec.js index 5bd59055afc..b16ef8fe6b0 100644 --- a/spec/frontend/diffs/components/diff_file_header_spec.js +++ b/spec/frontend/diffs/components/diff_file_header_spec.js @@ -1,20 +1,20 @@ import { shallowMount, createLocalVue } from '@vue/test-utils'; -import Vuex from 'vuex'; import { cloneDeep } from 'lodash'; +import Vuex from 'vuex'; import { mockTracking, triggerEvent } from 'helpers/tracking_helper'; import DiffFileHeader from '~/diffs/components/diff_file_header.vue'; -import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; -import FileIcon from '~/vue_shared/components/file_icon.vue'; -import { truncateSha } from '~/lib/utils/text_utility'; +import { DIFF_FILE_AUTOMATIC_COLLAPSE, DIFF_FILE_MANUAL_COLLAPSE } from '~/diffs/constants'; +import { reviewFile } from '~/diffs/store/actions'; +import { SET_MR_FILE_REVIEWS } from '~/diffs/store/mutation_types'; import { diffViewerModes } from '~/ide/constants'; -import { __, sprintf } from '~/locale'; import { scrollToElement } from '~/lib/utils/common_utils'; +import { truncateSha } from '~/lib/utils/text_utility'; +import { __, sprintf } from '~/locale'; +import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; +import FileIcon from '~/vue_shared/components/file_icon.vue'; -import { SET_MR_FILE_REVIEWS } from '~/diffs/store/mutation_types'; -import { reviewFile } from '~/diffs/store/actions'; -import { DIFF_FILE_AUTOMATIC_COLLAPSE, DIFF_FILE_MANUAL_COLLAPSE } from '~/diffs/constants'; import testAction from '../../__helpers__/vuex_action_helper'; import diffDiscussionsMockData from '../mock_data/diff_discussions'; diff --git a/spec/frontend/diffs/components/diff_file_row_spec.js b/spec/frontend/diffs/components/diff_file_row_spec.js index 7403a7918a9..1d1c5fec293 100644 --- a/spec/frontend/diffs/components/diff_file_row_spec.js +++ b/spec/frontend/diffs/components/diff_file_row_spec.js @@ -1,8 +1,8 @@ import { shallowMount } from '@vue/test-utils'; import DiffFileRow from '~/diffs/components/diff_file_row.vue'; -import FileRow from '~/vue_shared/components/file_row.vue'; import FileRowStats from '~/diffs/components/file_row_stats.vue'; import ChangedFileIcon from '~/vue_shared/components/changed_file_icon.vue'; +import FileRow from '~/vue_shared/components/file_row.vue'; describe('Diff File Row component', () => { let wrapper; diff --git a/spec/frontend/diffs/components/diff_file_spec.js b/spec/frontend/diffs/components/diff_file_spec.js index a8a1c88b0cc..9c3c3e82ad5 100644 --- a/spec/frontend/diffs/components/diff_file_spec.js +++ b/spec/frontend/diffs/components/diff_file_spec.js @@ -1,26 +1,25 @@ -import Vuex from 'vuex'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; +import Vuex from 'vuex'; -import axios from '~/lib/utils/axios_utils'; -import httpStatus from '~/lib/utils/http_status'; -import createDiffsStore from '~/diffs/store/modules'; -import createNotesStore from '~/notes/stores/modules'; - +import DiffContentComponent from '~/diffs/components/diff_content.vue'; import DiffFileComponent from '~/diffs/components/diff_file.vue'; import DiffFileHeaderComponent from '~/diffs/components/diff_file_header.vue'; -import DiffContentComponent from '~/diffs/components/diff_content.vue'; -import eventHub from '~/diffs/event_hub'; import { EVT_EXPAND_ALL_FILES, EVT_PERF_MARK_DIFF_FILES_END, EVT_PERF_MARK_FIRST_DIFF_FILE_SHOWN, } from '~/diffs/constants'; +import eventHub from '~/diffs/event_hub'; +import createDiffsStore from '~/diffs/store/modules'; import { diffViewerModes, diffViewerErrors } from '~/ide/constants'; -import diffFileMockDataUnreadable from '../mock_data/diff_file_unreadable'; +import axios from '~/lib/utils/axios_utils'; +import httpStatus from '~/lib/utils/http_status'; +import createNotesStore from '~/notes/stores/modules'; import diffFileMockDataReadable from '../mock_data/diff_file'; +import diffFileMockDataUnreadable from '../mock_data/diff_file_unreadable'; function changeViewer(store, index, { automaticallyCollapsed, manuallyCollapsed, name }) { const file = store.state.diffs.diffFiles[index]; diff --git a/spec/frontend/diffs/components/diff_line_note_form_spec.js b/spec/frontend/diffs/components/diff_line_note_form_spec.js index 9ff80c635bb..a192f7e2e9a 100644 --- a/spec/frontend/diffs/components/diff_line_note_form_spec.js +++ b/spec/frontend/diffs/components/diff_line_note_form_spec.js @@ -1,9 +1,9 @@ import { shallowMount } from '@vue/test-utils'; import DiffLineNoteForm from '~/diffs/components/diff_line_note_form.vue'; -import NoteForm from '~/notes/components/note_form.vue'; import { createStore } from '~/mr_notes/stores'; -import diffFileMockData from '../mock_data/diff_file'; +import NoteForm from '~/notes/components/note_form.vue'; import { noteableDataMock } from '../../notes/mock_data'; +import diffFileMockData from '../mock_data/diff_file'; describe('DiffLineNoteForm', () => { let wrapper; diff --git a/spec/frontend/diffs/components/diff_row_spec.js b/spec/frontend/diffs/components/diff_row_spec.js index 0bfbbc16f07..5682b29d697 100644 --- a/spec/frontend/diffs/components/diff_row_spec.js +++ b/spec/frontend/diffs/components/diff_row_spec.js @@ -1,9 +1,9 @@ -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { getByTestId, fireEvent } from '@testing-library/dom'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import diffsModule from '~/diffs/store/modules'; import DiffRow from '~/diffs/components/diff_row.vue'; import { mapParallel } from '~/diffs/components/diff_row_utils'; +import diffsModule from '~/diffs/store/modules'; import diffFileMockData from '../mock_data/diff_file'; describe('DiffRow', () => { diff --git a/spec/frontend/diffs/components/diff_stats_spec.js b/spec/frontend/diffs/components/diff_stats_spec.js index 0aaec027c0a..504158fb7fc 100644 --- a/spec/frontend/diffs/components/diff_stats_spec.js +++ b/spec/frontend/diffs/components/diff_stats_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import DiffStats from '~/diffs/components/diff_stats.vue'; const TEST_ADDED_LINES = 100; diff --git a/spec/frontend/diffs/components/diff_view_spec.js b/spec/frontend/diffs/components/diff_view_spec.js index 3f8fc8e6afe..83b173c1f5d 100644 --- a/spec/frontend/diffs/components/diff_view_spec.js +++ b/spec/frontend/diffs/components/diff_view_spec.js @@ -1,5 +1,5 @@ -import Vue from 'vue'; import { shallowMount } from '@vue/test-utils'; +import Vue from 'vue'; import Vuex from 'vuex'; import DiffView from '~/diffs/components/diff_view.vue'; diff --git a/spec/frontend/diffs/components/image_diff_overlay_spec.js b/spec/frontend/diffs/components/image_diff_overlay_spec.js index 93c9b922fdd..47b144b2387 100644 --- a/spec/frontend/diffs/components/image_diff_overlay_spec.js +++ b/spec/frontend/diffs/components/image_diff_overlay_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import ImageDiffOverlay from '~/diffs/components/image_diff_overlay.vue'; import { createStore } from '~/mr_notes/stores'; import { imageDiffDiscussions } from '../mock_data/diff_discussions'; diff --git a/spec/frontend/diffs/components/inline_diff_table_row_spec.js b/spec/frontend/diffs/components/inline_diff_table_row_spec.js index 56a5306752f..7e6f75ad6f8 100644 --- a/spec/frontend/diffs/components/inline_diff_table_row_spec.js +++ b/spec/frontend/diffs/components/inline_diff_table_row_spec.js @@ -1,10 +1,10 @@ import { shallowMount } from '@vue/test-utils'; -import { createStore } from '~/mr_notes/stores'; -import InlineDiffTableRow from '~/diffs/components/inline_diff_table_row.vue'; import DiffGutterAvatars from '~/diffs/components/diff_gutter_avatars.vue'; import { mapInline } from '~/diffs/components/diff_row_utils'; -import diffFileMockData from '../mock_data/diff_file'; +import InlineDiffTableRow from '~/diffs/components/inline_diff_table_row.vue'; +import { createStore } from '~/mr_notes/stores'; import discussionsMockData from '../mock_data/diff_discussions'; +import diffFileMockData from '../mock_data/diff_file'; const TEST_USER_ID = 'abc123'; const TEST_USER = { id: TEST_USER_ID }; diff --git a/spec/frontend/diffs/components/inline_diff_view_spec.js b/spec/frontend/diffs/components/inline_diff_view_spec.js index 6a1791509fd..27834804f77 100644 --- a/spec/frontend/diffs/components/inline_diff_view_spec.js +++ b/spec/frontend/diffs/components/inline_diff_view_spec.js @@ -1,11 +1,11 @@ import '~/behaviors/markdown/render_gfm'; -import { mount } from '@vue/test-utils'; import { getByText } from '@testing-library/dom'; -import { createStore } from '~/mr_notes/stores'; -import InlineDiffView from '~/diffs/components/inline_diff_view.vue'; +import { mount } from '@vue/test-utils'; import { mapInline } from '~/diffs/components/diff_row_utils'; -import diffFileMockData from '../mock_data/diff_file'; +import InlineDiffView from '~/diffs/components/inline_diff_view.vue'; +import { createStore } from '~/mr_notes/stores'; import discussionsMockData from '../mock_data/diff_discussions'; +import diffFileMockData from '../mock_data/diff_file'; describe('InlineDiffView', () => { let wrapper; diff --git a/spec/frontend/diffs/components/no_changes_spec.js b/spec/frontend/diffs/components/no_changes_spec.js index df9af51f9cf..164c58dc8e4 100644 --- a/spec/frontend/diffs/components/no_changes_spec.js +++ b/spec/frontend/diffs/components/no_changes_spec.js @@ -1,8 +1,8 @@ +import { GlButton } from '@gitlab/ui'; import { createLocalVue, shallowMount, mount } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlButton } from '@gitlab/ui'; -import { createStore } from '~/mr_notes/stores'; import NoChanges from '~/diffs/components/no_changes.vue'; +import { createStore } from '~/mr_notes/stores'; import diffsMockData from '../mock_data/merge_request_diffs'; const localVue = createLocalVue(); diff --git a/spec/frontend/diffs/components/parallel_diff_table_row_spec.js b/spec/frontend/diffs/components/parallel_diff_table_row_spec.js index 51c4c4ae9d6..dbe8303077d 100644 --- a/spec/frontend/diffs/components/parallel_diff_table_row_spec.js +++ b/spec/frontend/diffs/components/parallel_diff_table_row_spec.js @@ -1,12 +1,12 @@ -import Vue from 'vue'; import { shallowMount } from '@vue/test-utils'; +import Vue from 'vue'; import { createComponentWithStore } from 'helpers/vue_mount_component_helper'; -import { createStore } from '~/mr_notes/stores'; -import ParallelDiffTableRow from '~/diffs/components/parallel_diff_table_row.vue'; -import { mapParallel } from '~/diffs/components/diff_row_utils'; import DiffGutterAvatars from '~/diffs/components/diff_gutter_avatars.vue'; -import diffFileMockData from '../mock_data/diff_file'; +import { mapParallel } from '~/diffs/components/diff_row_utils'; +import ParallelDiffTableRow from '~/diffs/components/parallel_diff_table_row.vue'; +import { createStore } from '~/mr_notes/stores'; import discussionsMockData from '../mock_data/diff_discussions'; +import diffFileMockData from '../mock_data/diff_file'; describe('ParallelDiffTableRow', () => { const mockDiffContent = { diff --git a/spec/frontend/diffs/components/parallel_diff_view_spec.js b/spec/frontend/diffs/components/parallel_diff_view_spec.js index 44ed303d0ef..452e1f58551 100644 --- a/spec/frontend/diffs/components/parallel_diff_view_spec.js +++ b/spec/frontend/diffs/components/parallel_diff_view_spec.js @@ -1,8 +1,8 @@ -import Vuex from 'vuex'; import { shallowMount, createLocalVue } from '@vue/test-utils'; -import { createStore } from '~/mr_notes/stores'; -import ParallelDiffView from '~/diffs/components/parallel_diff_view.vue'; +import Vuex from 'vuex'; import parallelDiffTableRow from '~/diffs/components/parallel_diff_table_row.vue'; +import ParallelDiffView from '~/diffs/components/parallel_diff_view.vue'; +import { createStore } from '~/mr_notes/stores'; import diffFileMockData from '../mock_data/diff_file'; let wrapper; diff --git a/spec/frontend/diffs/components/settings_dropdown_spec.js b/spec/frontend/diffs/components/settings_dropdown_spec.js index fcb627c570a..99fa83b64f1 100644 --- a/spec/frontend/diffs/components/settings_dropdown_spec.js +++ b/spec/frontend/diffs/components/settings_dropdown_spec.js @@ -1,6 +1,5 @@ import { mount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import diffModule from '~/diffs/store/modules'; import SettingsDropdown from '~/diffs/components/settings_dropdown.vue'; import { EVT_VIEW_FILE_BY_FILE, @@ -8,6 +7,7 @@ import { INLINE_DIFF_VIEW_TYPE, } from '~/diffs/constants'; import eventHub from '~/diffs/event_hub'; +import diffModule from '~/diffs/store/modules'; const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/spec/frontend/diffs/components/tree_list_spec.js b/spec/frontend/diffs/components/tree_list_spec.js index 4666321e0c2..f316a9fdf01 100644 --- a/spec/frontend/diffs/components/tree_list_spec.js +++ b/spec/frontend/diffs/components/tree_list_spec.js @@ -1,5 +1,5 @@ -import Vuex from 'vuex'; import { shallowMount, mount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import TreeList from '~/diffs/components/tree_list.vue'; import createStore from '~/diffs/store/modules'; import FileTree from '~/vue_shared/components/file_tree.vue'; diff --git a/spec/frontend/diffs/store/actions_spec.js b/spec/frontend/diffs/store/actions_spec.js index c204648337a..ed3210ecfaf 100644 --- a/spec/frontend/diffs/store/actions_spec.js +++ b/spec/frontend/diffs/store/actions_spec.js @@ -1,9 +1,9 @@ import MockAdapter from 'axios-mock-adapter'; import Cookies from 'js-cookie'; -import mockDiffFile from 'jest/diffs/mock_data/diff_file'; import { useLocalStorageSpy } from 'helpers/local_storage_helper'; import { TEST_HOST } from 'helpers/test_constants'; import testAction from 'helpers/vuex_action_helper'; +import mockDiffFile from 'jest/diffs/mock_data/diff_file'; import { DIFF_VIEW_COOKIE_NAME, INLINE_DIFF_VIEW_TYPE, @@ -52,13 +52,13 @@ import { setFileByFile, reviewFile, } from '~/diffs/store/actions'; -import eventHub from '~/notes/event_hub'; import * as types from '~/diffs/store/mutation_types'; -import axios from '~/lib/utils/axios_utils'; import * as utils from '~/diffs/store/utils'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import * as commonUtils from '~/lib/utils/common_utils'; import { mergeUrlParams } from '~/lib/utils/url_utility'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; +import eventHub from '~/notes/event_hub'; import { diffMetadata } from '../mock_data/diff_metadata'; jest.mock('~/flash'); diff --git a/spec/frontend/diffs/store/getters_spec.js b/spec/frontend/diffs/store/getters_spec.js index 56d6bc844c9..04606b48662 100644 --- a/spec/frontend/diffs/store/getters_spec.js +++ b/spec/frontend/diffs/store/getters_spec.js @@ -1,6 +1,6 @@ +import { PARALLEL_DIFF_VIEW_TYPE, INLINE_DIFF_VIEW_TYPE } from '~/diffs/constants'; import * as getters from '~/diffs/store/getters'; import state from '~/diffs/store/modules/diff_state'; -import { PARALLEL_DIFF_VIEW_TYPE, INLINE_DIFF_VIEW_TYPE } from '~/diffs/constants'; import discussion from '../mock_data/diff_discussions'; describe('Diffs Module Getters', () => { diff --git a/spec/frontend/diffs/store/getters_versions_dropdowns_spec.js b/spec/frontend/diffs/store/getters_versions_dropdowns_spec.js index f7954515422..dbef547c297 100644 --- a/spec/frontend/diffs/store/getters_versions_dropdowns_spec.js +++ b/spec/frontend/diffs/store/getters_versions_dropdowns_spec.js @@ -1,9 +1,9 @@ -import * as getters from '~/diffs/store/getters'; -import state from '~/diffs/store/modules/diff_state'; import { DIFF_COMPARE_BASE_VERSION_INDEX, DIFF_COMPARE_HEAD_VERSION_INDEX, } from '~/diffs/constants'; +import * as getters from '~/diffs/store/getters'; +import state from '~/diffs/store/modules/diff_state'; import diffsMockData from '../mock_data/merge_request_diffs'; describe('Compare diff version dropdowns', () => { diff --git a/spec/frontend/diffs/store/mutations_spec.js b/spec/frontend/diffs/store/mutations_spec.js index e0fefc4e053..a8ae759e693 100644 --- a/spec/frontend/diffs/store/mutations_spec.js +++ b/spec/frontend/diffs/store/mutations_spec.js @@ -1,7 +1,7 @@ +import { INLINE_DIFF_VIEW_TYPE, INLINE_DIFF_LINES_KEY } from '~/diffs/constants'; import createState from '~/diffs/store/modules/diff_state'; -import mutations from '~/diffs/store/mutations'; import * as types from '~/diffs/store/mutation_types'; -import { INLINE_DIFF_VIEW_TYPE, INLINE_DIFF_LINES_KEY } from '~/diffs/constants'; +import mutations from '~/diffs/store/mutations'; import * as utils from '~/diffs/store/utils'; import diffFileMockData from '../mock_data/diff_file'; diff --git a/spec/frontend/diffs/store/utils_spec.js b/spec/frontend/diffs/store/utils_spec.js index a19e5e91677..dcb58f7a380 100644 --- a/spec/frontend/diffs/store/utils_spec.js +++ b/spec/frontend/diffs/store/utils_spec.js @@ -1,5 +1,4 @@ import { clone } from 'lodash'; -import * as utils from '~/diffs/store/utils'; import { LINE_POSITION_LEFT, LINE_POSITION_RIGHT, @@ -12,10 +11,11 @@ import { INLINE_DIFF_VIEW_TYPE, INLINE_DIFF_LINES_KEY, } from '~/diffs/constants'; +import * as utils from '~/diffs/store/utils'; import { MERGE_REQUEST_NOTEABLE_TYPE } from '~/notes/constants'; +import { noteableDataMock } from '../../notes/mock_data'; import diffFileMockData from '../mock_data/diff_file'; import { diffMetadata } from '../mock_data/diff_metadata'; -import { noteableDataMock } from '../../notes/mock_data'; const getDiffFileMock = () => JSON.parse(JSON.stringify(diffFileMockData)); const getDiffMetadataMock = () => JSON.parse(JSON.stringify(diffMetadata)); diff --git a/spec/frontend/diffs/utils/preferences_spec.js b/spec/frontend/diffs/utils/preferences_spec.js index a48db1d7512..b09db2c1003 100644 --- a/spec/frontend/diffs/utils/preferences_spec.js +++ b/spec/frontend/diffs/utils/preferences_spec.js @@ -1,12 +1,11 @@ import Cookies from 'js-cookie'; -import { getParameterValues } from '~/lib/utils/url_utility'; - -import { fileByFile } from '~/diffs/utils/preferences'; import { DIFF_FILE_BY_FILE_COOKIE_NAME, DIFF_VIEW_FILE_BY_FILE, DIFF_VIEW_ALL_FILES, } from '~/diffs/constants'; +import { fileByFile } from '~/diffs/utils/preferences'; +import { getParameterValues } from '~/lib/utils/url_utility'; jest.mock('~/lib/utils/url_utility'); diff --git a/spec/frontend/dirty_submit/dirty_submit_factory_spec.js b/spec/frontend/dirty_submit/dirty_submit_factory_spec.js index 40843a68582..5822ccf861b 100644 --- a/spec/frontend/dirty_submit/dirty_submit_factory_spec.js +++ b/spec/frontend/dirty_submit/dirty_submit_factory_spec.js @@ -1,6 +1,6 @@ +import DirtySubmitCollection from '~/dirty_submit/dirty_submit_collection'; import dirtySubmitFactory from '~/dirty_submit/dirty_submit_factory'; import DirtySubmitForm from '~/dirty_submit/dirty_submit_form'; -import DirtySubmitCollection from '~/dirty_submit/dirty_submit_collection'; import { createForm } from './helper'; describe('DirtySubmitCollection', () => { diff --git a/spec/frontend/droplab/drop_down_spec.js b/spec/frontend/droplab/drop_down_spec.js index c1fbda6f211..dcdbbcd4ccf 100644 --- a/spec/frontend/droplab/drop_down_spec.js +++ b/spec/frontend/droplab/drop_down_spec.js @@ -1,6 +1,6 @@ +import { SELECTED_CLASS } from '~/droplab/constants'; import DropDown from '~/droplab/drop_down'; import utils from '~/droplab/utils'; -import { SELECTED_CLASS } from '~/droplab/constants'; describe('DropLab DropDown', () => { let testContext; diff --git a/spec/frontend/droplab/hook_spec.js b/spec/frontend/droplab/hook_spec.js index 11488cab521..0b897a570f6 100644 --- a/spec/frontend/droplab/hook_spec.js +++ b/spec/frontend/droplab/hook_spec.js @@ -1,5 +1,5 @@ -import Hook from '~/droplab/hook'; import DropDown from '~/droplab/drop_down'; +import Hook from '~/droplab/hook'; jest.mock('~/droplab/drop_down', () => jest.fn()); diff --git a/spec/frontend/droplab/plugins/ajax_filter_spec.js b/spec/frontend/droplab/plugins/ajax_filter_spec.js index d91884a60e5..d442d5cf416 100644 --- a/spec/frontend/droplab/plugins/ajax_filter_spec.js +++ b/spec/frontend/droplab/plugins/ajax_filter_spec.js @@ -1,5 +1,5 @@ -import AjaxCache from '~/lib/utils/ajax_cache'; import AjaxFilter from '~/droplab/plugins/ajax_filter'; +import AjaxCache from '~/lib/utils/ajax_cache'; describe('AjaxFilter', () => { let dummyConfig; diff --git a/spec/frontend/droplab/plugins/ajax_spec.js b/spec/frontend/droplab/plugins/ajax_spec.js index 1d7576ce420..7c6452e8337 100644 --- a/spec/frontend/droplab/plugins/ajax_spec.js +++ b/spec/frontend/droplab/plugins/ajax_spec.js @@ -1,5 +1,5 @@ -import AjaxCache from '~/lib/utils/ajax_cache'; import Ajax from '~/droplab/plugins/ajax'; +import AjaxCache from '~/lib/utils/ajax_cache'; describe('Ajax', () => { describe('preprocessing', () => { diff --git a/spec/frontend/dropzone_input_spec.js b/spec/frontend/dropzone_input_spec.js index 4cfc6478bd2..5e6ccbd7cda 100644 --- a/spec/frontend/dropzone_input_spec.js +++ b/spec/frontend/dropzone_input_spec.js @@ -1,9 +1,9 @@ import $ from 'jquery'; import mock from 'xhr-mock'; -import { TEST_HOST } from 'spec/test_constants'; import waitForPromises from 'helpers/wait_for_promises'; -import dropzoneInput from '~/dropzone_input'; +import { TEST_HOST } from 'spec/test_constants'; import PasteMarkdownTable from '~/behaviors/markdown/paste_markdown_table'; +import dropzoneInput from '~/dropzone_input'; const TEST_FILE = new File([], 'somefile.jpg'); TEST_FILE.upload = {}; diff --git a/spec/frontend/editor/editor_ci_schema_ext_spec.js b/spec/frontend/editor/editor_ci_schema_ext_spec.js index 9dd88aad7e6..17a9ae7335f 100644 --- a/spec/frontend/editor/editor_ci_schema_ext_spec.js +++ b/spec/frontend/editor/editor_ci_schema_ext_spec.js @@ -1,8 +1,8 @@ import { languages } from 'monaco-editor'; import { TEST_HOST } from 'helpers/test_constants'; +import { EXTENSION_CI_SCHEMA_FILE_NAME_MATCH } from '~/editor/constants'; import EditorLite from '~/editor/editor_lite'; import { CiSchemaExtension } from '~/editor/extensions/editor_ci_schema_ext'; -import { EXTENSION_CI_SCHEMA_FILE_NAME_MATCH } from '~/editor/constants'; describe('~/editor/editor_ci_config_ext', () => { const defaultBlobPath = '.gitlab-ci.yml'; diff --git a/spec/frontend/editor/editor_lite_spec.js b/spec/frontend/editor/editor_lite_spec.js index 20937bc7063..815457e012f 100644 --- a/spec/frontend/editor/editor_lite_spec.js +++ b/spec/frontend/editor/editor_lite_spec.js @@ -1,15 +1,15 @@ /* eslint-disable max-classes-per-file */ import { editor as monacoEditor, languages as monacoLanguages } from 'monaco-editor'; import waitForPromises from 'helpers/wait_for_promises'; -import { joinPaths } from '~/lib/utils/url_utility'; -import EditorLite from '~/editor/editor_lite'; -import { EditorLiteExtension } from '~/editor/extensions/editor_lite_extension_base'; -import { DEFAULT_THEME, themes } from '~/ide/lib/themes'; import { EDITOR_LITE_INSTANCE_ERROR_NO_EL, URI_PREFIX, EDITOR_READY_EVENT, } from '~/editor/constants'; +import EditorLite from '~/editor/editor_lite'; +import { EditorLiteExtension } from '~/editor/extensions/editor_lite_extension_base'; +import { DEFAULT_THEME, themes } from '~/ide/lib/themes'; +import { joinPaths } from '~/lib/utils/url_utility'; describe('Base editor', () => { let editorEl; diff --git a/spec/frontend/emoji/index_spec.js b/spec/frontend/emoji/index_spec.js index e5e37483a5a..1e6f5483160 100644 --- a/spec/frontend/emoji/index_spec.js +++ b/spec/frontend/emoji/index_spec.js @@ -1,5 +1,5 @@ -import { trimText } from 'helpers/text_helper'; import { emojiFixtureMap, mockEmojiData, initEmojiMock } from 'helpers/emoji'; +import { trimText } from 'helpers/text_helper'; import { glEmojiTag, searchEmoji, getEmojiInfo, sortEmoji } from '~/emoji'; import isEmojiUnicodeSupported, { isFlagEmoji, diff --git a/spec/frontend/environment.js b/spec/frontend/environment.js index 7d1ca47105e..d1bc11538a3 100644 --- a/spec/frontend/environment.js +++ b/spec/frontend/environment.js @@ -1,13 +1,13 @@ /* eslint-disable import/no-commonjs, max-classes-per-file */ const path = require('path'); -const { ErrorWithStack } = require('jest-util'); const JSDOMEnvironment = require('jest-environment-jsdom'); -const { TEST_HOST } = require('./__helpers__/test_constants'); +const { ErrorWithStack } = require('jest-util'); const { setGlobalDateToFakeDate, setGlobalDateToRealDate, } = require('./__helpers__/fake_date/fake_date'); +const { TEST_HOST } = require('./__helpers__/test_constants'); const ROOT_PATH = path.resolve(__dirname, '../..'); diff --git a/spec/frontend/environments/canary_ingress_spec.js b/spec/frontend/environments/canary_ingress_spec.js index 3dd67de1369..6c7a786e652 100644 --- a/spec/frontend/environments/canary_ingress_spec.js +++ b/spec/frontend/environments/canary_ingress_spec.js @@ -1,8 +1,8 @@ -import { mount } from '@vue/test-utils'; import { GlDropdownItem } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; -import { CANARY_UPDATE_MODAL } from '~/environments/constants'; import CanaryIngress from '~/environments/components/canary_ingress.vue'; +import { CANARY_UPDATE_MODAL } from '~/environments/constants'; describe('/environments/components/canary_ingress.vue', () => { let wrapper; diff --git a/spec/frontend/environments/canary_update_modal_spec.js b/spec/frontend/environments/canary_update_modal_spec.js index d0b97cf2eda..c7129ee1320 100644 --- a/spec/frontend/environments/canary_update_modal_spec.js +++ b/spec/frontend/environments/canary_update_modal_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlAlert, GlModal } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import waitForPromises from 'helpers/wait_for_promises'; import CanaryUpdateModal from '~/environments/components/canary_update_modal.vue'; import updateCanaryIngress from '~/environments/graphql/mutations/update_canary_ingress.mutation.graphql'; diff --git a/spec/frontend/environments/confirm_rollback_modal_spec.js b/spec/frontend/environments/confirm_rollback_modal_spec.js index a1a22274e8f..8fb53579f96 100644 --- a/spec/frontend/environments/confirm_rollback_modal_spec.js +++ b/spec/frontend/environments/confirm_rollback_modal_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlModal } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import ConfirmRollbackModal from '~/environments/components/confirm_rollback_modal.vue'; import eventHub from '~/environments/event_hub'; diff --git a/spec/frontend/environments/deploy_board_component_spec.js b/spec/frontend/environments/deploy_board_component_spec.js index dbef03f99d8..53220341a62 100644 --- a/spec/frontend/environments/deploy_board_component_spec.js +++ b/spec/frontend/environments/deploy_board_component_spec.js @@ -1,8 +1,8 @@ import { GlTooltip, GlIcon, GlLoadingIcon } from '@gitlab/ui'; import { mount } from '@vue/test-utils'; import Vue from 'vue'; -import DeployBoard from '~/environments/components/deploy_board.vue'; import CanaryIngress from '~/environments/components/canary_ingress.vue'; +import DeployBoard from '~/environments/components/deploy_board.vue'; import { deployBoardMockData, environment } from './mock_data'; const logsPath = `gitlab-org/gitlab-test/-/logs?environment_name=${environment.name}`; diff --git a/spec/frontend/environments/enable_review_app_modal_spec.js b/spec/frontend/environments/enable_review_app_modal_spec.js index 7ea49a6e1d0..f5063cff620 100644 --- a/spec/frontend/environments/enable_review_app_modal_spec.js +++ b/spec/frontend/environments/enable_review_app_modal_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; -import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue'; import EnableReviewAppButton from '~/environments/components/enable_review_app_modal.vue'; +import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue'; describe('Enable Review App Button', () => { let wrapper; diff --git a/spec/frontend/environments/environment_actions_spec.js b/spec/frontend/environments/environment_actions_spec.js index 279b275eb58..db78a6b0cdd 100644 --- a/spec/frontend/environments/environment_actions_spec.js +++ b/spec/frontend/environments/environment_actions_spec.js @@ -1,9 +1,9 @@ -import { shallowMount, mount } from '@vue/test-utils'; import { GlDropdown, GlDropdownItem, GlLoadingIcon, GlIcon } from '@gitlab/ui'; +import { shallowMount, mount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; -import eventHub from '~/environments/event_hub'; import EnvironmentActions from '~/environments/components/environment_actions.vue'; +import eventHub from '~/environments/event_hub'; const scheduledJobAction = { name: 'scheduled action', diff --git a/spec/frontend/environments/environment_item_spec.js b/spec/frontend/environments/environment_item_spec.js index bc692352103..09ab1223fd1 100644 --- a/spec/frontend/environments/environment_item_spec.js +++ b/spec/frontend/environments/environment_item_spec.js @@ -1,9 +1,9 @@ -import { cloneDeep } from 'lodash'; import { mount } from '@vue/test-utils'; +import { cloneDeep } from 'lodash'; import { format } from 'timeago.js'; +import DeleteComponent from '~/environments/components/environment_delete.vue'; import EnvironmentItem from '~/environments/components/environment_item.vue'; import PinComponent from '~/environments/components/environment_pin.vue'; -import DeleteComponent from '~/environments/components/environment_delete.vue'; import { differenceInMilliseconds } from '~/lib/utils/datetime_utility'; import { environment, folder, tableData } from './mock_data'; diff --git a/spec/frontend/environments/environment_monitoring_spec.js b/spec/frontend/environments/environment_monitoring_spec.js index bbd49c04fb6..3a53b57c3c6 100644 --- a/spec/frontend/environments/environment_monitoring_spec.js +++ b/spec/frontend/environments/environment_monitoring_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import MonitoringComponent from '~/environments/components/environment_monitoring.vue'; describe('Monitoring Component', () => { diff --git a/spec/frontend/environments/environment_pin_spec.js b/spec/frontend/environments/environment_pin_spec.js index f48091adb44..5cdd52294b6 100644 --- a/spec/frontend/environments/environment_pin_spec.js +++ b/spec/frontend/environments/environment_pin_spec.js @@ -1,7 +1,7 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton, GlIcon } from '@gitlab/ui'; -import eventHub from '~/environments/event_hub'; +import { shallowMount } from '@vue/test-utils'; import PinComponent from '~/environments/components/environment_pin.vue'; +import eventHub from '~/environments/event_hub'; describe('Pin Component', () => { let wrapper; diff --git a/spec/frontend/environments/environment_rollback_spec.js b/spec/frontend/environments/environment_rollback_spec.js index fb62a096c3d..b6c3d436c18 100644 --- a/spec/frontend/environments/environment_rollback_spec.js +++ b/spec/frontend/environments/environment_rollback_spec.js @@ -1,7 +1,7 @@ -import { shallowMount, mount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; -import eventHub from '~/environments/event_hub'; +import { shallowMount, mount } from '@vue/test-utils'; import RollbackComponent from '~/environments/components/environment_rollback.vue'; +import eventHub from '~/environments/event_hub'; describe('Rollback Component', () => { const retryUrl = 'https://gitlab.com/retry'; diff --git a/spec/frontend/environments/environment_stop_spec.js b/spec/frontend/environments/environment_stop_spec.js index 1865403cdc4..dff444b79f3 100644 --- a/spec/frontend/environments/environment_stop_spec.js +++ b/spec/frontend/environments/environment_stop_spec.js @@ -1,6 +1,6 @@ -import $ from 'jquery'; -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; +import $ from 'jquery'; import StopComponent from '~/environments/components/environment_stop.vue'; import eventHub from '~/environments/event_hub'; diff --git a/spec/frontend/environments/environment_table_spec.js b/spec/frontend/environments/environment_table_spec.js index daef35bcf99..863c4526bb9 100644 --- a/spec/frontend/environments/environment_table_spec.js +++ b/spec/frontend/environments/environment_table_spec.js @@ -1,8 +1,8 @@ import { mount } from '@vue/test-utils'; +import CanaryUpdateModal from '~/environments/components/canary_update_modal.vue'; +import DeployBoard from '~/environments/components/deploy_board.vue'; import EnvironmentTable from '~/environments/components/environments_table.vue'; import eventHub from '~/environments/event_hub'; -import DeployBoard from '~/environments/components/deploy_board.vue'; -import CanaryUpdateModal from '~/environments/components/canary_update_modal.vue'; import { folder, deployBoardMockData } from './mock_data'; const eeOnlyProps = { diff --git a/spec/frontend/environments/environments_app_spec.js b/spec/frontend/environments/environments_app_spec.js index d6614e2fd2b..50d84b19ce8 100644 --- a/spec/frontend/environments/environments_app_spec.js +++ b/spec/frontend/environments/environments_app_spec.js @@ -1,11 +1,11 @@ import { mount, shallowMount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; -import EnableReviewAppModal from '~/environments/components/enable_review_app_modal.vue'; import Container from '~/environments/components/container.vue'; +import DeployBoard from '~/environments/components/deploy_board.vue'; import EmptyState from '~/environments/components/empty_state.vue'; +import EnableReviewAppModal from '~/environments/components/enable_review_app_modal.vue'; import EnvironmentsApp from '~/environments/components/environments_app.vue'; -import DeployBoard from '~/environments/components/deploy_board.vue'; import axios from '~/lib/utils/axios_utils'; import { environment, folder } from './mock_data'; diff --git a/spec/frontend/error_tracking/components/error_details_spec.js b/spec/frontend/error_tracking/components/error_details_spec.js index 0b9e0008ed7..b469a855d23 100644 --- a/spec/frontend/error_tracking/components/error_details_spec.js +++ b/spec/frontend/error_tracking/components/error_details_spec.js @@ -1,5 +1,3 @@ -import { createLocalVue, shallowMount } from '@vue/test-utils'; -import Vuex from 'vuex'; import { GlButton, GlLoadingIcon, @@ -9,21 +7,23 @@ import { GlAlert, GlSprintf, } from '@gitlab/ui'; -import { __ } from '~/locale'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; -import Stacktrace from '~/error_tracking/components/stacktrace.vue'; -import ErrorDetails from '~/error_tracking/components/error_details.vue'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; +import Vuex from 'vuex'; import { severityLevel, severityLevelVariant, errorStatus, } from '~/error_tracking/components/constants'; -import Tracking from '~/tracking'; +import ErrorDetails from '~/error_tracking/components/error_details.vue'; +import Stacktrace from '~/error_tracking/components/stacktrace.vue'; import { trackClickErrorLinkToSentryOptions, trackErrorDetailsViewsOptions, trackErrorStatusUpdateOptions, } from '~/error_tracking/utils'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; +import { __ } from '~/locale'; +import Tracking from '~/tracking'; jest.mock('~/flash'); diff --git a/spec/frontend/error_tracking/components/error_tracking_actions_spec.js b/spec/frontend/error_tracking/components/error_tracking_actions_spec.js index 05b3d2f1dec..e21c40423c3 100644 --- a/spec/frontend/error_tracking/components/error_tracking_actions_spec.js +++ b/spec/frontend/error_tracking/components/error_tracking_actions_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import ErrorTrackingActions from '~/error_tracking/components/error_tracking_actions.vue'; describe('Error Tracking Actions', () => { diff --git a/spec/frontend/error_tracking/components/error_tracking_list_spec.js b/spec/frontend/error_tracking/components/error_tracking_list_spec.js index 034e87c0cf3..c6ce236af01 100644 --- a/spec/frontend/error_tracking/components/error_tracking_list_spec.js +++ b/spec/frontend/error_tracking/components/error_tracking_list_spec.js @@ -1,9 +1,9 @@ +import { GlEmptyState, GlLoadingIcon, GlFormInput, GlPagination, GlDropdown } from '@gitlab/ui'; import { createLocalVue, mount } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlEmptyState, GlLoadingIcon, GlFormInput, GlPagination, GlDropdown } from '@gitlab/ui'; import stubChildren from 'helpers/stub_children'; -import ErrorTrackingList from '~/error_tracking/components/error_tracking_list.vue'; import ErrorTrackingActions from '~/error_tracking/components/error_tracking_actions.vue'; +import ErrorTrackingList from '~/error_tracking/components/error_tracking_list.vue'; import { trackErrorListViewsOptions, trackErrorStatusUpdateOptions } from '~/error_tracking/utils'; import Tracking from '~/tracking'; import errorsList from './list_mock.json'; diff --git a/spec/frontend/error_tracking/components/stacktrace_entry_spec.js b/spec/frontend/error_tracking/components/stacktrace_entry_spec.js index 6df25ad6819..0b43167c19b 100644 --- a/spec/frontend/error_tracking/components/stacktrace_entry_spec.js +++ b/spec/frontend/error_tracking/components/stacktrace_entry_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlSprintf, GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { trimText } from 'helpers/text_helper'; import StackTraceEntry from '~/error_tracking/components/stacktrace_entry.vue'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; diff --git a/spec/frontend/error_tracking/store/actions_spec.js b/spec/frontend/error_tracking/store/actions_spec.js index 34ad600af05..9d598344acd 100644 --- a/spec/frontend/error_tracking/store/actions_spec.js +++ b/spec/frontend/error_tracking/store/actions_spec.js @@ -1,9 +1,9 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; -import axios from '~/lib/utils/axios_utils'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; import * as actions from '~/error_tracking/store/actions'; import * as types from '~/error_tracking/store/mutation_types'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { visitUrl } from '~/lib/utils/url_utility'; jest.mock('~/flash.js'); diff --git a/spec/frontend/error_tracking/store/details/actions_spec.js b/spec/frontend/error_tracking/store/details/actions_spec.js index 152ecde6985..0c19dce7bad 100644 --- a/spec/frontend/error_tracking/store/details/actions_spec.js +++ b/spec/frontend/error_tracking/store/details/actions_spec.js @@ -1,9 +1,9 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; -import axios from '~/lib/utils/axios_utils'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; import * as actions from '~/error_tracking/store/details/actions'; import * as types from '~/error_tracking/store/details/mutation_types'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import Poll from '~/lib/utils/poll'; let mockedAdapter; diff --git a/spec/frontend/error_tracking/store/list/actions_spec.js b/spec/frontend/error_tracking/store/list/actions_spec.js index a93608fe70d..39481a8576f 100644 --- a/spec/frontend/error_tracking/store/list/actions_spec.js +++ b/spec/frontend/error_tracking/store/list/actions_spec.js @@ -1,10 +1,10 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; -import axios from '~/lib/utils/axios_utils'; -import httpStatusCodes from '~/lib/utils/http_status'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; import * as actions from '~/error_tracking/store/list/actions'; import * as types from '~/error_tracking/store/list/mutation_types'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; +import httpStatusCodes from '~/lib/utils/http_status'; jest.mock('~/flash.js'); diff --git a/spec/frontend/error_tracking/store/list/mutation_spec.js b/spec/frontend/error_tracking/store/list/mutation_spec.js index a326a6c55c0..d28d3ecc79f 100644 --- a/spec/frontend/error_tracking/store/list/mutation_spec.js +++ b/spec/frontend/error_tracking/store/list/mutation_spec.js @@ -1,6 +1,6 @@ import { useLocalStorageSpy } from 'helpers/local_storage_helper'; -import mutations from '~/error_tracking/store/list/mutations'; import * as types from '~/error_tracking/store/list/mutation_types'; +import mutations from '~/error_tracking/store/list/mutations'; const ADD_RECENT_SEARCH = mutations[types.ADD_RECENT_SEARCH]; const CLEAR_RECENT_SEARCHES = mutations[types.CLEAR_RECENT_SEARCHES]; diff --git a/spec/frontend/error_tracking_settings/components/app_spec.js b/spec/frontend/error_tracking_settings/components/app_spec.js index 5c3efa24551..e0be81b3899 100644 --- a/spec/frontend/error_tracking_settings/components/app_spec.js +++ b/spec/frontend/error_tracking_settings/components/app_spec.js @@ -1,5 +1,5 @@ -import Vuex from 'vuex'; import { createLocalVue, shallowMount } from '@vue/test-utils'; +import Vuex from 'vuex'; import { TEST_HOST } from 'helpers/test_constants'; import ErrorTrackingSettings from '~/error_tracking_settings/components/app.vue'; import ErrorTrackingForm from '~/error_tracking_settings/components/error_tracking_form.vue'; diff --git a/spec/frontend/error_tracking_settings/components/error_tracking_form_spec.js b/spec/frontend/error_tracking_settings/components/error_tracking_form_spec.js index e2a8b57f555..7ebaf0c3f2a 100644 --- a/spec/frontend/error_tracking_settings/components/error_tracking_form_spec.js +++ b/spec/frontend/error_tracking_settings/components/error_tracking_form_spec.js @@ -1,6 +1,6 @@ -import Vuex from 'vuex'; -import { createLocalVue, shallowMount } from '@vue/test-utils'; import { GlFormInput, GlButton } from '@gitlab/ui'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; +import Vuex from 'vuex'; import ErrorTrackingForm from '~/error_tracking_settings/components/error_tracking_form.vue'; import createStore from '~/error_tracking_settings/store'; import { defaultProps } from '../mock'; diff --git a/spec/frontend/error_tracking_settings/components/project_dropdown_spec.js b/spec/frontend/error_tracking_settings/components/project_dropdown_spec.js index d924f895da8..79518a487d4 100644 --- a/spec/frontend/error_tracking_settings/components/project_dropdown_spec.js +++ b/spec/frontend/error_tracking_settings/components/project_dropdown_spec.js @@ -1,7 +1,7 @@ +import { GlDropdown, GlDropdownItem } from '@gitlab/ui'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; import { pick, clone } from 'lodash'; import Vuex from 'vuex'; -import { createLocalVue, shallowMount } from '@vue/test-utils'; -import { GlDropdown, GlDropdownItem } from '@gitlab/ui'; import ProjectDropdown from '~/error_tracking_settings/components/project_dropdown.vue'; import { defaultProps, projectList, staleProject } from '../mock'; diff --git a/spec/frontend/error_tracking_settings/store/actions_spec.js b/spec/frontend/error_tracking_settings/store/actions_spec.js index 216bf8011e8..281db7d9686 100644 --- a/spec/frontend/error_tracking_settings/store/actions_spec.js +++ b/spec/frontend/error_tracking_settings/store/actions_spec.js @@ -1,12 +1,12 @@ import MockAdapter from 'axios-mock-adapter'; -import testAction from 'helpers/vuex_action_helper'; import { TEST_HOST } from 'helpers/test_constants'; -import axios from '~/lib/utils/axios_utils'; -import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; -import { refreshCurrentPage } from '~/lib/utils/url_utility'; +import testAction from 'helpers/vuex_action_helper'; import * as actions from '~/error_tracking_settings/store/actions'; import * as types from '~/error_tracking_settings/store/mutation_types'; import defaultState from '~/error_tracking_settings/store/state'; +import axios from '~/lib/utils/axios_utils'; +import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; +import { refreshCurrentPage } from '~/lib/utils/url_utility'; import { projectList } from '../mock'; jest.mock('~/lib/utils/url_utility'); diff --git a/spec/frontend/error_tracking_settings/store/mutation_spec.js b/spec/frontend/error_tracking_settings/store/mutation_spec.js index fa188462c3f..78fd56904b3 100644 --- a/spec/frontend/error_tracking_settings/store/mutation_spec.js +++ b/spec/frontend/error_tracking_settings/store/mutation_spec.js @@ -1,7 +1,7 @@ import { TEST_HOST } from 'helpers/test_constants'; +import * as types from '~/error_tracking_settings/store/mutation_types'; import mutations from '~/error_tracking_settings/store/mutations'; import defaultState from '~/error_tracking_settings/store/state'; -import * as types from '~/error_tracking_settings/store/mutation_types'; import { initialEmptyState, initialPopulatedState, diff --git a/spec/frontend/feature_flags/components/configure_feature_flags_modal_spec.js b/spec/frontend/feature_flags/components/configure_feature_flags_modal_spec.js index 21b894ccbef..84e71ffd204 100644 --- a/spec/frontend/feature_flags/components/configure_feature_flags_modal_spec.js +++ b/spec/frontend/feature_flags/components/configure_feature_flags_modal_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlModal, GlSprintf, GlAlert } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import Component from '~/feature_flags/components/configure_feature_flags_modal.vue'; describe('Configure Feature Flags Modal', () => { diff --git a/spec/frontend/feature_flags/components/edit_feature_flag_spec.js b/spec/frontend/feature_flags/components/edit_feature_flag_spec.js index e66e37a4ae6..e2717b98ea9 100644 --- a/spec/frontend/feature_flags/components/edit_feature_flag_spec.js +++ b/spec/frontend/feature_flags/components/edit_feature_flag_spec.js @@ -1,13 +1,13 @@ -import Vuex from 'vuex'; +import { GlToggle, GlAlert } from '@gitlab/ui'; import { createLocalVue, shallowMount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; -import { GlToggle, GlAlert } from '@gitlab/ui'; -import { TEST_HOST } from 'spec/test_constants'; +import Vuex from 'vuex'; import { mockTracking } from 'helpers/tracking_helper'; -import { LEGACY_FLAG, NEW_VERSION_FLAG } from '~/feature_flags/constants'; +import { TEST_HOST } from 'spec/test_constants'; +import EditFeatureFlag from '~/feature_flags/components/edit_feature_flag.vue'; import Form from '~/feature_flags/components/form.vue'; +import { LEGACY_FLAG, NEW_VERSION_FLAG } from '~/feature_flags/constants'; import createStore from '~/feature_flags/store/edit'; -import EditFeatureFlag from '~/feature_flags/components/edit_feature_flag.vue'; import axios from '~/lib/utils/axios_utils'; const localVue = createLocalVue(); diff --git a/spec/frontend/feature_flags/components/environments_dropdown_spec.js b/spec/frontend/feature_flags/components/environments_dropdown_spec.js index 042fccaa369..9194db3a182 100644 --- a/spec/frontend/feature_flags/components/environments_dropdown_spec.js +++ b/spec/frontend/feature_flags/components/environments_dropdown_spec.js @@ -1,8 +1,8 @@ -import MockAdapter from 'axios-mock-adapter'; -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon, GlButton, GlSearchBoxByType } from '@gitlab/ui'; -import { TEST_HOST } from 'spec/test_constants'; +import { shallowMount } from '@vue/test-utils'; +import MockAdapter from 'axios-mock-adapter'; import waitForPromises from 'helpers/wait_for_promises'; +import { TEST_HOST } from 'spec/test_constants'; import EnvironmentsDropdown from '~/feature_flags/components/environments_dropdown.vue'; import axios from '~/lib/utils/axios_utils'; import httpStatusCodes from '~/lib/utils/http_status'; diff --git a/spec/frontend/feature_flags/components/feature_flags_spec.js b/spec/frontend/feature_flags/components/feature_flags_spec.js index 8242d667d2e..b519aab0dc4 100644 --- a/spec/frontend/feature_flags/components/feature_flags_spec.js +++ b/spec/frontend/feature_flags/components/feature_flags_spec.js @@ -1,18 +1,18 @@ +import { GlAlert, GlEmptyState, GlLoadingIcon, GlSprintf } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; -import Vuex from 'vuex'; import MockAdapter from 'axios-mock-adapter'; -import { GlAlert, GlEmptyState, GlLoadingIcon, GlSprintf } from '@gitlab/ui'; +import Vuex from 'vuex'; import { TEST_HOST } from 'spec/test_constants'; import Api from '~/api'; -import createStore from '~/feature_flags/store/index'; -import FeatureFlagsTab from '~/feature_flags/components/feature_flags_tab.vue'; +import ConfigureFeatureFlagsModal from '~/feature_flags/components/configure_feature_flags_modal.vue'; import FeatureFlagsComponent from '~/feature_flags/components/feature_flags.vue'; +import FeatureFlagsTab from '~/feature_flags/components/feature_flags_tab.vue'; import FeatureFlagsTable from '~/feature_flags/components/feature_flags_table.vue'; import UserListsTable from '~/feature_flags/components/user_lists_table.vue'; -import ConfigureFeatureFlagsModal from '~/feature_flags/components/configure_feature_flags_modal.vue'; import { FEATURE_FLAG_SCOPE, USER_LIST_SCOPE } from '~/feature_flags/constants'; -import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; +import createStore from '~/feature_flags/store/index'; import axios from '~/lib/utils/axios_utils'; +import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; import { getRequestData, userList } from '../mock_data'; const localVue = createLocalVue(); diff --git a/spec/frontend/feature_flags/components/feature_flags_tab_spec.js b/spec/frontend/feature_flags/components/feature_flags_tab_spec.js index 23cc7045d1f..c2170e8a768 100644 --- a/spec/frontend/feature_flags/components/feature_flags_tab_spec.js +++ b/spec/frontend/feature_flags/components/feature_flags_tab_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlAlert, GlBadge, GlEmptyState, GlLink, GlLoadingIcon, GlTabs } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import FeatureFlagsTab from '~/feature_flags/components/feature_flags_tab.vue'; const DEFAULT_PROPS = { diff --git a/spec/frontend/feature_flags/components/feature_flags_table_spec.js b/spec/frontend/feature_flags/components/feature_flags_table_spec.js index 8881cfae88d..8f4d39d4a11 100644 --- a/spec/frontend/feature_flags/components/feature_flags_table_spec.js +++ b/spec/frontend/feature_flags/components/feature_flags_table_spec.js @@ -1,7 +1,8 @@ -import { shallowMount } from '@vue/test-utils'; import { GlToggle, GlBadge } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { trimText } from 'helpers/text_helper'; import { mockTracking } from 'helpers/tracking_helper'; +import FeatureFlagsTable from '~/feature_flags/components/feature_flags_table.vue'; import { ROLLOUT_STRATEGY_ALL_USERS, ROLLOUT_STRATEGY_PERCENT_ROLLOUT, @@ -11,7 +12,6 @@ import { LEGACY_FLAG, DEFAULT_PERCENT_ROLLOUT, } from '~/feature_flags/constants'; -import FeatureFlagsTable from '~/feature_flags/components/feature_flags_table.vue'; const getDefaultProps = () => ({ featureFlags: [ diff --git a/spec/frontend/feature_flags/components/form_spec.js b/spec/frontend/feature_flags/components/form_spec.js index 6c9ccba5181..a05e23a4250 100644 --- a/spec/frontend/feature_flags/components/form_spec.js +++ b/spec/frontend/feature_flags/components/form_spec.js @@ -1,10 +1,10 @@ -import { uniqueId } from 'lodash'; -import { shallowMount } from '@vue/test-utils'; import { GlFormTextarea, GlFormCheckbox, GlButton, GlToggle } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; +import { uniqueId } from 'lodash'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import Api from '~/api'; -import Form from '~/feature_flags/components/form.vue'; import EnvironmentsDropdown from '~/feature_flags/components/environments_dropdown.vue'; +import Form from '~/feature_flags/components/form.vue'; import Strategy from '~/feature_flags/components/strategy.vue'; import { ROLLOUT_STRATEGY_ALL_USERS, diff --git a/spec/frontend/feature_flags/components/new_environments_dropdown_spec.js b/spec/frontend/feature_flags/components/new_environments_dropdown_spec.js index ad58ceaf5f8..6342ac0bda7 100644 --- a/spec/frontend/feature_flags/components/new_environments_dropdown_spec.js +++ b/spec/frontend/feature_flags/components/new_environments_dropdown_spec.js @@ -1,6 +1,6 @@ +import { GlLoadingIcon, GlSearchBoxByType, GlDropdownItem } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; -import { GlLoadingIcon, GlSearchBoxByType, GlDropdownItem } from '@gitlab/ui'; import NewEnvironmentsDropdown from '~/feature_flags/components/new_environments_dropdown.vue'; import axios from '~/lib/utils/axios_utils'; import httpStatusCodes from '~/lib/utils/http_status'; diff --git a/spec/frontend/feature_flags/components/new_feature_flag_spec.js b/spec/frontend/feature_flags/components/new_feature_flag_spec.js index 2dfcdf201fb..e209c14d8c7 100644 --- a/spec/frontend/feature_flags/components/new_feature_flag_spec.js +++ b/spec/frontend/feature_flags/components/new_feature_flag_spec.js @@ -1,11 +1,11 @@ +import { GlAlert } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlAlert } from '@gitlab/ui'; import { TEST_HOST } from 'spec/test_constants'; import Form from '~/feature_flags/components/form.vue'; -import createStore from '~/feature_flags/store/new'; import NewFeatureFlag from '~/feature_flags/components/new_feature_flag.vue'; import { ROLLOUT_STRATEGY_ALL_USERS, DEFAULT_PERCENT_ROLLOUT } from '~/feature_flags/constants'; +import createStore from '~/feature_flags/store/new'; import { allUsersStrategy } from '../mock_data'; const userCalloutId = 'feature_flags_new_version'; diff --git a/spec/frontend/feature_flags/components/strategies/flexible_rollout_spec.js b/spec/frontend/feature_flags/components/strategies/flexible_rollout_spec.js index 725f53d4409..02216370b79 100644 --- a/spec/frontend/feature_flags/components/strategies/flexible_rollout_spec.js +++ b/spec/frontend/feature_flags/components/strategies/flexible_rollout_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlFormInput, GlFormSelect } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import FlexibleRollout from '~/feature_flags/components/strategies/flexible_rollout.vue'; import ParameterFormGroup from '~/feature_flags/components/strategies/parameter_form_group.vue'; import { PERCENT_ROLLOUT_GROUP_ID } from '~/feature_flags/constants'; diff --git a/spec/frontend/feature_flags/components/strategies/gitlab_user_list_spec.js b/spec/frontend/feature_flags/components/strategies/gitlab_user_list_spec.js index 1c85eadc678..6188672b23b 100644 --- a/spec/frontend/feature_flags/components/strategies/gitlab_user_list_spec.js +++ b/spec/frontend/feature_flags/components/strategies/gitlab_user_list_spec.js @@ -1,9 +1,9 @@ +import { GlDropdown, GlDropdownItem, GlSearchBoxByType, GlLoadingIcon } from '@gitlab/ui'; import { mount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlDropdown, GlDropdownItem, GlSearchBoxByType, GlLoadingIcon } from '@gitlab/ui'; import Api from '~/api'; -import createStore from '~/feature_flags/store/new'; import GitlabUserList from '~/feature_flags/components/strategies/gitlab_user_list.vue'; +import createStore from '~/feature_flags/store/new'; import { userListStrategy, userList } from '../../mock_data'; jest.mock('~/api'); diff --git a/spec/frontend/feature_flags/components/strategies/parameter_form_group_spec.js b/spec/frontend/feature_flags/components/strategies/parameter_form_group_spec.js index a0ffdb1fca0..33696064d55 100644 --- a/spec/frontend/feature_flags/components/strategies/parameter_form_group_spec.js +++ b/spec/frontend/feature_flags/components/strategies/parameter_form_group_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlFormGroup, GlFormInput } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import ParameterFormGroup from '~/feature_flags/components/strategies/parameter_form_group.vue'; describe('~/feature_flags/strategies/parameter_form_group.vue', () => { diff --git a/spec/frontend/feature_flags/components/strategies/percent_rollout_spec.js b/spec/frontend/feature_flags/components/strategies/percent_rollout_spec.js index 696b3b2e4c9..442f7faf161 100644 --- a/spec/frontend/feature_flags/components/strategies/percent_rollout_spec.js +++ b/spec/frontend/feature_flags/components/strategies/percent_rollout_spec.js @@ -1,7 +1,7 @@ -import { mount } from '@vue/test-utils'; import { GlFormInput } from '@gitlab/ui'; -import PercentRollout from '~/feature_flags/components/strategies/percent_rollout.vue'; +import { mount } from '@vue/test-utils'; import ParameterFormGroup from '~/feature_flags/components/strategies/parameter_form_group.vue'; +import PercentRollout from '~/feature_flags/components/strategies/percent_rollout.vue'; import { PERCENT_ROLLOUT_GROUP_ID } from '~/feature_flags/constants'; import { percentRolloutStrategy } from '../../mock_data'; diff --git a/spec/frontend/feature_flags/components/strategies/users_with_id_spec.js b/spec/frontend/feature_flags/components/strategies/users_with_id_spec.js index 460df6ef2ec..745fbca00fe 100644 --- a/spec/frontend/feature_flags/components/strategies/users_with_id_spec.js +++ b/spec/frontend/feature_flags/components/strategies/users_with_id_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlFormTextarea } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import UsersWithId from '~/feature_flags/components/strategies/users_with_id.vue'; import { usersWithIdStrategy } from '../../mock_data'; diff --git a/spec/frontend/feature_flags/components/strategy_parameters_spec.js b/spec/frontend/feature_flags/components/strategy_parameters_spec.js index 82811c05195..979ca255b08 100644 --- a/spec/frontend/feature_flags/components/strategy_parameters_spec.js +++ b/spec/frontend/feature_flags/components/strategy_parameters_spec.js @@ -1,16 +1,16 @@ import { shallowMount } from '@vue/test-utils'; import { last } from 'lodash'; +import Default from '~/feature_flags/components/strategies/default.vue'; +import GitlabUserList from '~/feature_flags/components/strategies/gitlab_user_list.vue'; +import PercentRollout from '~/feature_flags/components/strategies/percent_rollout.vue'; +import UsersWithId from '~/feature_flags/components/strategies/users_with_id.vue'; +import StrategyParameters from '~/feature_flags/components/strategy_parameters.vue'; import { ROLLOUT_STRATEGY_ALL_USERS, ROLLOUT_STRATEGY_PERCENT_ROLLOUT, ROLLOUT_STRATEGY_USER_ID, ROLLOUT_STRATEGY_GITLAB_USER_LIST, } from '~/feature_flags/constants'; -import Default from '~/feature_flags/components/strategies/default.vue'; -import GitlabUserList from '~/feature_flags/components/strategies/gitlab_user_list.vue'; -import PercentRollout from '~/feature_flags/components/strategies/percent_rollout.vue'; -import UsersWithId from '~/feature_flags/components/strategies/users_with_id.vue'; -import StrategyParameters from '~/feature_flags/components/strategy_parameters.vue'; import { allUsersStrategy } from '../mock_data'; const DEFAULT_PROPS = { diff --git a/spec/frontend/feature_flags/components/strategy_spec.js b/spec/frontend/feature_flags/components/strategy_spec.js index 67cf70c37e2..4fdf436bfc4 100644 --- a/spec/frontend/feature_flags/components/strategy_spec.js +++ b/spec/frontend/feature_flags/components/strategy_spec.js @@ -1,9 +1,11 @@ +import { GlAlert, GlFormSelect, GlLink, GlToken, GlButton } from '@gitlab/ui'; import { mount, createLocalVue } from '@vue/test-utils'; -import Vuex from 'vuex'; import { last } from 'lodash'; -import { GlAlert, GlFormSelect, GlLink, GlToken, GlButton } from '@gitlab/ui'; +import Vuex from 'vuex'; import Api from '~/api'; -import createStore from '~/feature_flags/store/new'; +import NewEnvironmentsDropdown from '~/feature_flags/components/new_environments_dropdown.vue'; +import Strategy from '~/feature_flags/components/strategy.vue'; +import StrategyParameters from '~/feature_flags/components/strategy_parameters.vue'; import { PERCENT_ROLLOUT_GROUP_ID, ROLLOUT_STRATEGY_ALL_USERS, @@ -12,9 +14,7 @@ import { ROLLOUT_STRATEGY_USER_ID, ROLLOUT_STRATEGY_GITLAB_USER_LIST, } from '~/feature_flags/constants'; -import Strategy from '~/feature_flags/components/strategy.vue'; -import NewEnvironmentsDropdown from '~/feature_flags/components/new_environments_dropdown.vue'; -import StrategyParameters from '~/feature_flags/components/strategy_parameters.vue'; +import createStore from '~/feature_flags/store/new'; import { userList } from '../mock_data'; diff --git a/spec/frontend/feature_flags/components/user_lists_table_spec.js b/spec/frontend/feature_flags/components/user_lists_table_spec.js index 974f63ba934..1b04ecee146 100644 --- a/spec/frontend/feature_flags/components/user_lists_table_spec.js +++ b/spec/frontend/feature_flags/components/user_lists_table_spec.js @@ -1,6 +1,6 @@ +import { GlModal } from '@gitlab/ui'; import { mount } from '@vue/test-utils'; import * as timeago from 'timeago.js'; -import { GlModal } from '@gitlab/ui'; import UserListsTable from '~/feature_flags/components/user_lists_table.vue'; import { userList } from '../mock_data'; diff --git a/spec/frontend/feature_flags/store/edit/actions_spec.js b/spec/frontend/feature_flags/store/edit/actions_spec.js index 20cec5daac0..afcac53468c 100644 --- a/spec/frontend/feature_flags/store/edit/actions_spec.js +++ b/spec/frontend/feature_flags/store/edit/actions_spec.js @@ -1,6 +1,11 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; import { TEST_HOST } from 'spec/test_constants'; +import { + NEW_VERSION_FLAG, + LEGACY_FLAG, + ROLLOUT_STRATEGY_ALL_USERS, +} from '~/feature_flags/constants'; import { updateFeatureFlag, requestUpdateFeatureFlag, @@ -12,14 +17,9 @@ import { receiveFeatureFlagError, toggleActive, } from '~/feature_flags/store/edit/actions'; +import * as types from '~/feature_flags/store/edit/mutation_types'; import state from '~/feature_flags/store/edit/state'; import { mapStrategiesToRails, mapFromScopesViewModel } from '~/feature_flags/store/helpers'; -import { - NEW_VERSION_FLAG, - LEGACY_FLAG, - ROLLOUT_STRATEGY_ALL_USERS, -} from '~/feature_flags/constants'; -import * as types from '~/feature_flags/store/edit/mutation_types'; import axios from '~/lib/utils/axios_utils'; jest.mock('~/lib/utils/url_utility'); diff --git a/spec/frontend/feature_flags/store/edit/mutations_spec.js b/spec/frontend/feature_flags/store/edit/mutations_spec.js index 1d817fb8004..4b43f8b82df 100644 --- a/spec/frontend/feature_flags/store/edit/mutations_spec.js +++ b/spec/frontend/feature_flags/store/edit/mutations_spec.js @@ -1,6 +1,6 @@ -import state from '~/feature_flags/store/edit/state'; -import mutations from '~/feature_flags/store/edit/mutations'; import * as types from '~/feature_flags/store/edit/mutation_types'; +import mutations from '~/feature_flags/store/edit/mutations'; +import state from '~/feature_flags/store/edit/state'; describe('Feature flags Edit Module Mutations', () => { let stateCopy; diff --git a/spec/frontend/feature_flags/store/gitlab_user_lists/actions_spec.js b/spec/frontend/feature_flags/store/gitlab_user_lists/actions_spec.js index aba578cca59..b4887d23e4b 100644 --- a/spec/frontend/feature_flags/store/gitlab_user_lists/actions_spec.js +++ b/spec/frontend/feature_flags/store/gitlab_user_lists/actions_spec.js @@ -1,8 +1,8 @@ import testAction from 'helpers/vuex_action_helper'; import Api from '~/api'; -import createState from '~/feature_flags/store/gitlab_user_list/state'; import { fetchUserLists, setFilter } from '~/feature_flags/store/gitlab_user_list/actions'; import * as types from '~/feature_flags/store/gitlab_user_list/mutation_types'; +import createState from '~/feature_flags/store/gitlab_user_list/state'; import { userList } from '../../mock_data'; jest.mock('~/api'); diff --git a/spec/frontend/feature_flags/store/gitlab_user_lists/getters_spec.js b/spec/frontend/feature_flags/store/gitlab_user_lists/getters_spec.js index e267cd59f50..1f02cbb44a1 100644 --- a/spec/frontend/feature_flags/store/gitlab_user_lists/getters_spec.js +++ b/spec/frontend/feature_flags/store/gitlab_user_lists/getters_spec.js @@ -4,8 +4,8 @@ import { isLoading, hasError, } from '~/feature_flags/store/gitlab_user_list/getters'; -import statuses from '~/feature_flags/store/gitlab_user_list/status'; import createState from '~/feature_flags/store/gitlab_user_list/state'; +import statuses from '~/feature_flags/store/gitlab_user_list/status'; import { userList } from '../../mock_data'; describe('~/feature_flags/store/gitlab_user_list/getters', () => { diff --git a/spec/frontend/feature_flags/store/gitlab_user_lists/mutations_spec.js b/spec/frontend/feature_flags/store/gitlab_user_lists/mutations_spec.js index 88d4554a227..46233c43b07 100644 --- a/spec/frontend/feature_flags/store/gitlab_user_lists/mutations_spec.js +++ b/spec/frontend/feature_flags/store/gitlab_user_lists/mutations_spec.js @@ -1,7 +1,7 @@ -import statuses from '~/feature_flags/store/gitlab_user_list/status'; -import createState from '~/feature_flags/store/gitlab_user_list/state'; import * as types from '~/feature_flags/store/gitlab_user_list/mutation_types'; import mutations from '~/feature_flags/store/gitlab_user_list/mutations'; +import createState from '~/feature_flags/store/gitlab_user_list/state'; +import statuses from '~/feature_flags/store/gitlab_user_list/status'; import { userList } from '../../mock_data'; describe('~/feature_flags/store/gitlab_user_list/mutations', () => { diff --git a/spec/frontend/feature_flags/store/helpers_spec.js b/spec/frontend/feature_flags/store/helpers_spec.js index 301b1d09fcc..711e2a1286e 100644 --- a/spec/frontend/feature_flags/store/helpers_spec.js +++ b/spec/frontend/feature_flags/store/helpers_spec.js @@ -1,11 +1,4 @@ import { uniqueId } from 'lodash'; -import { - mapToScopesViewModel, - mapFromScopesViewModel, - createNewEnvironmentScope, - mapStrategiesToViewModel, - mapStrategiesToRails, -} from '~/feature_flags/store/helpers'; import { ROLLOUT_STRATEGY_ALL_USERS, ROLLOUT_STRATEGY_PERCENT_ROLLOUT, @@ -16,6 +9,13 @@ import { LEGACY_FLAG, NEW_VERSION_FLAG, } from '~/feature_flags/constants'; +import { + mapToScopesViewModel, + mapFromScopesViewModel, + createNewEnvironmentScope, + mapStrategiesToViewModel, + mapStrategiesToRails, +} from '~/feature_flags/store/helpers'; describe('feature flags helpers spec', () => { describe('mapToScopesViewModel', () => { diff --git a/spec/frontend/feature_flags/store/index/actions_spec.js b/spec/frontend/feature_flags/store/index/actions_spec.js index 82e16958d33..a7ab2e92cb2 100644 --- a/spec/frontend/feature_flags/store/index/actions_spec.js +++ b/spec/frontend/feature_flags/store/index/actions_spec.js @@ -2,6 +2,7 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; import { TEST_HOST } from 'spec/test_constants'; import Api from '~/api'; +import { mapToScopesViewModel } from '~/feature_flags/store/helpers'; import { requestFeatureFlags, receiveFeatureFlagsSuccess, @@ -24,9 +25,8 @@ import { receiveDeleteUserListError, clearAlert, } from '~/feature_flags/store/index/actions'; -import { mapToScopesViewModel } from '~/feature_flags/store/helpers'; -import state from '~/feature_flags/store/index/state'; import * as types from '~/feature_flags/store/index/mutation_types'; +import state from '~/feature_flags/store/index/state'; import axios from '~/lib/utils/axios_utils'; import { getRequestData, rotateData, featureFlag, userList } from '../../mock_data'; diff --git a/spec/frontend/feature_flags/store/index/mutations_spec.js b/spec/frontend/feature_flags/store/index/mutations_spec.js index eec56800a8d..08b5868d1b4 100644 --- a/spec/frontend/feature_flags/store/index/mutations_spec.js +++ b/spec/frontend/feature_flags/store/index/mutations_spec.js @@ -1,7 +1,7 @@ -import state from '~/feature_flags/store/index/state'; -import mutations from '~/feature_flags/store/index/mutations'; -import * as types from '~/feature_flags/store/index/mutation_types'; import { mapToScopesViewModel } from '~/feature_flags/store/helpers'; +import * as types from '~/feature_flags/store/index/mutation_types'; +import mutations from '~/feature_flags/store/index/mutations'; +import state from '~/feature_flags/store/index/state'; import { parseIntPagination, normalizeHeaders } from '~/lib/utils/common_utils'; import { getRequestData, rotateData, featureFlag, userList } from '../../mock_data'; diff --git a/spec/frontend/feature_flags/store/new/actions_spec.js b/spec/frontend/feature_flags/store/new/actions_spec.js index 9168f11fdfb..00dfb982ded 100644 --- a/spec/frontend/feature_flags/store/new/actions_spec.js +++ b/spec/frontend/feature_flags/store/new/actions_spec.js @@ -1,14 +1,6 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; import { TEST_HOST } from 'spec/test_constants'; -import { - createFeatureFlag, - requestCreateFeatureFlag, - receiveCreateFeatureFlagSuccess, - receiveCreateFeatureFlagError, -} from '~/feature_flags/store/new/actions'; -import state from '~/feature_flags/store/new/state'; -import * as types from '~/feature_flags/store/new/mutation_types'; import { ROLLOUT_STRATEGY_ALL_USERS, ROLLOUT_STRATEGY_PERCENT_ROLLOUT, @@ -16,6 +8,14 @@ import { NEW_VERSION_FLAG, } from '~/feature_flags/constants'; import { mapFromScopesViewModel, mapStrategiesToRails } from '~/feature_flags/store/helpers'; +import { + createFeatureFlag, + requestCreateFeatureFlag, + receiveCreateFeatureFlagSuccess, + receiveCreateFeatureFlagError, +} from '~/feature_flags/store/new/actions'; +import * as types from '~/feature_flags/store/new/mutation_types'; +import state from '~/feature_flags/store/new/state'; import axios from '~/lib/utils/axios_utils'; jest.mock('~/lib/utils/url_utility'); diff --git a/spec/frontend/feature_flags/store/new/mutations_spec.js b/spec/frontend/feature_flags/store/new/mutations_spec.js index e8609a6d116..c97e62247bb 100644 --- a/spec/frontend/feature_flags/store/new/mutations_spec.js +++ b/spec/frontend/feature_flags/store/new/mutations_spec.js @@ -1,6 +1,6 @@ -import state from '~/feature_flags/store/new/state'; -import mutations from '~/feature_flags/store/new/mutations'; import * as types from '~/feature_flags/store/new/mutation_types'; +import mutations from '~/feature_flags/store/new/mutations'; +import state from '~/feature_flags/store/new/state'; describe('Feature flags New Module Mutations', () => { let stateCopy; diff --git a/spec/frontend/feature_highlight/feature_highlight_helper_spec.js b/spec/frontend/feature_highlight/feature_highlight_helper_spec.js index beae5041156..4a13af8897e 100644 --- a/spec/frontend/feature_highlight/feature_highlight_helper_spec.js +++ b/spec/frontend/feature_highlight/feature_highlight_helper_spec.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import axios from '~/lib/utils/axios_utils'; import { getSelector, dismiss, inserted } from '~/feature_highlight/feature_highlight_helper'; +import axios from '~/lib/utils/axios_utils'; import { togglePopover } from '~/shared/popover'; describe('feature highlight helper', () => { diff --git a/spec/frontend/feature_highlight/feature_highlight_popover_spec.js b/spec/frontend/feature_highlight/feature_highlight_popover_spec.js index 0730cfd453e..1d558366ce8 100644 --- a/spec/frontend/feature_highlight/feature_highlight_popover_spec.js +++ b/spec/frontend/feature_highlight/feature_highlight_popover_spec.js @@ -1,8 +1,8 @@ -import { mount } from '@vue/test-utils'; import { GlPopover, GlLink, GlButton } from '@gitlab/ui'; -import FeatureHighlightPopover from '~/feature_highlight/feature_highlight_popover.vue'; -import { dismiss } from '~/feature_highlight/feature_highlight_helper'; +import { mount } from '@vue/test-utils'; import { POPOVER_TARGET_ID } from '~/feature_highlight/constants'; +import { dismiss } from '~/feature_highlight/feature_highlight_helper'; +import FeatureHighlightPopover from '~/feature_highlight/feature_highlight_popover.vue'; jest.mock('~/feature_highlight/feature_highlight_helper'); diff --git a/spec/frontend/feature_highlight/feature_highlight_spec.js b/spec/frontend/feature_highlight/feature_highlight_spec.js index 79c4050c8c4..cf0db0b8bfe 100644 --- a/spec/frontend/feature_highlight/feature_highlight_spec.js +++ b/spec/frontend/feature_highlight/feature_highlight_spec.js @@ -1,8 +1,8 @@ -import $ from 'jquery'; import MockAdapter from 'axios-mock-adapter'; +import $ from 'jquery'; import * as featureHighlight from '~/feature_highlight/feature_highlight'; -import * as popover from '~/shared/popover'; import axios from '~/lib/utils/axios_utils'; +import * as popover from '~/shared/popover'; jest.mock('~/shared/popover'); diff --git a/spec/frontend/filtered_search/components/recent_searches_dropdown_content_spec.js b/spec/frontend/filtered_search/components/recent_searches_dropdown_content_spec.js index f1cff02261d..897ad5ee2bf 100644 --- a/spec/frontend/filtered_search/components/recent_searches_dropdown_content_spec.js +++ b/spec/frontend/filtered_search/components/recent_searches_dropdown_content_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; -import eventHub from '~/filtered_search/event_hub'; import RecentSearchesDropdownContent from '~/filtered_search/components/recent_searches_dropdown_content.vue'; +import eventHub from '~/filtered_search/event_hub'; import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys'; describe('Recent Searches Dropdown Content', () => { diff --git a/spec/frontend/filtered_search/filtered_search_manager_spec.js b/spec/frontend/filtered_search/filtered_search_manager_spec.js index def0aa14349..465e1ee1ef1 100644 --- a/spec/frontend/filtered_search/filtered_search_manager_spec.js +++ b/spec/frontend/filtered_search/filtered_search_manager_spec.js @@ -1,16 +1,16 @@ import FilteredSearchManager from 'ee_else_ce/filtered_search/filtered_search_manager'; import FilteredSearchSpecHelper from 'helpers/filtered_search_spec_helper'; -import RecentSearchesService from '~/filtered_search/services/recent_searches_service'; -import RecentSearchesServiceError from '~/filtered_search/services/recent_searches_service_error'; -import RecentSearchesRoot from '~/filtered_search/recent_searches_root'; -import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys'; import DropdownUtils from '~/filtered_search/dropdown_utils'; -import FilteredSearchVisualTokens from '~/filtered_search/filtered_search_visual_tokens'; import FilteredSearchDropdownManager from '~/filtered_search/filtered_search_dropdown_manager'; +import FilteredSearchVisualTokens from '~/filtered_search/filtered_search_visual_tokens'; +import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys'; +import RecentSearchesRoot from '~/filtered_search/recent_searches_root'; +import RecentSearchesService from '~/filtered_search/services/recent_searches_service'; +import RecentSearchesServiceError from '~/filtered_search/services/recent_searches_service_error'; +import * as commonUtils from '~/lib/utils/common_utils'; import { BACKSPACE_KEY_CODE, DELETE_KEY_CODE } from '~/lib/utils/keycodes'; import { visitUrl } from '~/lib/utils/url_utility'; -import * as commonUtils from '~/lib/utils/common_utils'; jest.mock('~/lib/utils/url_utility', () => ({ ...jest.requireActual('~/lib/utils/url_utility'), diff --git a/spec/frontend/filtered_search/filtered_search_tokenizer_spec.js b/spec/frontend/filtered_search/filtered_search_tokenizer_spec.js index dec03e5ab93..b6a95eb55c7 100644 --- a/spec/frontend/filtered_search/filtered_search_tokenizer_spec.js +++ b/spec/frontend/filtered_search/filtered_search_tokenizer_spec.js @@ -1,5 +1,5 @@ -import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys'; import FilteredSearchTokenizer from '~/filtered_search/filtered_search_tokenizer'; +import IssuableFilteredSearchTokenKeys from '~/filtered_search/issuable_filtered_search_token_keys'; describe('Filtered Search Tokenizer', () => { const allowedKeys = IssuableFilteredSearchTokenKeys.getKeys(); diff --git a/spec/frontend/filtered_search/visual_token_value_spec.js b/spec/frontend/filtered_search/visual_token_value_spec.js index 2a76c4a27df..a2082271efe 100644 --- a/spec/frontend/filtered_search/visual_token_value_spec.js +++ b/spec/frontend/filtered_search/visual_token_value_spec.js @@ -1,10 +1,10 @@ import { escape } from 'lodash'; -import { TEST_HOST } from 'helpers/test_constants'; import FilteredSearchSpecHelper from 'helpers/filtered_search_spec_helper'; +import { TEST_HOST } from 'helpers/test_constants'; +import DropdownUtils from '~/filtered_search//dropdown_utils'; import VisualTokenValue from '~/filtered_search/visual_token_value'; import AjaxCache from '~/lib/utils/ajax_cache'; import UsersCache from '~/lib/utils/users_cache'; -import DropdownUtils from '~/filtered_search//dropdown_utils'; describe('Filtered Search Visual Tokens', () => { const findElements = (tokenElement) => { diff --git a/spec/frontend/frequent_items/components/app_spec.js b/spec/frontend/frequent_items/components/app_spec.js index ac642bb19b5..80059c4c87f 100644 --- a/spec/frontend/frequent_items/components/app_spec.js +++ b/spec/frontend/frequent_items/components/app_spec.js @@ -1,15 +1,15 @@ import MockAdapter from 'axios-mock-adapter'; import Vue from 'vue'; -import { mountComponentWithStore } from 'helpers/vue_mount_component_helper'; +import { useRealDate } from 'helpers/fake_date'; import { useLocalStorageSpy } from 'helpers/local_storage_helper'; +import { mountComponentWithStore } from 'helpers/vue_mount_component_helper'; import waitForPromises from 'helpers/wait_for_promises'; -import { useRealDate } from 'helpers/fake_date'; -import axios from '~/lib/utils/axios_utils'; import appComponent from '~/frequent_items/components/app.vue'; -import eventHub from '~/frequent_items/event_hub'; import { FREQUENT_ITEMS, HOUR_IN_MS } from '~/frequent_items/constants'; -import { getTopFrequentItems } from '~/frequent_items/utils'; +import eventHub from '~/frequent_items/event_hub'; import { createStore } from '~/frequent_items/store'; +import { getTopFrequentItems } from '~/frequent_items/utils'; +import axios from '~/lib/utils/axios_utils'; import { currentSession, mockFrequentProjects, mockSearchedProjects } from '../mock_data'; useLocalStorageSpy(); diff --git a/spec/frontend/frequent_items/components/frequent_items_list_item_spec.js b/spec/frontend/frequent_items/components/frequent_items_list_item_spec.js index 19095c4474e..66fb346cb38 100644 --- a/spec/frontend/frequent_items/components/frequent_items_list_item_spec.js +++ b/spec/frontend/frequent_items/components/frequent_items_list_item_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; -import { mockTracking, unmockTracking } from 'helpers/tracking_helper'; import { trimText } from 'helpers/text_helper'; +import { mockTracking, unmockTracking } from 'helpers/tracking_helper'; import frequentItemsListItemComponent from '~/frequent_items/components/frequent_items_list_item.vue'; import { createStore } from '~/frequent_items/store'; import { mockProject } from '../mock_data'; diff --git a/spec/frontend/frequent_items/components/frequent_items_list_spec.js b/spec/frontend/frequent_items/components/frequent_items_list_spec.js index 96f73ab1468..bd0711005b3 100644 --- a/spec/frontend/frequent_items/components/frequent_items_list_spec.js +++ b/spec/frontend/frequent_items/components/frequent_items_list_spec.js @@ -1,7 +1,7 @@ import { mount } from '@vue/test-utils'; -import { createStore } from '~/frequent_items/store'; import frequentItemsListComponent from '~/frequent_items/components/frequent_items_list.vue'; import frequentItemsListItemComponent from '~/frequent_items/components/frequent_items_list_item.vue'; +import { createStore } from '~/frequent_items/store'; import { mockFrequentProjects } from '../mock_data'; describe('FrequentItemsListComponent', () => { diff --git a/spec/frontend/frequent_items/components/frequent_items_search_input_spec.js b/spec/frontend/frequent_items/components/frequent_items_search_input_spec.js index 6a3c3b94ac8..0280fdb0ca2 100644 --- a/spec/frontend/frequent_items/components/frequent_items_search_input_spec.js +++ b/spec/frontend/frequent_items/components/frequent_items_search_input_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlSearchBoxByType } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { mockTracking, unmockTracking } from 'helpers/tracking_helper'; import searchComponent from '~/frequent_items/components/frequent_items_search_input.vue'; import { createStore } from '~/frequent_items/store'; diff --git a/spec/frontend/frequent_items/store/actions_spec.js b/spec/frontend/frequent_items/store/actions_spec.js index acea46eae60..dacfc7ce707 100644 --- a/spec/frontend/frequent_items/store/actions_spec.js +++ b/spec/frontend/frequent_items/store/actions_spec.js @@ -1,10 +1,10 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; -import axios from '~/lib/utils/axios_utils'; -import AccessorUtilities from '~/lib/utils/accessor'; import * as actions from '~/frequent_items/store/actions'; import * as types from '~/frequent_items/store/mutation_types'; import state from '~/frequent_items/store/state'; +import AccessorUtilities from '~/lib/utils/accessor'; +import axios from '~/lib/utils/axios_utils'; import { mockNamespace, mockStorageKey, diff --git a/spec/frontend/frequent_items/store/getters_spec.js b/spec/frontend/frequent_items/store/getters_spec.js index 1cd12eb6832..97732cd95fc 100644 --- a/spec/frontend/frequent_items/store/getters_spec.js +++ b/spec/frontend/frequent_items/store/getters_spec.js @@ -1,5 +1,5 @@ -import state from '~/frequent_items/store/state'; import * as getters from '~/frequent_items/store/getters'; +import state from '~/frequent_items/store/state'; describe('Frequent Items Dropdown Store Getters', () => { let mockedState; diff --git a/spec/frontend/frequent_items/store/mutations_spec.js b/spec/frontend/frequent_items/store/mutations_spec.js index d36964b2600..e593c9fae58 100644 --- a/spec/frontend/frequent_items/store/mutations_spec.js +++ b/spec/frontend/frequent_items/store/mutations_spec.js @@ -1,6 +1,6 @@ -import state from '~/frequent_items/store/state'; -import mutations from '~/frequent_items/store/mutations'; import * as types from '~/frequent_items/store/mutation_types'; +import mutations from '~/frequent_items/store/mutations'; +import state from '~/frequent_items/store/state'; import { mockNamespace, mockStorageKey, diff --git a/spec/frontend/frequent_items/utils_spec.js b/spec/frontend/frequent_items/utils_spec.js index 181dd9268dc..a7ab18b0d10 100644 --- a/spec/frontend/frequent_items/utils_spec.js +++ b/spec/frontend/frequent_items/utils_spec.js @@ -1,11 +1,11 @@ import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; +import { HOUR_IN_MS, FREQUENT_ITEMS } from '~/frequent_items/constants'; import { isMobile, getTopFrequentItems, updateExistingFrequentItem, sanitizeItem, } from '~/frequent_items/utils'; -import { HOUR_IN_MS, FREQUENT_ITEMS } from '~/frequent_items/constants'; import { mockProject, unsortedFrequentItems, sortedFrequentItems } from './mock_data'; describe('Frequent Items utils spec', () => { diff --git a/spec/frontend/gfm_auto_complete_spec.js b/spec/frontend/gfm_auto_complete_spec.js index df781dc9467..810e060e46b 100644 --- a/spec/frontend/gfm_auto_complete_spec.js +++ b/spec/frontend/gfm_auto_complete_spec.js @@ -1,12 +1,12 @@ /* eslint no-param-reassign: "off" */ -import $ from 'jquery'; import MockAdapter from 'axios-mock-adapter'; +import $ from 'jquery'; import { initEmojiMock } from 'helpers/emoji'; import '~/lib/utils/jquery_at_who'; import GfmAutoComplete, { membersBeforeSave } from 'ee_else_ce/gfm_auto_complete'; -import { TEST_HOST } from 'helpers/test_constants'; import { getJSONFixture } from 'helpers/fixtures'; +import { TEST_HOST } from 'helpers/test_constants'; import waitForPromises from 'helpers/wait_for_promises'; import AjaxCache from '~/lib/utils/ajax_cache'; import axios from '~/lib/utils/axios_utils'; diff --git a/spec/frontend/gl_form_spec.js b/spec/frontend/gl_form_spec.js index d9a01f7bcc1..07487fbb60e 100644 --- a/spec/frontend/gl_form_spec.js +++ b/spec/frontend/gl_form_spec.js @@ -1,5 +1,5 @@ -import $ from 'jquery'; import autosize from 'autosize'; +import $ from 'jquery'; import GLForm from '~/gl_form'; import '~/lib/utils/text_utility'; import '~/lib/utils/common_utils'; diff --git a/spec/frontend/gpg_badges_spec.js b/spec/frontend/gpg_badges_spec.js index 7c1f83e577c..cd2cc88fa5a 100644 --- a/spec/frontend/gpg_badges_spec.js +++ b/spec/frontend/gpg_badges_spec.js @@ -1,7 +1,7 @@ import MockAdapter from 'axios-mock-adapter'; import { TEST_HOST } from 'spec/test_constants'; -import axios from '~/lib/utils/axios_utils'; import GpgBadges from '~/gpg_badges'; +import axios from '~/lib/utils/axios_utils'; describe('GpgBadges', () => { let mock; diff --git a/spec/frontend/grafana_integration/components/grafana_integration_spec.js b/spec/frontend/grafana_integration/components/grafana_integration_spec.js index df88a336c09..ad1260d8030 100644 --- a/spec/frontend/grafana_integration/components/grafana_integration_spec.js +++ b/spec/frontend/grafana_integration/components/grafana_integration_spec.js @@ -1,11 +1,11 @@ -import { mount, shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { mount, shallowMount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import GrafanaIntegration from '~/grafana_integration/components/grafana_integration.vue'; import { createStore } from '~/grafana_integration/store'; import axios from '~/lib/utils/axios_utils'; import { refreshCurrentPage } from '~/lib/utils/url_utility'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; jest.mock('~/lib/utils/url_utility'); jest.mock('~/flash'); diff --git a/spec/frontend/group_settings/components/shared_runners_form_spec.js b/spec/frontend/group_settings/components/shared_runners_form_spec.js index 4ec739122c8..78950a8fe20 100644 --- a/spec/frontend/group_settings/components/shared_runners_form_spec.js +++ b/spec/frontend/group_settings/components/shared_runners_form_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon, GlAlert } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import MockAxiosAdapter from 'axios-mock-adapter'; import waitForPromises from 'helpers/wait_for_promises'; import SharedRunnersForm from '~/group_settings/components/shared_runners_form.vue'; diff --git a/spec/frontend/groups/components/app_spec.js b/spec/frontend/groups/components/app_spec.js index 9680fa8bfd2..e559c9519f2 100644 --- a/spec/frontend/groups/components/app_spec.js +++ b/spec/frontend/groups/components/app_spec.js @@ -1,16 +1,16 @@ import '~/flash'; -import Vue from 'vue'; -import AxiosMockAdapter from 'axios-mock-adapter'; import { GlModal, GlLoadingIcon } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; +import AxiosMockAdapter from 'axios-mock-adapter'; +import Vue from 'vue'; import waitForPromises from 'helpers/wait_for_promises'; -import axios from '~/lib/utils/axios_utils'; import appComponent from '~/groups/components/app.vue'; import groupFolderComponent from '~/groups/components/group_folder.vue'; import groupItemComponent from '~/groups/components/group_item.vue'; import eventHub from '~/groups/event_hub'; -import GroupsStore from '~/groups/store/groups_store'; import GroupsService from '~/groups/service/groups_service'; +import GroupsStore from '~/groups/store/groups_store'; +import axios from '~/lib/utils/axios_utils'; import * as urlUtilities from '~/lib/utils/url_utility'; import { diff --git a/spec/frontend/groups/components/group_item_spec.js b/spec/frontend/groups/components/group_item_spec.js index c80f9a83fc4..4fcc9bafa46 100644 --- a/spec/frontend/groups/components/group_item_spec.js +++ b/spec/frontend/groups/components/group_item_spec.js @@ -1,9 +1,9 @@ import Vue from 'vue'; import mountComponent from 'helpers/vue_mount_component_helper'; -import groupItemComponent from '~/groups/components/group_item.vue'; import groupFolderComponent from '~/groups/components/group_folder.vue'; -import { getGroupItemMicrodata } from '~/groups/store/utils'; +import groupItemComponent from '~/groups/components/group_item.vue'; import eventHub from '~/groups/event_hub'; +import { getGroupItemMicrodata } from '~/groups/store/utils'; import * as urlUtilities from '~/lib/utils/url_utility'; import { mockParentGroupItem, mockChildren } from '../mock_data'; diff --git a/spec/frontend/groups/components/groups_spec.js b/spec/frontend/groups/components/groups_spec.js index 1fde8fa3d6e..dc1a10639fc 100644 --- a/spec/frontend/groups/components/groups_spec.js +++ b/spec/frontend/groups/components/groups_spec.js @@ -1,9 +1,9 @@ import Vue from 'vue'; import mountComponent from 'helpers/vue_mount_component_helper'; -import groupsComponent from '~/groups/components/groups.vue'; import groupFolderComponent from '~/groups/components/group_folder.vue'; import groupItemComponent from '~/groups/components/group_item.vue'; +import groupsComponent from '~/groups/components/groups.vue'; import eventHub from '~/groups/event_hub'; import { mockGroups, mockPageInfo } from '../mock_data'; diff --git a/spec/frontend/groups/components/invite_members_banner_spec.js b/spec/frontend/groups/components/invite_members_banner_spec.js index 4e69f3cd433..9a2068a27a1 100644 --- a/spec/frontend/groups/components/invite_members_banner_spec.js +++ b/spec/frontend/groups/components/invite_members_banner_spec.js @@ -1,8 +1,8 @@ -import { shallowMount } from '@vue/test-utils'; import { GlBanner, GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { mockTracking, unmockTracking } from 'helpers/tracking_helper'; -import { setCookie, parseBoolean } from '~/lib/utils/common_utils'; import InviteMembersBanner from '~/groups/components/invite_members_banner.vue'; +import { setCookie, parseBoolean } from '~/lib/utils/common_utils'; jest.mock('~/lib/utils/common_utils'); diff --git a/spec/frontend/groups/components/item_caret_spec.js b/spec/frontend/groups/components/item_caret_spec.js index b2915607a06..cbe1f21d6e2 100644 --- a/spec/frontend/groups/components/item_caret_spec.js +++ b/spec/frontend/groups/components/item_caret_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import ItemCaret from '~/groups/components/item_caret.vue'; describe('ItemCaret', () => { diff --git a/spec/frontend/groups/components/item_stats_value_spec.js b/spec/frontend/groups/components/item_stats_value_spec.js index bca233883af..98186120a81 100644 --- a/spec/frontend/groups/components/item_stats_value_spec.js +++ b/spec/frontend/groups/components/item_stats_value_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import ItemStatsValue from '~/groups/components/item_stats_value.vue'; describe('ItemStatsValue', () => { diff --git a/spec/frontend/groups/components/item_type_icon_spec.js b/spec/frontend/groups/components/item_type_icon_spec.js index 5e7056be218..9310943841e 100644 --- a/spec/frontend/groups/components/item_type_icon_spec.js +++ b/spec/frontend/groups/components/item_type_icon_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import ItemTypeIcon from '~/groups/components/item_type_icon.vue'; import { ITEM_TYPE } from '../mock_data'; diff --git a/spec/frontend/groups/service/groups_service_spec.js b/spec/frontend/groups/service/groups_service_spec.js index 38a565eba01..e037a6df1e2 100644 --- a/spec/frontend/groups/service/groups_service_spec.js +++ b/spec/frontend/groups/service/groups_service_spec.js @@ -1,6 +1,6 @@ +import GroupsService from '~/groups/service/groups_service'; import axios from '~/lib/utils/axios_utils'; -import GroupsService from '~/groups/service/groups_service'; import { mockEndpoint, mockParentGroupItem } from '../mock_data'; describe('GroupsService', () => { diff --git a/spec/frontend/ide/commit_icon_spec.js b/spec/frontend/ide/commit_icon_spec.js index 0dfcae00298..3acdfec5393 100644 --- a/spec/frontend/ide/commit_icon_spec.js +++ b/spec/frontend/ide/commit_icon_spec.js @@ -1,6 +1,6 @@ +import getCommitIconMap from '~/ide/commit_icon'; import { commitItemIconMap } from '~/ide/constants'; import { decorateData } from '~/ide/stores/utils'; -import getCommitIconMap from '~/ide/commit_icon'; const createFile = (name = 'name', id = name, type = '', parent = null) => decorateData({ diff --git a/spec/frontend/ide/components/activity_bar_spec.js b/spec/frontend/ide/components/activity_bar_spec.js index 6ea823ce4b5..657817eb3d8 100644 --- a/spec/frontend/ide/components/activity_bar_spec.js +++ b/spec/frontend/ide/components/activity_bar_spec.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import { createComponentWithStore } from 'helpers/vue_mount_component_helper'; -import { createStore } from '~/ide/stores'; -import { leftSidebarViews } from '~/ide/constants'; import ActivityBar from '~/ide/components/activity_bar.vue'; +import { leftSidebarViews } from '~/ide/constants'; +import { createStore } from '~/ide/stores'; describe('IDE activity bar', () => { const Component = Vue.extend(ActivityBar); diff --git a/spec/frontend/ide/components/branches/item_spec.js b/spec/frontend/ide/components/branches/item_spec.js index f1aa9187a8d..f90c298c401 100644 --- a/spec/frontend/ide/components/branches/item_spec.js +++ b/spec/frontend/ide/components/branches/item_spec.js @@ -1,8 +1,8 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; -import { createStore } from '~/ide/stores'; -import { createRouter } from '~/ide/ide_router'; +import { shallowMount } from '@vue/test-utils'; import Item from '~/ide/components/branches/item.vue'; +import { createRouter } from '~/ide/ide_router'; +import { createStore } from '~/ide/stores'; import Timeago from '~/vue_shared/components/time_ago_tooltip.vue'; import { projectData } from '../../mock_data'; diff --git a/spec/frontend/ide/components/branches/search_list_spec.js b/spec/frontend/ide/components/branches/search_list_spec.js index 85776f8cc0e..0efa7af2c6c 100644 --- a/spec/frontend/ide/components/branches/search_list_spec.js +++ b/spec/frontend/ide/components/branches/search_list_spec.js @@ -1,9 +1,9 @@ +import { GlLoadingIcon } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlLoadingIcon } from '@gitlab/ui'; -import { __ } from '~/locale'; -import List from '~/ide/components/branches/search_list.vue'; import Item from '~/ide/components/branches/item.vue'; +import List from '~/ide/components/branches/search_list.vue'; +import { __ } from '~/locale'; import { branches } from '../../mock_data'; const localVue = createLocalVue(); diff --git a/spec/frontend/ide/components/commit_sidebar/actions_spec.js b/spec/frontend/ide/components/commit_sidebar/actions_spec.js index 596b5e81b2a..c4dccf26af3 100644 --- a/spec/frontend/ide/components/commit_sidebar/actions_spec.js +++ b/spec/frontend/ide/components/commit_sidebar/actions_spec.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import { createComponentWithStore } from 'helpers/vue_mount_component_helper'; import { projectData, branches } from 'jest/ide/mock_data'; -import { createStore } from '~/ide/stores'; import commitActions from '~/ide/components/commit_sidebar/actions.vue'; +import { createStore } from '~/ide/stores'; import { COMMIT_TO_NEW_BRANCH, COMMIT_TO_CURRENT_BRANCH, diff --git a/spec/frontend/ide/components/commit_sidebar/editor_header_spec.js b/spec/frontend/ide/components/commit_sidebar/editor_header_spec.js index ff780939026..50635ffe894 100644 --- a/spec/frontend/ide/components/commit_sidebar/editor_header_spec.js +++ b/spec/frontend/ide/components/commit_sidebar/editor_header_spec.js @@ -1,7 +1,7 @@ -import Vuex from 'vuex'; import { mount, createLocalVue } from '@vue/test-utils'; -import { createStore } from '~/ide/stores'; +import Vuex from 'vuex'; import EditorHeader from '~/ide/components/commit_sidebar/editor_header.vue'; +import { createStore } from '~/ide/stores'; import { file } from '../../helpers'; const localVue = createLocalVue(); diff --git a/spec/frontend/ide/components/commit_sidebar/empty_state_spec.js b/spec/frontend/ide/components/commit_sidebar/empty_state_spec.js index c1dab4a04b6..4f81c0aa5d3 100644 --- a/spec/frontend/ide/components/commit_sidebar/empty_state_spec.js +++ b/spec/frontend/ide/components/commit_sidebar/empty_state_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import { createComponentWithStore } from 'helpers/vue_mount_component_helper'; -import { createStore } from '~/ide/stores'; import emptyState from '~/ide/components/commit_sidebar/empty_state.vue'; +import { createStore } from '~/ide/stores'; describe('IDE commit panel empty state', () => { let vm; diff --git a/spec/frontend/ide/components/commit_sidebar/form_spec.js b/spec/frontend/ide/components/commit_sidebar/form_spec.js index 857d8f400a7..2b567816ce8 100644 --- a/spec/frontend/ide/components/commit_sidebar/form_spec.js +++ b/spec/frontend/ide/components/commit_sidebar/form_spec.js @@ -1,12 +1,10 @@ -import Vue from 'vue'; -import { shallowMount } from '@vue/test-utils'; import { GlModal } from '@gitlab/ui'; -import { projectData } from 'jest/ide/mock_data'; +import { shallowMount } from '@vue/test-utils'; +import Vue from 'vue'; import { stubComponent } from 'helpers/stub_component'; -import waitForPromises from 'helpers/wait_for_promises'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; -import { createStore } from '~/ide/stores'; -import { COMMIT_TO_NEW_BRANCH } from '~/ide/stores/modules/commit/constants'; +import waitForPromises from 'helpers/wait_for_promises'; +import { projectData } from 'jest/ide/mock_data'; import CommitForm from '~/ide/components/commit_sidebar/form.vue'; import CommitMessageField from '~/ide/components/commit_sidebar/message_field.vue'; import { leftSidebarViews } from '~/ide/constants'; @@ -16,6 +14,8 @@ import { createBranchChangedCommitError, branchAlreadyExistsCommitError, } from '~/ide/lib/errors'; +import { createStore } from '~/ide/stores'; +import { COMMIT_TO_NEW_BRANCH } from '~/ide/stores/modules/commit/constants'; describe('IDE commit form', () => { let wrapper; diff --git a/spec/frontend/ide/components/commit_sidebar/list_item_spec.js b/spec/frontend/ide/components/commit_sidebar/list_item_spec.js index baa25a11c2a..b91ee88e0d6 100644 --- a/spec/frontend/ide/components/commit_sidebar/list_item_spec.js +++ b/spec/frontend/ide/components/commit_sidebar/list_item_spec.js @@ -1,9 +1,9 @@ import Vue from 'vue'; import { trimText } from 'helpers/text_helper'; import { createComponentWithStore } from 'helpers/vue_mount_component_helper'; -import { createStore } from '~/ide/stores'; import listItem from '~/ide/components/commit_sidebar/list_item.vue'; import { createRouter } from '~/ide/ide_router'; +import { createStore } from '~/ide/stores'; import { file } from '../../helpers'; describe('Multi-file editor commit sidebar list item', () => { diff --git a/spec/frontend/ide/components/commit_sidebar/list_spec.js b/spec/frontend/ide/components/commit_sidebar/list_spec.js index 898ec4bebce..eb12fc994a5 100644 --- a/spec/frontend/ide/components/commit_sidebar/list_spec.js +++ b/spec/frontend/ide/components/commit_sidebar/list_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import { createComponentWithStore } from 'helpers/vue_mount_component_helper'; -import { createStore } from '~/ide/stores'; import commitSidebarList from '~/ide/components/commit_sidebar/list.vue'; +import { createStore } from '~/ide/stores'; import { file } from '../../helpers'; describe('Multi-file editor commit sidebar list', () => { diff --git a/spec/frontend/ide/components/commit_sidebar/new_merge_request_option_spec.js b/spec/frontend/ide/components/commit_sidebar/new_merge_request_option_spec.js index f8ab7aa4d0f..253c2a426ee 100644 --- a/spec/frontend/ide/components/commit_sidebar/new_merge_request_option_spec.js +++ b/spec/frontend/ide/components/commit_sidebar/new_merge_request_option_spec.js @@ -2,8 +2,8 @@ import Vue from 'vue'; import { createComponentWithStore } from 'helpers/vue_mount_component_helper'; import { projectData, branches } from 'jest/ide/mock_data'; import NewMergeRequestOption from '~/ide/components/commit_sidebar/new_merge_request_option.vue'; -import { createStore } from '~/ide/stores'; import { PERMISSION_CREATE_MR } from '~/ide/constants'; +import { createStore } from '~/ide/stores'; import { COMMIT_TO_CURRENT_BRANCH, COMMIT_TO_NEW_BRANCH, diff --git a/spec/frontend/ide/components/commit_sidebar/radio_group_spec.js b/spec/frontend/ide/components/commit_sidebar/radio_group_spec.js index 73d811f99b8..a6f3253321b 100644 --- a/spec/frontend/ide/components/commit_sidebar/radio_group_spec.js +++ b/spec/frontend/ide/components/commit_sidebar/radio_group_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import { createComponentWithStore } from 'helpers/vue_mount_component_helper'; -import { createStore } from '~/ide/stores'; import radioGroup from '~/ide/components/commit_sidebar/radio_group.vue'; +import { createStore } from '~/ide/stores'; describe('IDE commit sidebar radio group', () => { let vm; diff --git a/spec/frontend/ide/components/commit_sidebar/success_message_spec.js b/spec/frontend/ide/components/commit_sidebar/success_message_spec.js index b116321efb3..7bbe47d37af 100644 --- a/spec/frontend/ide/components/commit_sidebar/success_message_spec.js +++ b/spec/frontend/ide/components/commit_sidebar/success_message_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import { createComponentWithStore } from 'helpers/vue_mount_component_helper'; -import { createStore } from '~/ide/stores'; import successMessage from '~/ide/components/commit_sidebar/success_message.vue'; +import { createStore } from '~/ide/stores'; describe('IDE commit panel successful commit state', () => { let vm; diff --git a/spec/frontend/ide/components/error_message_spec.js b/spec/frontend/ide/components/error_message_spec.js index fa6816d3546..2de3fa863a8 100644 --- a/spec/frontend/ide/components/error_message_spec.js +++ b/spec/frontend/ide/components/error_message_spec.js @@ -1,6 +1,6 @@ +import { GlLoadingIcon } from '@gitlab/ui'; import { mount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlLoadingIcon } from '@gitlab/ui'; import ErrorMessage from '~/ide/components/error_message.vue'; const localVue = createLocalVue(); diff --git a/spec/frontend/ide/components/file_row_extra_spec.js b/spec/frontend/ide/components/file_row_extra_spec.js index 275b98bc154..641407c7b77 100644 --- a/spec/frontend/ide/components/file_row_extra_spec.js +++ b/spec/frontend/ide/components/file_row_extra_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import { createComponentWithStore } from 'helpers/vue_mount_component_helper'; -import { createStore } from '~/ide/stores'; import FileRowExtra from '~/ide/components/file_row_extra.vue'; +import { createStore } from '~/ide/stores'; import { file } from '../helpers'; describe('IDE extra file row component', () => { diff --git a/spec/frontend/ide/components/file_templates/bar_spec.js b/spec/frontend/ide/components/file_templates/bar_spec.js index 158995c9c9c..4ca99f8d055 100644 --- a/spec/frontend/ide/components/file_templates/bar_spec.js +++ b/spec/frontend/ide/components/file_templates/bar_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import { mountComponentWithStore } from 'helpers/vue_mount_component_helper'; -import { createStore } from '~/ide/stores'; import Bar from '~/ide/components/file_templates/bar.vue'; +import { createStore } from '~/ide/stores'; import { file } from '../../helpers'; describe('IDE file templates bar component', () => { diff --git a/spec/frontend/ide/components/file_templates/dropdown_spec.js b/spec/frontend/ide/components/file_templates/dropdown_spec.js index 628580103a4..44ac9aa954d 100644 --- a/spec/frontend/ide/components/file_templates/dropdown_spec.js +++ b/spec/frontend/ide/components/file_templates/dropdown_spec.js @@ -1,7 +1,7 @@ -import Vuex from 'vuex'; -import $ from 'jquery'; import { GlLoadingIcon } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import $ from 'jquery'; +import Vuex from 'vuex'; import Dropdown from '~/ide/components/file_templates/dropdown.vue'; const localVue = createLocalVue(); diff --git a/spec/frontend/ide/components/ide_file_row_spec.js b/spec/frontend/ide/components/ide_file_row_spec.js index c00ad7c8365..20c105460f2 100644 --- a/spec/frontend/ide/components/ide_file_row_spec.js +++ b/spec/frontend/ide/components/ide_file_row_spec.js @@ -1,9 +1,9 @@ import { createLocalVue, mount } from '@vue/test-utils'; import Vuex from 'vuex'; -import IdeFileRow from '~/ide/components/ide_file_row.vue'; -import FileRow from '~/vue_shared/components/file_row.vue'; import FileRowExtra from '~/ide/components/file_row_extra.vue'; +import IdeFileRow from '~/ide/components/ide_file_row.vue'; import { createStore } from '~/ide/stores'; +import FileRow from '~/vue_shared/components/file_row.vue'; const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/spec/frontend/ide/components/ide_review_spec.js b/spec/frontend/ide/components/ide_review_spec.js index 37f34a96495..740b7ada521 100644 --- a/spec/frontend/ide/components/ide_review_spec.js +++ b/spec/frontend/ide/components/ide_review_spec.js @@ -1,10 +1,10 @@ +import { createLocalVue, mount } from '@vue/test-utils'; import Vue from 'vue'; import Vuex from 'vuex'; -import { createLocalVue, mount } from '@vue/test-utils'; -import { trimText } from 'helpers/text_helper'; import { keepAlive } from 'helpers/keep_alive_component_helper'; -import IdeReview from '~/ide/components/ide_review.vue'; +import { trimText } from 'helpers/text_helper'; import EditorModeDropdown from '~/ide/components/editor_mode_dropdown.vue'; +import IdeReview from '~/ide/components/ide_review.vue'; import { createStore } from '~/ide/stores'; import { file } from '../helpers'; import { projectData } from '../mock_data'; diff --git a/spec/frontend/ide/components/ide_side_bar_spec.js b/spec/frontend/ide/components/ide_side_bar_spec.js index 72e9463945b..c683612b142 100644 --- a/spec/frontend/ide/components/ide_side_bar_spec.js +++ b/spec/frontend/ide/components/ide_side_bar_spec.js @@ -1,13 +1,13 @@ +import { GlSkeletonLoading } from '@gitlab/ui'; import { mount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlSkeletonLoading } from '@gitlab/ui'; import waitForPromises from 'helpers/wait_for_promises'; -import { createStore } from '~/ide/stores'; +import IdeReview from '~/ide/components/ide_review.vue'; import IdeSidebar from '~/ide/components/ide_side_bar.vue'; import IdeTree from '~/ide/components/ide_tree.vue'; import RepoCommitSection from '~/ide/components/repo_commit_section.vue'; -import IdeReview from '~/ide/components/ide_review.vue'; import { leftSidebarViews } from '~/ide/constants'; +import { createStore } from '~/ide/stores'; import { projectData } from '../mock_data'; const localVue = createLocalVue(); diff --git a/spec/frontend/ide/components/ide_sidebar_nav_spec.js b/spec/frontend/ide/components/ide_sidebar_nav_spec.js index 841e19532a1..2ea0c250794 100644 --- a/spec/frontend/ide/components/ide_sidebar_nav_spec.js +++ b/spec/frontend/ide/components/ide_sidebar_nav_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import IdeSidebarNav from '~/ide/components/ide_sidebar_nav.vue'; import { SIDE_RIGHT, SIDE_LEFT } from '~/ide/constants'; diff --git a/spec/frontend/ide/components/ide_spec.js b/spec/frontend/ide/components/ide_spec.js index ef8c55c8b1c..c9d19c18d03 100644 --- a/spec/frontend/ide/components/ide_spec.js +++ b/spec/frontend/ide/components/ide_spec.js @@ -1,10 +1,10 @@ -import Vuex from 'vuex'; -import { createLocalVue, shallowMount } from '@vue/test-utils'; import { GlAlert } from '@gitlab/ui'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; +import Vuex from 'vuex'; import waitForPromises from 'helpers/wait_for_promises'; -import { createStore } from '~/ide/stores'; import ErrorMessage from '~/ide/components/error_message.vue'; import Ide from '~/ide/components/ide.vue'; +import { createStore } from '~/ide/stores'; import { file } from '../helpers'; import { projectData } from '../mock_data'; diff --git a/spec/frontend/ide/components/ide_status_bar_spec.js b/spec/frontend/ide/components/ide_status_bar_spec.js index 47506bb87e8..9d33a1e2554 100644 --- a/spec/frontend/ide/components/ide_status_bar_spec.js +++ b/spec/frontend/ide/components/ide_status_bar_spec.js @@ -1,10 +1,10 @@ -import Vue from 'vue'; import _ from 'lodash'; -import { createComponentWithStore } from 'helpers/vue_mount_component_helper'; +import Vue from 'vue'; import { TEST_HOST } from 'helpers/test_constants'; -import { createStore } from '~/ide/stores'; +import { createComponentWithStore } from 'helpers/vue_mount_component_helper'; import IdeStatusBar from '~/ide/components/ide_status_bar.vue'; import { rightSidebarViews } from '~/ide/constants'; +import { createStore } from '~/ide/stores'; import { projectData } from '../mock_data'; const TEST_PROJECT_ID = 'abcproject'; diff --git a/spec/frontend/ide/components/ide_status_list_spec.js b/spec/frontend/ide/components/ide_status_list_spec.js index 02b5dc19bd8..036edfb3ec1 100644 --- a/spec/frontend/ide/components/ide_status_list_spec.js +++ b/spec/frontend/ide/components/ide_status_list_spec.js @@ -1,6 +1,6 @@ -import Vuex from 'vuex'; -import { createLocalVue, shallowMount } from '@vue/test-utils'; import { GlLink } from '@gitlab/ui'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; +import Vuex from 'vuex'; import IdeStatusList from '~/ide/components/ide_status_list.vue'; import TerminalSyncStatusSafe from '~/ide/components/terminal_sync/terminal_sync_status_safe.vue'; diff --git a/spec/frontend/ide/components/ide_status_mr_spec.js b/spec/frontend/ide/components/ide_status_mr_spec.js index ac1be4b21c0..0526d4653f8 100644 --- a/spec/frontend/ide/components/ide_status_mr_spec.js +++ b/spec/frontend/ide/components/ide_status_mr_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon, GlLink } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; import IdeStatusMr from '~/ide/components/ide_status_mr.vue'; diff --git a/spec/frontend/ide/components/ide_tree_spec.js b/spec/frontend/ide/components/ide_tree_spec.js index c5934b032c4..6eef646b012 100644 --- a/spec/frontend/ide/components/ide_tree_spec.js +++ b/spec/frontend/ide/components/ide_tree_spec.js @@ -1,6 +1,6 @@ +import { mount, createLocalVue } from '@vue/test-utils'; import Vue from 'vue'; import Vuex from 'vuex'; -import { mount, createLocalVue } from '@vue/test-utils'; import { keepAlive } from 'helpers/keep_alive_component_helper'; import IdeTree from '~/ide/components/ide_tree.vue'; import { createStore } from '~/ide/stores'; diff --git a/spec/frontend/ide/components/jobs/detail/scroll_button_spec.js b/spec/frontend/ide/components/jobs/detail/scroll_button_spec.js index b323ad8320c..d632a34266a 100644 --- a/spec/frontend/ide/components/jobs/detail/scroll_button_spec.js +++ b/spec/frontend/ide/components/jobs/detail/scroll_button_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import ScrollButton from '~/ide/components/jobs/detail/scroll_button.vue'; describe('IDE job log scroll button', () => { diff --git a/spec/frontend/ide/components/jobs/list_spec.js b/spec/frontend/ide/components/jobs/list_spec.js index 5c5c6602374..8797e07aef1 100644 --- a/spec/frontend/ide/components/jobs/list_spec.js +++ b/spec/frontend/ide/components/jobs/list_spec.js @@ -1,5 +1,5 @@ -import { shallowMount, mount, createLocalVue } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount, mount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; import StageList from '~/ide/components/jobs/list.vue'; import Stage from '~/ide/components/jobs/stage.vue'; diff --git a/spec/frontend/ide/components/jobs/stage_spec.js b/spec/frontend/ide/components/jobs/stage_spec.js index e80215b9d13..9accd81a2ba 100644 --- a/spec/frontend/ide/components/jobs/stage_spec.js +++ b/spec/frontend/ide/components/jobs/stage_spec.js @@ -1,7 +1,7 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; -import Stage from '~/ide/components/jobs/stage.vue'; +import { shallowMount } from '@vue/test-utils'; import Item from '~/ide/components/jobs/item.vue'; +import Stage from '~/ide/components/jobs/stage.vue'; import { stages, jobs } from '../../mock_data'; describe('IDE pipeline stage', () => { diff --git a/spec/frontend/ide/components/merge_requests/item_spec.js b/spec/frontend/ide/components/merge_requests/item_spec.js index 20adaa7abbc..f0a97a0b10a 100644 --- a/spec/frontend/ide/components/merge_requests/item_spec.js +++ b/spec/frontend/ide/components/merge_requests/item_spec.js @@ -1,8 +1,8 @@ -import Vuex from 'vuex'; import { mount, createLocalVue } from '@vue/test-utils'; -import { createStore } from '~/ide/stores'; -import { createRouter } from '~/ide/ide_router'; +import Vuex from 'vuex'; import Item from '~/ide/components/merge_requests/item.vue'; +import { createRouter } from '~/ide/ide_router'; +import { createStore } from '~/ide/stores'; const TEST_ITEM = { iid: 1, diff --git a/spec/frontend/ide/components/merge_requests/list_spec.js b/spec/frontend/ide/components/merge_requests/list_spec.js index f0ac852fa67..85acabca38b 100644 --- a/spec/frontend/ide/components/merge_requests/list_spec.js +++ b/spec/frontend/ide/components/merge_requests/list_spec.js @@ -1,8 +1,8 @@ +import { GlLoadingIcon } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlLoadingIcon } from '@gitlab/ui'; -import List from '~/ide/components/merge_requests/list.vue'; import Item from '~/ide/components/merge_requests/item.vue'; +import List from '~/ide/components/merge_requests/list.vue'; import TokenedInput from '~/ide/components/shared/tokened_input.vue'; import { mergeRequests as mergeRequestsMock } from '../../mock_data'; diff --git a/spec/frontend/ide/components/nav_dropdown_spec.js b/spec/frontend/ide/components/nav_dropdown_spec.js index 12a1a4c8013..4ddb3930764 100644 --- a/spec/frontend/ide/components/nav_dropdown_spec.js +++ b/spec/frontend/ide/components/nav_dropdown_spec.js @@ -1,8 +1,8 @@ -import $ from 'jquery'; import { mount } from '@vue/test-utils'; -import { createStore } from '~/ide/stores'; +import $ from 'jquery'; import NavDropdown from '~/ide/components/nav_dropdown.vue'; import { PERMISSION_READ_MR } from '~/ide/constants'; +import { createStore } from '~/ide/stores'; const TEST_PROJECT_ID = 'lorem-ipsum'; diff --git a/spec/frontend/ide/components/new_dropdown/index_spec.js b/spec/frontend/ide/components/new_dropdown/index_spec.js index 793d950b3e0..5a1c0471206 100644 --- a/spec/frontend/ide/components/new_dropdown/index_spec.js +++ b/spec/frontend/ide/components/new_dropdown/index_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import { createComponentWithStore } from 'helpers/vue_mount_component_helper'; -import { createStore } from '~/ide/stores'; import newDropdown from '~/ide/components/new_dropdown/index.vue'; +import { createStore } from '~/ide/stores'; describe('new dropdown component', () => { let store; diff --git a/spec/frontend/ide/components/new_dropdown/modal_spec.js b/spec/frontend/ide/components/new_dropdown/modal_spec.js index 06434081e39..0600fcea917 100644 --- a/spec/frontend/ide/components/new_dropdown/modal_spec.js +++ b/spec/frontend/ide/components/new_dropdown/modal_spec.js @@ -1,8 +1,8 @@ import Vue from 'vue'; import { createComponentWithStore } from 'helpers/vue_mount_component_helper'; -import { createStore } from '~/ide/stores'; -import modal from '~/ide/components/new_dropdown/modal.vue'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import modal from '~/ide/components/new_dropdown/modal.vue'; +import { createStore } from '~/ide/stores'; jest.mock('~/flash'); diff --git a/spec/frontend/ide/components/panes/collapsible_sidebar_spec.js b/spec/frontend/ide/components/panes/collapsible_sidebar_spec.js index c3da2a46858..7216f50b05c 100644 --- a/spec/frontend/ide/components/panes/collapsible_sidebar_spec.js +++ b/spec/frontend/ide/components/panes/collapsible_sidebar_spec.js @@ -1,9 +1,9 @@ import { createLocalVue, shallowMount } from '@vue/test-utils'; import Vuex from 'vuex'; +import IdeSidebarNav from '~/ide/components/ide_sidebar_nav.vue'; +import CollapsibleSidebar from '~/ide/components/panes/collapsible_sidebar.vue'; import { createStore } from '~/ide/stores'; import paneModule from '~/ide/stores/modules/pane'; -import CollapsibleSidebar from '~/ide/components/panes/collapsible_sidebar.vue'; -import IdeSidebarNav from '~/ide/components/ide_sidebar_nav.vue'; const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/spec/frontend/ide/components/panes/right_spec.js b/spec/frontend/ide/components/panes/right_spec.js index 57fd0e49e94..c6231d129ff 100644 --- a/spec/frontend/ide/components/panes/right_spec.js +++ b/spec/frontend/ide/components/panes/right_spec.js @@ -1,10 +1,10 @@ +import { createLocalVue, shallowMount } from '@vue/test-utils'; import Vue from 'vue'; import Vuex from 'vuex'; -import { createLocalVue, shallowMount } from '@vue/test-utils'; -import { createStore } from '~/ide/stores'; -import RightPane from '~/ide/components/panes/right.vue'; import CollapsibleSidebar from '~/ide/components/panes/collapsible_sidebar.vue'; +import RightPane from '~/ide/components/panes/right.vue'; import { rightSidebarViews } from '~/ide/constants'; +import { createStore } from '~/ide/stores'; import extendStore from '~/ide/stores/extend'; const localVue = createLocalVue(); diff --git a/spec/frontend/ide/components/pipelines/list_spec.js b/spec/frontend/ide/components/pipelines/list_spec.js index a1fbfd96c31..58d8c0629fb 100644 --- a/spec/frontend/ide/components/pipelines/list_spec.js +++ b/spec/frontend/ide/components/pipelines/list_spec.js @@ -1,13 +1,13 @@ +import { GlLoadingIcon, GlTab } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import Vue from 'vue'; import Vuex from 'vuex'; -import { GlLoadingIcon, GlTab } from '@gitlab/ui'; import { TEST_HOST } from 'helpers/test_constants'; import { pipelines } from 'jest/ide/mock_data'; -import List from '~/ide/components/pipelines/list.vue'; import JobsList from '~/ide/components/jobs/list.vue'; -import CiIcon from '~/vue_shared/components/ci_icon.vue'; +import List from '~/ide/components/pipelines/list.vue'; import IDEServices from '~/ide/services'; +import CiIcon from '~/vue_shared/components/ci_icon.vue'; Vue.use(Vuex); diff --git a/spec/frontend/ide/components/preview/clientside_spec.js b/spec/frontend/ide/components/preview/clientside_spec.js index 220982e1fd9..1768f01f3b8 100644 --- a/spec/frontend/ide/components/preview/clientside_spec.js +++ b/spec/frontend/ide/components/preview/clientside_spec.js @@ -1,7 +1,7 @@ -import Vuex from 'vuex'; import { GlLoadingIcon } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import smooshpack from 'smooshpack'; +import Vuex from 'vuex'; import Clientside from '~/ide/components/preview/clientside.vue'; import eventHub from '~/ide/eventhub'; diff --git a/spec/frontend/ide/components/preview/navigator_spec.js b/spec/frontend/ide/components/preview/navigator_spec.js index e3272734755..ee760364c7e 100644 --- a/spec/frontend/ide/components/preview/navigator_spec.js +++ b/spec/frontend/ide/components/preview/navigator_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { listen } from 'codesandbox-api'; import { TEST_HOST } from 'helpers/test_constants'; import ClientsideNavigator from '~/ide/components/preview/navigator.vue'; diff --git a/spec/frontend/ide/components/repo_commit_section_spec.js b/spec/frontend/ide/components/repo_commit_section_spec.js index e91debee4ca..c174f5e2006 100644 --- a/spec/frontend/ide/components/repo_commit_section_spec.js +++ b/spec/frontend/ide/components/repo_commit_section_spec.js @@ -1,10 +1,10 @@ import { mount } from '@vue/test-utils'; import { keepAlive } from 'helpers/keep_alive_component_helper'; -import { createStore } from '~/ide/stores'; -import { createRouter } from '~/ide/ide_router'; -import RepoCommitSection from '~/ide/components/repo_commit_section.vue'; import EmptyState from '~/ide/components/commit_sidebar/empty_state.vue'; +import RepoCommitSection from '~/ide/components/repo_commit_section.vue'; import { stageKeys } from '~/ide/constants'; +import { createRouter } from '~/ide/ide_router'; +import { createStore } from '~/ide/stores'; import { file } from '../helpers'; const TEST_NO_CHANGES_SVG = 'nochangessvg'; diff --git a/spec/frontend/ide/components/repo_editor_spec.js b/spec/frontend/ide/components/repo_editor_spec.js index 89a7f423e34..52aad9b4b68 100644 --- a/spec/frontend/ide/components/repo_editor_spec.js +++ b/spec/frontend/ide/components/repo_editor_spec.js @@ -3,20 +3,20 @@ import Vue from 'vue'; import MockAdapter from 'axios-mock-adapter'; import '~/behaviors/markdown/render_gfm'; import { Range } from 'monaco-editor'; +import { createComponentWithStore } from 'helpers/vue_mount_component_helper'; import waitForPromises from 'helpers/wait_for_promises'; import waitUsingRealTimer from 'helpers/wait_using_real_timer'; -import { createComponentWithStore } from 'helpers/vue_mount_component_helper'; -import axios from '~/lib/utils/axios_utils'; -import service from '~/ide/services'; -import { createStoreOptions } from '~/ide/stores'; import RepoEditor from '~/ide/components/repo_editor.vue'; -import Editor from '~/ide/lib/editor'; import { leftSidebarViews, FILE_VIEW_MODE_EDITOR, FILE_VIEW_MODE_PREVIEW, viewerTypes, } from '~/ide/constants'; +import Editor from '~/ide/lib/editor'; +import service from '~/ide/services'; +import { createStoreOptions } from '~/ide/stores'; +import axios from '~/lib/utils/axios_utils'; import { file } from '../helpers'; import { exampleConfigs, exampleFiles } from '../lib/editorconfig/mock_data'; diff --git a/spec/frontend/ide/components/repo_tab_spec.js b/spec/frontend/ide/components/repo_tab_spec.js index a44c8b4d5ee..b39a488b034 100644 --- a/spec/frontend/ide/components/repo_tab_spec.js +++ b/spec/frontend/ide/components/repo_tab_spec.js @@ -1,8 +1,8 @@ import { mount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { createStore } from '~/ide/stores'; import RepoTab from '~/ide/components/repo_tab.vue'; import { createRouter } from '~/ide/ide_router'; +import { createStore } from '~/ide/stores'; import { file } from '../helpers'; const localVue = createLocalVue(); diff --git a/spec/frontend/ide/components/repo_tabs_spec.js b/spec/frontend/ide/components/repo_tabs_spec.js index 45a17c37667..6ee73b0a437 100644 --- a/spec/frontend/ide/components/repo_tabs_spec.js +++ b/spec/frontend/ide/components/repo_tabs_spec.js @@ -1,7 +1,7 @@ -import Vuex from 'vuex'; import { mount, createLocalVue } from '@vue/test-utils'; -import { createStore } from '~/ide/stores'; +import Vuex from 'vuex'; import RepoTabs from '~/ide/components/repo_tabs.vue'; +import { createStore } from '~/ide/stores'; import { file } from '../helpers'; const localVue = createLocalVue(); diff --git a/spec/frontend/ide/components/resizable_panel_spec.js b/spec/frontend/ide/components/resizable_panel_spec.js index b1a1212371e..6a5af52ea35 100644 --- a/spec/frontend/ide/components/resizable_panel_spec.js +++ b/spec/frontend/ide/components/resizable_panel_spec.js @@ -1,8 +1,8 @@ -import Vuex from 'vuex'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import ResizablePanel from '~/ide/components/resizable_panel.vue'; -import PanelResizer from '~/vue_shared/components/panel_resizer.vue'; import { SIDE_LEFT, SIDE_RIGHT } from '~/ide/constants'; +import PanelResizer from '~/vue_shared/components/panel_resizer.vue'; const TEST_WIDTH = 500; const TEST_MIN_WIDTH = 400; diff --git a/spec/frontend/ide/components/terminal/empty_state_spec.js b/spec/frontend/ide/components/terminal/empty_state_spec.js index b62470f67b6..57c816747aa 100644 --- a/spec/frontend/ide/components/terminal/empty_state_spec.js +++ b/spec/frontend/ide/components/terminal/empty_state_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon, GlButton, GlAlert } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { TEST_HOST } from 'spec/test_constants'; import TerminalEmptyState from '~/ide/components/terminal/empty_state.vue'; diff --git a/spec/frontend/ide/components/terminal/session_spec.js b/spec/frontend/ide/components/terminal/session_spec.js index 5653c8bf14d..5659a7d15da 100644 --- a/spec/frontend/ide/components/terminal/session_spec.js +++ b/spec/frontend/ide/components/terminal/session_spec.js @@ -1,5 +1,5 @@ -import { createLocalVue, shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; import Vuex from 'vuex'; import TerminalSession from '~/ide/components/terminal/session.vue'; import Terminal from '~/ide/components/terminal/terminal.vue'; diff --git a/spec/frontend/ide/components/terminal/terminal_controls_spec.js b/spec/frontend/ide/components/terminal/terminal_controls_spec.js index 99182710218..416096083f0 100644 --- a/spec/frontend/ide/components/terminal/terminal_controls_spec.js +++ b/spec/frontend/ide/components/terminal/terminal_controls_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; -import TerminalControls from '~/ide/components/terminal/terminal_controls.vue'; import ScrollButton from '~/ide/components/jobs/detail/scroll_button.vue'; +import TerminalControls from '~/ide/components/terminal/terminal_controls.vue'; describe('IDE TerminalControls', () => { let wrapper; diff --git a/spec/frontend/ide/components/terminal/terminal_spec.js b/spec/frontend/ide/components/terminal/terminal_spec.js index 9cfe167d2f6..c4b186c004a 100644 --- a/spec/frontend/ide/components/terminal/terminal_spec.js +++ b/spec/frontend/ide/components/terminal/terminal_spec.js @@ -1,7 +1,7 @@ -import Vue, { nextTick } from 'vue'; +import { GlLoadingIcon } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; +import Vue, { nextTick } from 'vue'; import Vuex from 'vuex'; -import { GlLoadingIcon } from '@gitlab/ui'; import Terminal from '~/ide/components/terminal/terminal.vue'; import TerminalControls from '~/ide/components/terminal/terminal_controls.vue'; import { diff --git a/spec/frontend/ide/components/terminal/view_spec.js b/spec/frontend/ide/components/terminal/view_spec.js index 37f7957c526..e97d4d8a73b 100644 --- a/spec/frontend/ide/components/terminal/view_spec.js +++ b/spec/frontend/ide/components/terminal/view_spec.js @@ -1,10 +1,10 @@ import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { TEST_HOST } from 'spec/test_constants'; import waitForPromises from 'helpers/wait_for_promises'; +import { TEST_HOST } from 'spec/test_constants'; import TerminalEmptyState from '~/ide/components/terminal/empty_state.vue'; -import TerminalView from '~/ide/components/terminal/view.vue'; import TerminalSession from '~/ide/components/terminal/session.vue'; +import TerminalView from '~/ide/components/terminal/view.vue'; const TEST_HELP_PATH = `${TEST_HOST}/help`; const TEST_SVG_PATH = `${TEST_HOST}/illustration.svg`; diff --git a/spec/frontend/ide/components/terminal_sync/terminal_sync_status_safe_spec.js b/spec/frontend/ide/components/terminal_sync/terminal_sync_status_safe_spec.js index afdecb7bbbd..69077ef2c68 100644 --- a/spec/frontend/ide/components/terminal_sync/terminal_sync_status_safe_spec.js +++ b/spec/frontend/ide/components/terminal_sync/terminal_sync_status_safe_spec.js @@ -1,5 +1,5 @@ -import Vuex from 'vuex'; import { createLocalVue, shallowMount } from '@vue/test-utils'; +import Vuex from 'vuex'; import TerminalSyncStatus from '~/ide/components/terminal_sync/terminal_sync_status.vue'; import TerminalSyncStatusSafe from '~/ide/components/terminal_sync/terminal_sync_status_safe.vue'; diff --git a/spec/frontend/ide/components/terminal_sync/terminal_sync_status_spec.js b/spec/frontend/ide/components/terminal_sync/terminal_sync_status_spec.js index d15583f81e4..c916c43d1e2 100644 --- a/spec/frontend/ide/components/terminal_sync/terminal_sync_status_spec.js +++ b/spec/frontend/ide/components/terminal_sync/terminal_sync_status_spec.js @@ -1,6 +1,6 @@ -import Vuex from 'vuex'; -import { createLocalVue, shallowMount } from '@vue/test-utils'; import { GlLoadingIcon, GlIcon } from '@gitlab/ui'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; +import Vuex from 'vuex'; import TerminalSyncStatus from '~/ide/components/terminal_sync/terminal_sync_status.vue'; import { MSG_TERMINAL_SYNC_CONNECTING, diff --git a/spec/frontend/ide/helpers.js b/spec/frontend/ide/helpers.js index f815c3d090e..9b7a4715d7f 100644 --- a/spec/frontend/ide/helpers.js +++ b/spec/frontend/ide/helpers.js @@ -1,6 +1,6 @@ import * as pathUtils from 'path'; -import { decorateData } from '~/ide/stores/utils'; import { commitActionTypes } from '~/ide/constants'; +import { decorateData } from '~/ide/stores/utils'; export const file = (name = 'name', id = name, type = '', parent = null) => decorateData({ diff --git a/spec/frontend/ide/lib/create_diff_spec.js b/spec/frontend/ide/lib/create_diff_spec.js index 76494f9af1b..b33fa599d1c 100644 --- a/spec/frontend/ide/lib/create_diff_spec.js +++ b/spec/frontend/ide/lib/create_diff_spec.js @@ -1,6 +1,6 @@ +import { commitActionTypes } from '~/ide/constants'; import createDiff from '~/ide/lib/create_diff'; import createFileDiff from '~/ide/lib/create_file_diff'; -import { commitActionTypes } from '~/ide/constants'; import { createNewFile, createUpdatedFile, diff --git a/spec/frontend/ide/lib/create_file_diff_spec.js b/spec/frontend/ide/lib/create_file_diff_spec.js index 294f0a926aa..646304c431b 100644 --- a/spec/frontend/ide/lib/create_file_diff_spec.js +++ b/spec/frontend/ide/lib/create_file_diff_spec.js @@ -1,5 +1,5 @@ -import createFileDiff from '~/ide/lib/create_file_diff'; import { commitActionTypes } from '~/ide/constants'; +import createFileDiff from '~/ide/lib/create_file_diff'; import { createUpdatedFile, createNewFile, diff --git a/spec/frontend/ide/lib/decorations/controller_spec.js b/spec/frontend/ide/lib/decorations/controller_spec.js index 2790563fd6a..b513f1b2eba 100644 --- a/spec/frontend/ide/lib/decorations/controller_spec.js +++ b/spec/frontend/ide/lib/decorations/controller_spec.js @@ -1,6 +1,6 @@ -import Editor from '~/ide/lib/editor'; -import DecorationsController from '~/ide/lib/decorations/controller'; import Model from '~/ide/lib/common/model'; +import DecorationsController from '~/ide/lib/decorations/controller'; +import Editor from '~/ide/lib/editor'; import { createStore } from '~/ide/stores'; import { file } from '../../helpers'; diff --git a/spec/frontend/ide/lib/diff/controller_spec.js b/spec/frontend/ide/lib/diff/controller_spec.js index 57c134620c0..5f1344f1ea2 100644 --- a/spec/frontend/ide/lib/diff/controller_spec.js +++ b/spec/frontend/ide/lib/diff/controller_spec.js @@ -1,9 +1,9 @@ import { Range } from 'monaco-editor'; -import Editor from '~/ide/lib/editor'; import ModelManager from '~/ide/lib/common/model_manager'; import DecorationsController from '~/ide/lib/decorations/controller'; import DirtyDiffController, { getDiffChangeType, getDecorator } from '~/ide/lib/diff/controller'; import { computeDiff } from '~/ide/lib/diff/diff'; +import Editor from '~/ide/lib/editor'; import { createStore } from '~/ide/stores'; import { file } from '../../helpers'; diff --git a/spec/frontend/ide/lib/editor_spec.js b/spec/frontend/ide/lib/editor_spec.js index b379d778966..c21a7edb2da 100644 --- a/spec/frontend/ide/lib/editor_spec.js +++ b/spec/frontend/ide/lib/editor_spec.js @@ -4,10 +4,10 @@ import { Range, Selection, } from 'monaco-editor'; +import { EDITOR_TYPE_DIFF } from '~/editor/constants'; import Editor from '~/ide/lib/editor'; -import { createStore } from '~/ide/stores'; import { defaultEditorOptions } from '~/ide/lib/editor_options'; -import { EDITOR_TYPE_DIFF } from '~/editor/constants'; +import { createStore } from '~/ide/stores'; import { file } from '../helpers'; describe('Multi-file editor library', () => { diff --git a/spec/frontend/ide/lib/languages/hcl_spec.js b/spec/frontend/ide/lib/languages/hcl_spec.js index c6ebad6a4f4..948c44d4543 100644 --- a/spec/frontend/ide/lib/languages/hcl_spec.js +++ b/spec/frontend/ide/lib/languages/hcl_spec.js @@ -1,6 +1,6 @@ import { editor } from 'monaco-editor'; -import { registerLanguages } from '~/ide/utils'; import hcl from '~/ide/lib/languages/hcl'; +import { registerLanguages } from '~/ide/utils'; describe('tokenization for .tf files', () => { beforeEach(() => { diff --git a/spec/frontend/ide/lib/languages/vue_spec.js b/spec/frontend/ide/lib/languages/vue_spec.js index ba5c31bb101..e3a67ccd47f 100644 --- a/spec/frontend/ide/lib/languages/vue_spec.js +++ b/spec/frontend/ide/lib/languages/vue_spec.js @@ -1,6 +1,6 @@ import { editor } from 'monaco-editor'; -import { registerLanguages } from '~/ide/utils'; import vue from '~/ide/lib/languages/vue'; +import { registerLanguages } from '~/ide/utils'; // This file only tests syntax specific to vue. This does not test existing syntaxes // of html, javascript, css and handlebars, which vue files extend. diff --git a/spec/frontend/ide/services/index_spec.js b/spec/frontend/ide/services/index_spec.js index c3d6182bd78..678d58cba34 100644 --- a/spec/frontend/ide/services/index_spec.js +++ b/spec/frontend/ide/services/index_spec.js @@ -1,10 +1,10 @@ import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; -import services from '~/ide/services'; import Api from '~/api'; +import getUserPermissions from '~/ide/queries/getUserPermissions.query.graphql'; +import services from '~/ide/services'; import { query } from '~/ide/services/gql'; import { escapeFileUrl } from '~/lib/utils/url_utility'; -import getUserPermissions from '~/ide/queries/getUserPermissions.query.graphql'; import { projectData } from '../mock_data'; jest.mock('~/api'); diff --git a/spec/frontend/ide/stores/actions/file_spec.js b/spec/frontend/ide/stores/actions/file_spec.js index 9d367714bbe..6178fb08d8c 100644 --- a/spec/frontend/ide/stores/actions/file_spec.js +++ b/spec/frontend/ide/stores/actions/file_spec.js @@ -1,12 +1,12 @@ -import Vue from 'vue'; import MockAdapter from 'axios-mock-adapter'; -import axios from '~/lib/utils/axios_utils'; +import Vue from 'vue'; +import eventHub from '~/ide/eventhub'; +import { createRouter } from '~/ide/ide_router'; +import service from '~/ide/services'; import { createStore } from '~/ide/stores'; import * as actions from '~/ide/stores/actions/file'; import * as types from '~/ide/stores/mutation_types'; -import service from '~/ide/services'; -import { createRouter } from '~/ide/ide_router'; -import eventHub from '~/ide/eventhub'; +import axios from '~/lib/utils/axios_utils'; import { file, createTriggerRenameAction, createTriggerUpdatePayload } from '../../helpers'; const ORIGINAL_CONTENT = 'original content'; diff --git a/spec/frontend/ide/stores/actions/merge_request_spec.js b/spec/frontend/ide/stores/actions/merge_request_spec.js index 9b17d95ea35..0436dc8a04f 100644 --- a/spec/frontend/ide/stores/actions/merge_request_spec.js +++ b/spec/frontend/ide/stores/actions/merge_request_spec.js @@ -1,15 +1,15 @@ import MockAdapter from 'axios-mock-adapter'; -import axios from '~/lib/utils/axios_utils'; -import { createStore } from '~/ide/stores'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import { leftSidebarViews, PERMISSION_READ_MR } from '~/ide/constants'; +import service from '~/ide/services'; +import { createStore } from '~/ide/stores'; import { getMergeRequestData, getMergeRequestChanges, getMergeRequestVersions, openMergeRequest, } from '~/ide/stores/actions/merge_request'; -import service from '~/ide/services'; -import { leftSidebarViews, PERMISSION_READ_MR } from '~/ide/constants'; +import axios from '~/lib/utils/axios_utils'; const TEST_PROJECT = 'abcproject'; const TEST_PROJECT_ID = 17; diff --git a/spec/frontend/ide/stores/actions/project_spec.js b/spec/frontend/ide/stores/actions/project_spec.js index 1244c8af91a..23ffb5ff56b 100644 --- a/spec/frontend/ide/stores/actions/project_spec.js +++ b/spec/frontend/ide/stores/actions/project_spec.js @@ -1,7 +1,8 @@ import MockAdapter from 'axios-mock-adapter'; -import testAction from 'helpers/vuex_action_helper'; import { useMockLocationHelper } from 'helpers/mock_window_location_helper'; -import axios from '~/lib/utils/axios_utils'; +import testAction from 'helpers/vuex_action_helper'; +import api from '~/api'; +import service from '~/ide/services'; import { createStore } from '~/ide/stores'; import { refreshLastCommitData, @@ -12,8 +13,7 @@ import { loadFile, loadBranch, } from '~/ide/stores/actions'; -import service from '~/ide/services'; -import api from '~/api'; +import axios from '~/lib/utils/axios_utils'; const TEST_PROJECT_ID = 'abc/def'; diff --git a/spec/frontend/ide/stores/actions/tree_spec.js b/spec/frontend/ide/stores/actions/tree_spec.js index 7831df9f3a4..8de2188a5f4 100644 --- a/spec/frontend/ide/stores/actions/tree_spec.js +++ b/spec/frontend/ide/stores/actions/tree_spec.js @@ -1,12 +1,12 @@ import MockAdapter from 'axios-mock-adapter'; -import testAction from 'helpers/vuex_action_helper'; import { TEST_HOST } from 'helpers/test_constants'; +import testAction from 'helpers/vuex_action_helper'; +import { createRouter } from '~/ide/ide_router'; +import service from '~/ide/services'; +import { createStore } from '~/ide/stores'; import { showTreeEntry, getFiles, setDirectoryData } from '~/ide/stores/actions/tree'; import * as types from '~/ide/stores/mutation_types'; import axios from '~/lib/utils/axios_utils'; -import { createStore } from '~/ide/stores'; -import service from '~/ide/services'; -import { createRouter } from '~/ide/ide_router'; import { file, createEntriesFromPaths } from '../../helpers'; describe('Multi-file store tree actions', () => { diff --git a/spec/frontend/ide/stores/actions_spec.js b/spec/frontend/ide/stores/actions_spec.js index d925e9a0844..d47dd88dd47 100644 --- a/spec/frontend/ide/stores/actions_spec.js +++ b/spec/frontend/ide/stores/actions_spec.js @@ -1,8 +1,8 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; -import { visitUrl } from '~/lib/utils/url_utility'; -import { createStore } from '~/ide/stores'; +import eventHub from '~/ide/eventhub'; import { createRouter } from '~/ide/ide_router'; +import { createStore } from '~/ide/stores'; import { stageAllChanges, unstageAllChanges, @@ -18,9 +18,9 @@ import { createTempEntry, discardAllChanges, } from '~/ide/stores/actions'; -import axios from '~/lib/utils/axios_utils'; import * as types from '~/ide/stores/mutation_types'; -import eventHub from '~/ide/eventhub'; +import axios from '~/lib/utils/axios_utils'; +import { visitUrl } from '~/lib/utils/url_utility'; import { file, createTriggerRenameAction, createTriggerChangeAction } from '../helpers'; jest.mock('~/lib/utils/url_utility', () => ({ diff --git a/spec/frontend/ide/stores/getters_spec.js b/spec/frontend/ide/stores/getters_spec.js index 1289c1aec75..450f5592026 100644 --- a/spec/frontend/ide/stores/getters_spec.js +++ b/spec/frontend/ide/stores/getters_spec.js @@ -1,8 +1,8 @@ import { TEST_HOST } from 'helpers/test_constants'; -import * as getters from '~/ide/stores/getters'; import { createStore } from '~/ide/stores'; -import { file } from '../helpers'; +import * as getters from '~/ide/stores/getters'; import { DEFAULT_PERMISSIONS } from '../../../../app/assets/javascripts/ide/constants'; +import { file } from '../helpers'; const TEST_PROJECT_ID = 'test_project'; diff --git a/spec/frontend/ide/stores/modules/branches/actions_spec.js b/spec/frontend/ide/stores/modules/branches/actions_spec.js index b1c077c4082..135dbc1f746 100644 --- a/spec/frontend/ide/stores/modules/branches/actions_spec.js +++ b/spec/frontend/ide/stores/modules/branches/actions_spec.js @@ -1,8 +1,5 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; -import axios from '~/lib/utils/axios_utils'; -import state from '~/ide/stores/modules/branches/state'; -import * as types from '~/ide/stores/modules/branches/mutation_types'; import { requestBranches, receiveBranchesError, @@ -10,6 +7,9 @@ import { fetchBranches, resetBranches, } from '~/ide/stores/modules/branches/actions'; +import * as types from '~/ide/stores/modules/branches/mutation_types'; +import state from '~/ide/stores/modules/branches/state'; +import axios from '~/lib/utils/axios_utils'; import { branches, projectData } from '../../../mock_data'; describe('IDE branches actions', () => { diff --git a/spec/frontend/ide/stores/modules/branches/mutations_spec.js b/spec/frontend/ide/stores/modules/branches/mutations_spec.js index ddf55479be9..fd6006749d2 100644 --- a/spec/frontend/ide/stores/modules/branches/mutations_spec.js +++ b/spec/frontend/ide/stores/modules/branches/mutations_spec.js @@ -1,6 +1,6 @@ -import state from '~/ide/stores/modules/branches/state'; -import mutations from '~/ide/stores/modules/branches/mutations'; import * as types from '~/ide/stores/modules/branches/mutation_types'; +import mutations from '~/ide/stores/modules/branches/mutations'; +import state from '~/ide/stores/modules/branches/state'; import { branches } from '../../../mock_data'; describe('IDE branches mutations', () => { diff --git a/spec/frontend/ide/stores/modules/clientside/actions_spec.js b/spec/frontend/ide/stores/modules/clientside/actions_spec.js index 05627f8ed0e..c167d056039 100644 --- a/spec/frontend/ide/stores/modules/clientside/actions_spec.js +++ b/spec/frontend/ide/stores/modules/clientside/actions_spec.js @@ -1,8 +1,8 @@ import MockAdapter from 'axios-mock-adapter'; -import testAction from 'helpers/vuex_action_helper'; import { TEST_HOST } from 'helpers/test_constants'; -import axios from '~/lib/utils/axios_utils'; +import testAction from 'helpers/vuex_action_helper'; import * as actions from '~/ide/stores/modules/clientside/actions'; +import axios from '~/lib/utils/axios_utils'; const TEST_PROJECT_URL = `${TEST_HOST}/lorem/ipsum`; const TEST_USAGE_URL = `${TEST_PROJECT_URL}/usage_ping/web_ide_clientside_preview`; diff --git a/spec/frontend/ide/stores/modules/commit/actions_spec.js b/spec/frontend/ide/stores/modules/commit/actions_spec.js index ac495a657a2..b124eb391f3 100644 --- a/spec/frontend/ide/stores/modules/commit/actions_spec.js +++ b/spec/frontend/ide/stores/modules/commit/actions_spec.js @@ -1,20 +1,20 @@ import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; -import { file } from 'jest/ide/helpers'; import testAction from 'helpers/vuex_action_helper'; -import { visitUrl } from '~/lib/utils/url_utility'; -import { createStore } from '~/ide/stores'; -import service from '~/ide/services'; -import { createRouter } from '~/ide/ide_router'; +import { file } from 'jest/ide/helpers'; +import { commitActionTypes, PERMISSION_CREATE_MR } from '~/ide/constants'; import eventHub from '~/ide/eventhub'; +import { createRouter } from '~/ide/ide_router'; +import { createUnexpectedCommitError } from '~/ide/lib/errors'; +import service from '~/ide/services'; +import { createStore } from '~/ide/stores'; +import * as actions from '~/ide/stores/modules/commit/actions'; import { COMMIT_TO_CURRENT_BRANCH, COMMIT_TO_NEW_BRANCH, } from '~/ide/stores/modules/commit/constants'; import * as mutationTypes from '~/ide/stores/modules/commit/mutation_types'; -import * as actions from '~/ide/stores/modules/commit/actions'; -import { createUnexpectedCommitError } from '~/ide/lib/errors'; -import { commitActionTypes, PERMISSION_CREATE_MR } from '~/ide/constants'; +import { visitUrl } from '~/lib/utils/url_utility'; jest.mock('~/lib/utils/url_utility', () => ({ ...jest.requireActual('~/lib/utils/url_utility'), diff --git a/spec/frontend/ide/stores/modules/commit/getters_spec.js b/spec/frontend/ide/stores/modules/commit/getters_spec.js index a97b7e49dfc..0dc938bb637 100644 --- a/spec/frontend/ide/stores/modules/commit/getters_spec.js +++ b/spec/frontend/ide/stores/modules/commit/getters_spec.js @@ -1,9 +1,9 @@ -import commitState from '~/ide/stores/modules/commit/state'; -import * as getters from '~/ide/stores/modules/commit/getters'; import { COMMIT_TO_CURRENT_BRANCH, COMMIT_TO_NEW_BRANCH, } from '~/ide/stores/modules/commit/constants'; +import * as getters from '~/ide/stores/modules/commit/getters'; +import commitState from '~/ide/stores/modules/commit/state'; describe('IDE commit module getters', () => { let state; diff --git a/spec/frontend/ide/stores/modules/commit/mutations_spec.js b/spec/frontend/ide/stores/modules/commit/mutations_spec.js index 6393a70eac6..50342832d75 100644 --- a/spec/frontend/ide/stores/modules/commit/mutations_spec.js +++ b/spec/frontend/ide/stores/modules/commit/mutations_spec.js @@ -1,6 +1,6 @@ -import commitState from '~/ide/stores/modules/commit/state'; -import mutations from '~/ide/stores/modules/commit/mutations'; import * as types from '~/ide/stores/modules/commit/mutation_types'; +import mutations from '~/ide/stores/modules/commit/mutations'; +import commitState from '~/ide/stores/modules/commit/state'; describe('IDE commit module mutations', () => { let state; diff --git a/spec/frontend/ide/stores/modules/editor/actions_spec.js b/spec/frontend/ide/stores/modules/editor/actions_spec.js index 6a420ac32de..f006018364b 100644 --- a/spec/frontend/ide/stores/modules/editor/actions_spec.js +++ b/spec/frontend/ide/stores/modules/editor/actions_spec.js @@ -1,6 +1,6 @@ import testAction from 'helpers/vuex_action_helper'; -import * as types from '~/ide/stores/modules/editor/mutation_types'; import * as actions from '~/ide/stores/modules/editor/actions'; +import * as types from '~/ide/stores/modules/editor/mutation_types'; import { createTriggerRenamePayload } from '../../../helpers'; describe('~/ide/stores/modules/editor/actions', () => { diff --git a/spec/frontend/ide/stores/modules/editor/getters_spec.js b/spec/frontend/ide/stores/modules/editor/getters_spec.js index 55e1e31f66f..14099cdaeb2 100644 --- a/spec/frontend/ide/stores/modules/editor/getters_spec.js +++ b/spec/frontend/ide/stores/modules/editor/getters_spec.js @@ -1,5 +1,5 @@ -import { createDefaultFileEditor } from '~/ide/stores/modules/editor/utils'; import * as getters from '~/ide/stores/modules/editor/getters'; +import { createDefaultFileEditor } from '~/ide/stores/modules/editor/utils'; const TEST_PATH = 'test/path.md'; const TEST_FILE_EDITOR = { diff --git a/spec/frontend/ide/stores/modules/editor/mutations_spec.js b/spec/frontend/ide/stores/modules/editor/mutations_spec.js index e4b330b3174..35d13f375a3 100644 --- a/spec/frontend/ide/stores/modules/editor/mutations_spec.js +++ b/spec/frontend/ide/stores/modules/editor/mutations_spec.js @@ -1,6 +1,6 @@ -import { createDefaultFileEditor } from '~/ide/stores/modules/editor/utils'; import * as types from '~/ide/stores/modules/editor/mutation_types'; import mutations from '~/ide/stores/modules/editor/mutations'; +import { createDefaultFileEditor } from '~/ide/stores/modules/editor/utils'; import { createTriggerRenamePayload } from '../../../helpers'; const TEST_PATH = 'test/path.md'; diff --git a/spec/frontend/ide/stores/modules/file_templates/actions_spec.js b/spec/frontend/ide/stores/modules/file_templates/actions_spec.js index 76898e83c7a..9ff950b0875 100644 --- a/spec/frontend/ide/stores/modules/file_templates/actions_spec.js +++ b/spec/frontend/ide/stores/modules/file_templates/actions_spec.js @@ -1,9 +1,9 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; -import axios from '~/lib/utils/axios_utils'; -import createState from '~/ide/stores/modules/file_templates/state'; import * as actions from '~/ide/stores/modules/file_templates/actions'; import * as types from '~/ide/stores/modules/file_templates/mutation_types'; +import createState from '~/ide/stores/modules/file_templates/state'; +import axios from '~/lib/utils/axios_utils'; describe('IDE file templates actions', () => { let state; diff --git a/spec/frontend/ide/stores/modules/file_templates/getters_spec.js b/spec/frontend/ide/stores/modules/file_templates/getters_spec.js index c9676b23fa1..e237b167f96 100644 --- a/spec/frontend/ide/stores/modules/file_templates/getters_spec.js +++ b/spec/frontend/ide/stores/modules/file_templates/getters_spec.js @@ -1,6 +1,6 @@ -import createState from '~/ide/stores/state'; import { leftSidebarViews } from '~/ide/constants'; import * as getters from '~/ide/stores/modules/file_templates/getters'; +import createState from '~/ide/stores/state'; describe('IDE file templates getters', () => { describe('templateTypes', () => { diff --git a/spec/frontend/ide/stores/modules/file_templates/mutations_spec.js b/spec/frontend/ide/stores/modules/file_templates/mutations_spec.js index 6a1a826093c..3ea3c9507dd 100644 --- a/spec/frontend/ide/stores/modules/file_templates/mutations_spec.js +++ b/spec/frontend/ide/stores/modules/file_templates/mutations_spec.js @@ -1,6 +1,6 @@ -import createState from '~/ide/stores/modules/file_templates/state'; import * as types from '~/ide/stores/modules/file_templates/mutation_types'; import mutations from '~/ide/stores/modules/file_templates/mutations'; +import createState from '~/ide/stores/modules/file_templates/state'; const mockFileTemplates = [['MIT'], ['CC']]; const mockTemplateType = 'test'; diff --git a/spec/frontend/ide/stores/modules/merge_requests/actions_spec.js b/spec/frontend/ide/stores/modules/merge_requests/actions_spec.js index 6594d65f558..e1f2b165dd9 100644 --- a/spec/frontend/ide/stores/modules/merge_requests/actions_spec.js +++ b/spec/frontend/ide/stores/modules/merge_requests/actions_spec.js @@ -1,8 +1,5 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; -import axios from '~/lib/utils/axios_utils'; -import state from '~/ide/stores/modules/merge_requests/state'; -import * as types from '~/ide/stores/modules/merge_requests/mutation_types'; import { requestMergeRequests, receiveMergeRequestsError, @@ -10,6 +7,9 @@ import { fetchMergeRequests, resetMergeRequests, } from '~/ide/stores/modules/merge_requests/actions'; +import * as types from '~/ide/stores/modules/merge_requests/mutation_types'; +import state from '~/ide/stores/modules/merge_requests/state'; +import axios from '~/lib/utils/axios_utils'; import { mergeRequests } from '../../../mock_data'; describe('IDE merge requests actions', () => { diff --git a/spec/frontend/ide/stores/modules/merge_requests/mutations_spec.js b/spec/frontend/ide/stores/modules/merge_requests/mutations_spec.js index d33bda3652d..f45c577f801 100644 --- a/spec/frontend/ide/stores/modules/merge_requests/mutations_spec.js +++ b/spec/frontend/ide/stores/modules/merge_requests/mutations_spec.js @@ -1,7 +1,7 @@ import { TEST_HOST } from 'helpers/test_constants'; -import state from '~/ide/stores/modules/merge_requests/state'; -import mutations from '~/ide/stores/modules/merge_requests/mutations'; import * as types from '~/ide/stores/modules/merge_requests/mutation_types'; +import mutations from '~/ide/stores/modules/merge_requests/mutations'; +import state from '~/ide/stores/modules/merge_requests/state'; import { mergeRequests } from '../../../mock_data'; describe('IDE merge requests mutations', () => { diff --git a/spec/frontend/ide/stores/modules/pane/mutations_spec.js b/spec/frontend/ide/stores/modules/pane/mutations_spec.js index b5fcd35912e..eaeb2c8cd28 100644 --- a/spec/frontend/ide/stores/modules/pane/mutations_spec.js +++ b/spec/frontend/ide/stores/modules/pane/mutations_spec.js @@ -1,6 +1,6 @@ -import state from '~/ide/stores/modules/pane/state'; -import mutations from '~/ide/stores/modules/pane/mutations'; import * as types from '~/ide/stores/modules/pane/mutation_types'; +import mutations from '~/ide/stores/modules/pane/mutations'; +import state from '~/ide/stores/modules/pane/state'; describe('IDE pane module mutations', () => { const TEST_VIEW = 'test-view'; diff --git a/spec/frontend/ide/stores/modules/pipelines/actions_spec.js b/spec/frontend/ide/stores/modules/pipelines/actions_spec.js index b7ed257e954..9aa31136c89 100644 --- a/spec/frontend/ide/stores/modules/pipelines/actions_spec.js +++ b/spec/frontend/ide/stores/modules/pipelines/actions_spec.js @@ -1,8 +1,8 @@ -import Visibility from 'visibilityjs'; import MockAdapter from 'axios-mock-adapter'; +import Visibility from 'visibilityjs'; import { TEST_HOST } from 'helpers/test_constants'; import testAction from 'helpers/vuex_action_helper'; -import axios from '~/lib/utils/axios_utils'; +import { rightSidebarViews } from '~/ide/constants'; import { requestLatestPipeline, receiveLatestPipelineError, @@ -22,9 +22,9 @@ import { fetchJobLogs, resetLatestPipeline, } from '~/ide/stores/modules/pipelines/actions'; -import state from '~/ide/stores/modules/pipelines/state'; import * as types from '~/ide/stores/modules/pipelines/mutation_types'; -import { rightSidebarViews } from '~/ide/constants'; +import state from '~/ide/stores/modules/pipelines/state'; +import axios from '~/lib/utils/axios_utils'; import { pipelines, jobs } from '../../../mock_data'; describe('IDE pipelines actions', () => { diff --git a/spec/frontend/ide/stores/modules/pipelines/mutations_spec.js b/spec/frontend/ide/stores/modules/pipelines/mutations_spec.js index d820bf0291e..0e738b98918 100644 --- a/spec/frontend/ide/stores/modules/pipelines/mutations_spec.js +++ b/spec/frontend/ide/stores/modules/pipelines/mutations_spec.js @@ -1,6 +1,6 @@ +import * as types from '~/ide/stores/modules/pipelines/mutation_types'; import mutations from '~/ide/stores/modules/pipelines/mutations'; import state from '~/ide/stores/modules/pipelines/state'; -import * as types from '~/ide/stores/modules/pipelines/mutation_types'; import { fullPipelinesResponse, stages, jobs } from '../../../mock_data'; describe('IDE pipelines mutations', () => { diff --git a/spec/frontend/ide/stores/modules/router/mutations_spec.js b/spec/frontend/ide/stores/modules/router/mutations_spec.js index a4a83c9344d..5a9f266db94 100644 --- a/spec/frontend/ide/stores/modules/router/mutations_spec.js +++ b/spec/frontend/ide/stores/modules/router/mutations_spec.js @@ -1,5 +1,5 @@ -import mutations from '~/ide/stores/modules/router/mutations'; import * as types from '~/ide/stores/modules/router/mutation_types'; +import mutations from '~/ide/stores/modules/router/mutations'; import createState from '~/ide/stores/modules/router/state'; const TEST_PATH = 'test/path/abc'; diff --git a/spec/frontend/ide/stores/modules/terminal/actions/checks_spec.js b/spec/frontend/ide/stores/modules/terminal/actions/checks_spec.js index 05935f1db38..e5887ca0a33 100644 --- a/spec/frontend/ide/stores/modules/terminal/actions/checks_spec.js +++ b/spec/frontend/ide/stores/modules/terminal/actions/checks_spec.js @@ -1,14 +1,14 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; import { TEST_HOST } from 'spec/test_constants'; +import * as actions from '~/ide/stores/modules/terminal/actions/checks'; import { CHECK_CONFIG, CHECK_RUNNERS, RETRY_RUNNERS_INTERVAL, } from '~/ide/stores/modules/terminal/constants'; -import * as mutationTypes from '~/ide/stores/modules/terminal/mutation_types'; import * as messages from '~/ide/stores/modules/terminal/messages'; -import * as actions from '~/ide/stores/modules/terminal/actions/checks'; +import * as mutationTypes from '~/ide/stores/modules/terminal/mutation_types'; import axios from '~/lib/utils/axios_utils'; import httpStatus from '~/lib/utils/http_status'; diff --git a/spec/frontend/ide/stores/modules/terminal/actions/session_controls_spec.js b/spec/frontend/ide/stores/modules/terminal/actions/session_controls_spec.js index dd51786745f..e42e760b841 100644 --- a/spec/frontend/ide/stores/modules/terminal/actions/session_controls_spec.js +++ b/spec/frontend/ide/stores/modules/terminal/actions/session_controls_spec.js @@ -1,12 +1,12 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; +import * as actions from '~/ide/stores/modules/terminal/actions/session_controls'; import { STARTING, PENDING, STOPPING, STOPPED } from '~/ide/stores/modules/terminal/constants'; import * as messages from '~/ide/stores/modules/terminal/messages'; import * as mutationTypes from '~/ide/stores/modules/terminal/mutation_types'; -import * as actions from '~/ide/stores/modules/terminal/actions/session_controls'; -import httpStatus from '~/lib/utils/http_status'; import axios from '~/lib/utils/axios_utils'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; +import httpStatus from '~/lib/utils/http_status'; jest.mock('~/flash'); diff --git a/spec/frontend/ide/stores/modules/terminal/actions/session_status_spec.js b/spec/frontend/ide/stores/modules/terminal/actions/session_status_spec.js index 0e123dce798..0227955754c 100644 --- a/spec/frontend/ide/stores/modules/terminal/actions/session_status_spec.js +++ b/spec/frontend/ide/stores/modules/terminal/actions/session_status_spec.js @@ -1,11 +1,11 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; +import * as actions from '~/ide/stores/modules/terminal/actions/session_status'; import { PENDING, RUNNING, STOPPING, STOPPED } from '~/ide/stores/modules/terminal/constants'; import * as messages from '~/ide/stores/modules/terminal/messages'; import * as mutationTypes from '~/ide/stores/modules/terminal/mutation_types'; -import * as actions from '~/ide/stores/modules/terminal/actions/session_status'; import axios from '~/lib/utils/axios_utils'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; jest.mock('~/flash'); diff --git a/spec/frontend/ide/stores/modules/terminal/actions/setup_spec.js b/spec/frontend/ide/stores/modules/terminal/actions/setup_spec.js index 8bf3b58228e..a823c05c459 100644 --- a/spec/frontend/ide/stores/modules/terminal/actions/setup_spec.js +++ b/spec/frontend/ide/stores/modules/terminal/actions/setup_spec.js @@ -1,6 +1,6 @@ import testAction from 'helpers/vuex_action_helper'; -import * as mutationTypes from '~/ide/stores/modules/terminal/mutation_types'; import * as actions from '~/ide/stores/modules/terminal/actions/setup'; +import * as mutationTypes from '~/ide/stores/modules/terminal/mutation_types'; describe('IDE store terminal setup actions', () => { describe('init', () => { diff --git a/spec/frontend/ide/stores/modules/terminal/messages_spec.js b/spec/frontend/ide/stores/modules/terminal/messages_spec.js index 1bb92a9dfa5..e8f375a70b5 100644 --- a/spec/frontend/ide/stores/modules/terminal/messages_spec.js +++ b/spec/frontend/ide/stores/modules/terminal/messages_spec.js @@ -1,8 +1,8 @@ import { escape } from 'lodash'; import { TEST_HOST } from 'spec/test_constants'; import * as messages from '~/ide/stores/modules/terminal/messages'; -import { sprintf } from '~/locale'; import httpStatus from '~/lib/utils/http_status'; +import { sprintf } from '~/locale'; const TEST_HELP_URL = `${TEST_HOST}/help`; diff --git a/spec/frontend/ide/stores/modules/terminal/mutations_spec.js b/spec/frontend/ide/stores/modules/terminal/mutations_spec.js index e9933bdd7be..3451932a185 100644 --- a/spec/frontend/ide/stores/modules/terminal/mutations_spec.js +++ b/spec/frontend/ide/stores/modules/terminal/mutations_spec.js @@ -4,9 +4,9 @@ import { RUNNING, STOPPING, } from '~/ide/stores/modules/terminal/constants'; -import createState from '~/ide/stores/modules/terminal/state'; import * as types from '~/ide/stores/modules/terminal/mutation_types'; import mutations from '~/ide/stores/modules/terminal/mutations'; +import createState from '~/ide/stores/modules/terminal/state'; describe('IDE store terminal mutations', () => { let state; diff --git a/spec/frontend/ide/stores/modules/terminal_sync/actions_spec.js b/spec/frontend/ide/stores/modules/terminal_sync/actions_spec.js index 2ae7e8a8727..22b0615c6d0 100644 --- a/spec/frontend/ide/stores/modules/terminal_sync/actions_spec.js +++ b/spec/frontend/ide/stores/modules/terminal_sync/actions_spec.js @@ -1,6 +1,6 @@ import testAction from 'helpers/vuex_action_helper'; -import * as actions from '~/ide/stores/modules/terminal_sync/actions'; import mirror, { canConnect, SERVICE_NAME } from '~/ide/lib/mirror'; +import * as actions from '~/ide/stores/modules/terminal_sync/actions'; import * as types from '~/ide/stores/modules/terminal_sync/mutation_types'; jest.mock('~/ide/lib/mirror'); diff --git a/spec/frontend/ide/stores/modules/terminal_sync/mutations_spec.js b/spec/frontend/ide/stores/modules/terminal_sync/mutations_spec.js index ecf35d60e96..b7dbf93f4e6 100644 --- a/spec/frontend/ide/stores/modules/terminal_sync/mutations_spec.js +++ b/spec/frontend/ide/stores/modules/terminal_sync/mutations_spec.js @@ -1,6 +1,6 @@ -import createState from '~/ide/stores/modules/terminal_sync/state'; import * as types from '~/ide/stores/modules/terminal_sync/mutation_types'; import mutations from '~/ide/stores/modules/terminal_sync/mutations'; +import createState from '~/ide/stores/modules/terminal_sync/state'; const TEST_MESSAGE = 'lorem ipsum dolar sit'; diff --git a/spec/frontend/ide/stores/mutations/file_spec.js b/spec/frontend/ide/stores/mutations/file_spec.js index 9bbdac0ae25..825d2a546cd 100644 --- a/spec/frontend/ide/stores/mutations/file_spec.js +++ b/spec/frontend/ide/stores/mutations/file_spec.js @@ -1,5 +1,5 @@ -import mutations from '~/ide/stores/mutations/file'; import { createStore } from '~/ide/stores'; +import mutations from '~/ide/stores/mutations/file'; import { file } from '../../helpers'; describe('IDE store file mutations', () => { diff --git a/spec/frontend/ide/stores/plugins/terminal_spec.js b/spec/frontend/ide/stores/plugins/terminal_spec.js index 948c2131fd8..d4cdad16ecb 100644 --- a/spec/frontend/ide/stores/plugins/terminal_spec.js +++ b/spec/frontend/ide/stores/plugins/terminal_spec.js @@ -2,8 +2,8 @@ import { createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; import { TEST_HOST } from 'helpers/test_constants'; import terminalModule from '~/ide/stores/modules/terminal'; -import createTerminalPlugin from '~/ide/stores/plugins/terminal'; import { SET_BRANCH_WORKING_REFERENCE } from '~/ide/stores/mutation_types'; +import createTerminalPlugin from '~/ide/stores/plugins/terminal'; const TEST_DATASET = { eeWebTerminalSvgPath: `${TEST_HOST}/web/terminal/svg`, diff --git a/spec/frontend/ide/stores/plugins/terminal_sync_spec.js b/spec/frontend/ide/stores/plugins/terminal_sync_spec.js index 0e5f4184679..f12f80c1602 100644 --- a/spec/frontend/ide/stores/plugins/terminal_sync_spec.js +++ b/spec/frontend/ide/stores/plugins/terminal_sync_spec.js @@ -1,9 +1,9 @@ +import eventHub from '~/ide/eventhub'; +import { createStore } from '~/ide/stores'; +import { RUNNING, STOPPING } from '~/ide/stores/modules/terminal/constants'; +import { SET_SESSION_STATUS } from '~/ide/stores/modules/terminal/mutation_types'; import createTerminalPlugin from '~/ide/stores/plugins/terminal'; import createTerminalSyncPlugin from '~/ide/stores/plugins/terminal_sync'; -import { SET_SESSION_STATUS } from '~/ide/stores/modules/terminal/mutation_types'; -import { RUNNING, STOPPING } from '~/ide/stores/modules/terminal/constants'; -import { createStore } from '~/ide/stores'; -import eventHub from '~/ide/eventhub'; import { createTriggerUpdatePayload } from '../../helpers'; jest.mock('~/ide/lib/mirror'); diff --git a/spec/frontend/ide/stores/utils_spec.js b/spec/frontend/ide/stores/utils_spec.js index b185013050e..46a0794b2e6 100644 --- a/spec/frontend/ide/stores/utils_spec.js +++ b/spec/frontend/ide/stores/utils_spec.js @@ -1,5 +1,5 @@ -import * as utils from '~/ide/stores/utils'; import { commitActionTypes } from '~/ide/constants'; +import * as utils from '~/ide/stores/utils'; import { file } from '../helpers'; describe('Multi-file store utils', () => { diff --git a/spec/frontend/image_diff/image_badge_spec.js b/spec/frontend/image_diff/image_badge_spec.js index a11b50ead47..8450b9b4694 100644 --- a/spec/frontend/image_diff/image_badge_spec.js +++ b/spec/frontend/image_diff/image_badge_spec.js @@ -1,5 +1,5 @@ -import ImageBadge from '~/image_diff/image_badge'; import imageDiffHelper from '~/image_diff/helpers/index'; +import ImageBadge from '~/image_diff/image_badge'; import * as mockData from './mock_data'; describe('ImageBadge', () => { diff --git a/spec/frontend/image_diff/image_diff_spec.js b/spec/frontend/image_diff/image_diff_spec.js index e14f8dc774f..16d19f45496 100644 --- a/spec/frontend/image_diff/image_diff_spec.js +++ b/spec/frontend/image_diff/image_diff_spec.js @@ -1,7 +1,7 @@ import { TEST_HOST } from 'helpers/test_constants'; +import imageDiffHelper from '~/image_diff/helpers/index'; import ImageDiff from '~/image_diff/image_diff'; import * as imageUtility from '~/lib/utils/image_utility'; -import imageDiffHelper from '~/image_diff/helpers/index'; import * as mockData from './mock_data'; describe('ImageDiff', () => { diff --git a/spec/frontend/image_diff/init_discussion_tab_spec.js b/spec/frontend/image_diff/init_discussion_tab_spec.js index f96d00230ee..5bc0c738944 100644 --- a/spec/frontend/image_diff/init_discussion_tab_spec.js +++ b/spec/frontend/image_diff/init_discussion_tab_spec.js @@ -1,5 +1,5 @@ -import initDiscussionTab from '~/image_diff/init_discussion_tab'; import initImageDiffHelper from '~/image_diff/helpers/init_image_diff'; +import initDiscussionTab from '~/image_diff/init_discussion_tab'; describe('initDiscussionTab', () => { beforeEach(() => { diff --git a/spec/frontend/image_diff/replaced_image_diff_spec.js b/spec/frontend/image_diff/replaced_image_diff_spec.js index 16be4b82ad7..cc4a2530fc4 100644 --- a/spec/frontend/image_diff/replaced_image_diff_spec.js +++ b/spec/frontend/image_diff/replaced_image_diff_spec.js @@ -1,8 +1,8 @@ import { TEST_HOST } from 'helpers/test_constants'; -import ReplacedImageDiff from '~/image_diff/replaced_image_diff'; +import imageDiffHelper from '~/image_diff/helpers/index'; import ImageDiff from '~/image_diff/image_diff'; +import ReplacedImageDiff from '~/image_diff/replaced_image_diff'; import { viewTypes } from '~/image_diff/view_types'; -import imageDiffHelper from '~/image_diff/helpers/index'; describe('ReplacedImageDiff', () => { let element; diff --git a/spec/frontend/import_entities/import_groups/components/import_table_row_spec.js b/spec/frontend/import_entities/import_groups/components/import_table_row_spec.js index ac8b73aeb49..cdef4b1ee62 100644 --- a/spec/frontend/import_entities/import_groups/components/import_table_row_spec.js +++ b/spec/frontend/import_entities/import_groups/components/import_table_row_spec.js @@ -1,8 +1,8 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton, GlLink, GlFormInput } from '@gitlab/ui'; -import Select2Select from '~/vue_shared/components/select2_select.vue'; -import ImportTableRow from '~/import_entities/import_groups/components/import_table_row.vue'; +import { shallowMount } from '@vue/test-utils'; import { STATUSES } from '~/import_entities/constants'; +import ImportTableRow from '~/import_entities/import_groups/components/import_table_row.vue'; +import Select2Select from '~/vue_shared/components/select2_select.vue'; import { availableNamespacesFixture } from '../graphql/fixtures'; const getFakeGroup = (status) => ({ diff --git a/spec/frontend/import_entities/import_groups/components/import_table_spec.js b/spec/frontend/import_entities/import_groups/components/import_table_spec.js index 34e2a945333..dd734782169 100644 --- a/spec/frontend/import_entities/import_groups/components/import_table_spec.js +++ b/spec/frontend/import_entities/import_groups/components/import_table_spec.js @@ -1,17 +1,16 @@ +import { GlEmptyState, GlLoadingIcon, GlSearchBoxByClick, GlSprintf } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import VueApollo from 'vue-apollo'; -import { GlEmptyState, GlLoadingIcon, GlSearchBoxByClick, GlSprintf } from '@gitlab/ui'; -import waitForPromises from 'helpers/wait_for_promises'; import createMockApollo from 'helpers/mock_apollo_helper'; -import ImportTableRow from '~/import_entities/import_groups/components/import_table_row.vue'; +import waitForPromises from 'helpers/wait_for_promises'; +import { STATUSES } from '~/import_entities/constants'; import ImportTable from '~/import_entities/import_groups/components/import_table.vue'; -import setTargetNamespaceMutation from '~/import_entities/import_groups/graphql/mutations/set_target_namespace.mutation.graphql'; -import setNewNameMutation from '~/import_entities/import_groups/graphql/mutations/set_new_name.mutation.graphql'; +import ImportTableRow from '~/import_entities/import_groups/components/import_table_row.vue'; import importGroupMutation from '~/import_entities/import_groups/graphql/mutations/import_group.mutation.graphql'; +import setNewNameMutation from '~/import_entities/import_groups/graphql/mutations/set_new_name.mutation.graphql'; +import setTargetNamespaceMutation from '~/import_entities/import_groups/graphql/mutations/set_target_namespace.mutation.graphql'; import PaginationLinks from '~/vue_shared/components/pagination_links.vue'; -import { STATUSES } from '~/import_entities/constants'; - import { availableNamespacesFixture, generateFakeEntry } from '../graphql/fixtures'; const localVue = createLocalVue(); diff --git a/spec/frontend/import_entities/import_groups/graphql/client_factory_spec.js b/spec/frontend/import_entities/import_groups/graphql/client_factory_spec.js index 94a2e4f75b4..b94e2c2bd74 100644 --- a/spec/frontend/import_entities/import_groups/graphql/client_factory_spec.js +++ b/spec/frontend/import_entities/import_groups/graphql/client_factory_spec.js @@ -1,20 +1,20 @@ -import MockAdapter from 'axios-mock-adapter'; import { InMemoryCache } from 'apollo-cache-inmemory'; +import MockAdapter from 'axios-mock-adapter'; import { createMockClient } from 'mock-apollo-client'; import waitForPromises from 'helpers/wait_for_promises'; -import axios from '~/lib/utils/axios_utils'; +import { STATUSES } from '~/import_entities/constants'; import { clientTypenames, createResolvers, } from '~/import_entities/import_groups/graphql/client_factory'; +import importGroupMutation from '~/import_entities/import_groups/graphql/mutations/import_group.mutation.graphql'; +import setNewNameMutation from '~/import_entities/import_groups/graphql/mutations/set_new_name.mutation.graphql'; +import setTargetNamespaceMutation from '~/import_entities/import_groups/graphql/mutations/set_target_namespace.mutation.graphql'; +import availableNamespacesQuery from '~/import_entities/import_groups/graphql/queries/available_namespaces.query.graphql'; +import bulkImportSourceGroupsQuery from '~/import_entities/import_groups/graphql/queries/bulk_import_source_groups.query.graphql'; import { StatusPoller } from '~/import_entities/import_groups/graphql/services/status_poller'; -import { STATUSES } from '~/import_entities/constants'; -import bulkImportSourceGroupsQuery from '~/import_entities/import_groups/graphql/queries/bulk_import_source_groups.query.graphql'; -import availableNamespacesQuery from '~/import_entities/import_groups/graphql/queries/available_namespaces.query.graphql'; -import setTargetNamespaceMutation from '~/import_entities/import_groups/graphql/mutations/set_target_namespace.mutation.graphql'; -import setNewNameMutation from '~/import_entities/import_groups/graphql/mutations/set_new_name.mutation.graphql'; -import importGroupMutation from '~/import_entities/import_groups/graphql/mutations/import_group.mutation.graphql'; +import axios from '~/lib/utils/axios_utils'; import httpStatus from '~/lib/utils/http_status'; import { statusEndpointFixture, availableNamespacesFixture } from './fixtures'; diff --git a/spec/frontend/import_entities/import_groups/graphql/services/source_groups_manager_spec.js b/spec/frontend/import_entities/import_groups/graphql/services/source_groups_manager_spec.js index 5940ea544ea..ca987ab3ab4 100644 --- a/spec/frontend/import_entities/import_groups/graphql/services/source_groups_manager_spec.js +++ b/spec/frontend/import_entities/import_groups/graphql/services/source_groups_manager_spec.js @@ -1,7 +1,7 @@ import { defaultDataIdFromObject } from 'apollo-cache-inmemory'; -import { SourceGroupsManager } from '~/import_entities/import_groups/graphql/services/source_groups_manager'; -import ImportSourceGroupFragment from '~/import_entities/import_groups/graphql/fragments/bulk_import_source_group_item.fragment.graphql'; import { clientTypenames } from '~/import_entities/import_groups/graphql/client_factory'; +import ImportSourceGroupFragment from '~/import_entities/import_groups/graphql/fragments/bulk_import_source_group_item.fragment.graphql'; +import { SourceGroupsManager } from '~/import_entities/import_groups/graphql/services/source_groups_manager'; describe('SourceGroupsManager', () => { let manager; diff --git a/spec/frontend/import_entities/import_groups/graphql/services/status_poller_spec.js b/spec/frontend/import_entities/import_groups/graphql/services/status_poller_spec.js index 8d0e1dbd65f..3ae6fd43513 100644 --- a/spec/frontend/import_entities/import_groups/graphql/services/status_poller_spec.js +++ b/spec/frontend/import_entities/import_groups/graphql/services/status_poller_spec.js @@ -1,13 +1,13 @@ -import { createMockClient } from 'mock-apollo-client'; import { InMemoryCache } from 'apollo-cache-inmemory'; +import { createMockClient } from 'mock-apollo-client'; import waitForPromises from 'helpers/wait_for_promises'; import createFlash from '~/flash'; -import { StatusPoller } from '~/import_entities/import_groups/graphql/services/status_poller'; +import { STATUSES } from '~/import_entities/constants'; import { clientTypenames } from '~/import_entities/import_groups/graphql/client_factory'; import bulkImportSourceGroupsQuery from '~/import_entities/import_groups/graphql/queries/bulk_import_source_groups.query.graphql'; -import { STATUSES } from '~/import_entities/constants'; import { SourceGroupsManager } from '~/import_entities/import_groups/graphql/services/source_groups_manager'; +import { StatusPoller } from '~/import_entities/import_groups/graphql/services/status_poller'; import { generateFakeEntry } from '../fixtures'; jest.mock('~/flash'); diff --git a/spec/frontend/import_entities/import_projects/components/bitbucket_status_table_spec.js b/spec/frontend/import_entities/import_projects/components/bitbucket_status_table_spec.js index 8f8c01a8b81..ea88c361f7b 100644 --- a/spec/frontend/import_entities/import_projects/components/bitbucket_status_table_spec.js +++ b/spec/frontend/import_entities/import_projects/components/bitbucket_status_table_spec.js @@ -1,7 +1,7 @@ -import { nextTick } from 'vue'; +import { GlAlert } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; +import { nextTick } from 'vue'; -import { GlAlert } from '@gitlab/ui'; import BitbucketStatusTable from '~/import_entities/import_projects/components/bitbucket_status_table.vue'; import ImportProjectsTable from '~/import_entities/import_projects/components/import_projects_table.vue'; diff --git a/spec/frontend/import_entities/import_projects/components/import_projects_table_spec.js b/spec/frontend/import_entities/import_projects/components/import_projects_table_spec.js index 27f642d15c8..038394456d6 100644 --- a/spec/frontend/import_entities/import_projects/components/import_projects_table_spec.js +++ b/spec/frontend/import_entities/import_projects/components/import_projects_table_spec.js @@ -1,12 +1,12 @@ +import { GlLoadingIcon, GlButton, GlIntersectionObserver } from '@gitlab/ui'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; import { nextTick } from 'vue'; import Vuex from 'vuex'; -import { createLocalVue, shallowMount } from '@vue/test-utils'; -import { GlLoadingIcon, GlButton, GlIntersectionObserver } from '@gitlab/ui'; -import state from '~/import_entities/import_projects/store/state'; -import * as getters from '~/import_entities/import_projects/store/getters'; import { STATUSES } from '~/import_entities/constants'; import ImportProjectsTable from '~/import_entities/import_projects/components/import_projects_table.vue'; import ProviderRepoTableRow from '~/import_entities/import_projects/components/provider_repo_table_row.vue'; +import * as getters from '~/import_entities/import_projects/store/getters'; +import state from '~/import_entities/import_projects/store/state'; describe('ImportProjectsTable', () => { let wrapper; diff --git a/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js b/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js index 2ed11ae277e..9f85471bdfa 100644 --- a/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js +++ b/spec/frontend/import_entities/import_projects/components/provider_repo_table_row_spec.js @@ -1,10 +1,10 @@ +import { GlBadge } from '@gitlab/ui'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; import { nextTick } from 'vue'; import Vuex from 'vuex'; -import { createLocalVue, shallowMount } from '@vue/test-utils'; -import { GlBadge } from '@gitlab/ui'; -import ProviderRepoTableRow from '~/import_entities/import_projects/components/provider_repo_table_row.vue'; -import ImportStatus from '~/import_entities/components/import_status.vue'; import { STATUSES } from '~/import_entities//constants'; +import ImportStatus from '~/import_entities/components/import_status.vue'; +import ProviderRepoTableRow from '~/import_entities/import_projects/components/provider_repo_table_row.vue'; import Select2Select from '~/vue_shared/components/select2_select.vue'; describe('ProviderRepoTableRow', () => { diff --git a/spec/frontend/import_entities/import_projects/store/actions_spec.js b/spec/frontend/import_entities/import_projects/store/actions_spec.js index bd731dc3929..9bff77cd34a 100644 --- a/spec/frontend/import_entities/import_projects/store/actions_spec.js +++ b/spec/frontend/import_entities/import_projects/store/actions_spec.js @@ -1,9 +1,10 @@ import MockAdapter from 'axios-mock-adapter'; -import testAction from 'helpers/vuex_action_helper'; import { TEST_HOST } from 'helpers/test_constants'; +import testAction from 'helpers/vuex_action_helper'; import { deprecatedCreateFlash as createFlash } from '~/flash'; -import axios from '~/lib/utils/axios_utils'; -import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; +import { STATUSES } from '~/import_entities/constants'; +import actionsFactory from '~/import_entities/import_projects/store/actions'; +import { getImportTarget } from '~/import_entities/import_projects/store/getters'; import { REQUEST_REPOS, RECEIVE_REPOS_SUCCESS, @@ -18,10 +19,9 @@ import { SET_PAGE, SET_FILTER, } from '~/import_entities/import_projects/store/mutation_types'; -import actionsFactory from '~/import_entities/import_projects/store/actions'; -import { getImportTarget } from '~/import_entities/import_projects/store/getters'; import state from '~/import_entities/import_projects/store/state'; -import { STATUSES } from '~/import_entities/constants'; +import axios from '~/lib/utils/axios_utils'; +import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; jest.mock('~/flash'); diff --git a/spec/frontend/import_entities/import_projects/store/getters_spec.js b/spec/frontend/import_entities/import_projects/store/getters_spec.js index f0ccffc19f2..55826b20ca3 100644 --- a/spec/frontend/import_entities/import_projects/store/getters_spec.js +++ b/spec/frontend/import_entities/import_projects/store/getters_spec.js @@ -1,3 +1,4 @@ +import { STATUSES } from '~/import_entities/constants'; import { isLoading, isImportingAnyRepo, @@ -6,7 +7,6 @@ import { importAllCount, getImportTarget, } from '~/import_entities/import_projects/store/getters'; -import { STATUSES } from '~/import_entities/constants'; import state from '~/import_entities/import_projects/store/state'; const IMPORTED_REPO = { diff --git a/spec/frontend/import_entities/import_projects/store/mutations_spec.js b/spec/frontend/import_entities/import_projects/store/mutations_spec.js index 8b7ddffe6f4..e062d889325 100644 --- a/spec/frontend/import_entities/import_projects/store/mutations_spec.js +++ b/spec/frontend/import_entities/import_projects/store/mutations_spec.js @@ -1,7 +1,7 @@ +import { STATUSES } from '~/import_entities/constants'; import * as types from '~/import_entities/import_projects/store/mutation_types'; import mutations from '~/import_entities/import_projects/store/mutations'; import getInitialState from '~/import_entities/import_projects/store/state'; -import { STATUSES } from '~/import_entities/constants'; describe('import_projects store mutations', () => { let state; diff --git a/spec/frontend/import_entities/import_projects/utils_spec.js b/spec/frontend/import_entities/import_projects/utils_spec.js index 7d9c4b7137e..d705f0acbfe 100644 --- a/spec/frontend/import_entities/import_projects/utils_spec.js +++ b/spec/frontend/import_entities/import_projects/utils_spec.js @@ -1,9 +1,9 @@ +import { STATUSES } from '~/import_entities/constants'; import { isProjectImportable, isIncompatible, getImportStatus, } from '~/import_entities/import_projects/utils'; -import { STATUSES } from '~/import_entities/constants'; describe('import_projects utils', () => { const COMPATIBLE_PROJECT = { diff --git a/spec/frontend/incidents/components/incidents_list_spec.js b/spec/frontend/incidents/components/incidents_list_spec.js index 8212776742c..df681658081 100644 --- a/spec/frontend/incidents/components/incidents_list_spec.js +++ b/spec/frontend/incidents/components/incidents_list_spec.js @@ -1,10 +1,6 @@ -import { mount } from '@vue/test-utils'; import { GlAlert, GlLoadingIcon, GlTable, GlAvatar, GlEmptyState } from '@gitlab/ui'; -import Tracking from '~/tracking'; -import { visitUrl, joinPaths, mergeUrlParams } from '~/lib/utils/url_utility'; +import { mount } from '@vue/test-utils'; import IncidentsList from '~/incidents/components/incidents_list.vue'; -import SeverityToken from '~/sidebar/components/severity/severity.vue'; -import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import { I18N, TH_CREATED_AT_TEST_ID, @@ -14,6 +10,10 @@ import { trackIncidentCreateNewOptions, trackIncidentListViewsOptions, } from '~/incidents/constants'; +import { visitUrl, joinPaths, mergeUrlParams } from '~/lib/utils/url_utility'; +import SeverityToken from '~/sidebar/components/severity/severity.vue'; +import Tracking from '~/tracking'; +import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import mockIncidents from '../mocks/incidents.json'; jest.mock('~/lib/utils/url_utility', () => ({ diff --git a/spec/frontend/incidents_settings/components/incidents_settings_service_spec.js b/spec/frontend/incidents_settings/components/incidents_settings_service_spec.js index 5010fc0bb5c..5476e895c68 100644 --- a/spec/frontend/incidents_settings/components/incidents_settings_service_spec.js +++ b/spec/frontend/incidents_settings/components/incidents_settings_service_spec.js @@ -1,9 +1,9 @@ import AxiosMockAdapter from 'axios-mock-adapter'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; +import { ERROR_MSG } from '~/incidents_settings/constants'; +import IncidentsSettingsService from '~/incidents_settings/incidents_settings_service'; import axios from '~/lib/utils/axios_utils'; import httpStatusCodes from '~/lib/utils/http_status'; -import IncidentsSettingsService from '~/incidents_settings/incidents_settings_service'; -import { ERROR_MSG } from '~/incidents_settings/constants'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; import { refreshCurrentPage } from '~/lib/utils/url_utility'; jest.mock('~/flash'); diff --git a/spec/frontend/incidents_settings/components/incidents_settings_tabs_spec.js b/spec/frontend/incidents_settings/components/incidents_settings_tabs_spec.js index c80d9ad2e5b..ff40f1fa008 100644 --- a/spec/frontend/incidents_settings/components/incidents_settings_tabs_spec.js +++ b/spec/frontend/incidents_settings/components/incidents_settings_tabs_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlTab } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import IncidentsSettingTabs from '~/incidents_settings/components/incidents_settings_tabs.vue'; describe('IncidentsSettingTabs', () => { diff --git a/spec/frontend/incidents_settings/components/pagerduty_form_spec.js b/spec/frontend/incidents_settings/components/pagerduty_form_spec.js index 0d98c09e16f..2ffd1292ddc 100644 --- a/spec/frontend/incidents_settings/components/pagerduty_form_spec.js +++ b/spec/frontend/incidents_settings/components/pagerduty_form_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlAlert, GlModal } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import waitForPromises from 'helpers/wait_for_promises'; import PagerDutySettingsForm from '~/incidents_settings/components/pagerduty_form.vue'; diff --git a/spec/frontend/integrations/edit/components/active_checkbox_spec.js b/spec/frontend/integrations/edit/components/active_checkbox_spec.js index 38bcb1e0aab..76fd6dd3a48 100644 --- a/spec/frontend/integrations/edit/components/active_checkbox_spec.js +++ b/spec/frontend/integrations/edit/components/active_checkbox_spec.js @@ -1,8 +1,7 @@ -import { mount } from '@vue/test-utils'; import { GlFormCheckbox } from '@gitlab/ui'; -import { createStore } from '~/integrations/edit/store'; - +import { mount } from '@vue/test-utils'; import ActiveCheckbox from '~/integrations/edit/components/active_checkbox.vue'; +import { createStore } from '~/integrations/edit/store'; describe('ActiveCheckbox', () => { let wrapper; diff --git a/spec/frontend/integrations/edit/components/confirmation_modal_spec.js b/spec/frontend/integrations/edit/components/confirmation_modal_spec.js index b570ab4e844..1c126f60c37 100644 --- a/spec/frontend/integrations/edit/components/confirmation_modal_spec.js +++ b/spec/frontend/integrations/edit/components/confirmation_modal_spec.js @@ -1,8 +1,7 @@ -import { shallowMount } from '@vue/test-utils'; import { GlModal } from '@gitlab/ui'; -import { createStore } from '~/integrations/edit/store'; - +import { shallowMount } from '@vue/test-utils'; import ConfirmationModal from '~/integrations/edit/components/confirmation_modal.vue'; +import { createStore } from '~/integrations/edit/store'; describe('ConfirmationModal', () => { let wrapper; diff --git a/spec/frontend/integrations/edit/components/dynamic_field_spec.js b/spec/frontend/integrations/edit/components/dynamic_field_spec.js index ecd03103992..aaca9fc4e62 100644 --- a/spec/frontend/integrations/edit/components/dynamic_field_spec.js +++ b/spec/frontend/integrations/edit/components/dynamic_field_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlFormGroup, GlFormCheckbox, GlFormInput, GlFormSelect, GlFormTextarea } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import DynamicField from '~/integrations/edit/components/dynamic_field.vue'; describe('DynamicField', () => { diff --git a/spec/frontend/integrations/edit/components/integration_form_spec.js b/spec/frontend/integrations/edit/components/integration_form_spec.js index 4888a8c1a5a..df855674804 100644 --- a/spec/frontend/integrations/edit/components/integration_form_spec.js +++ b/spec/frontend/integrations/edit/components/integration_form_spec.js @@ -1,18 +1,18 @@ import { shallowMount } from '@vue/test-utils'; -import { mockIntegrationProps } from 'jest/integrations/edit/mock_data'; -import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import { setHTMLFixture } from 'helpers/fixtures'; -import { createStore } from '~/integrations/edit/store'; -import IntegrationForm from '~/integrations/edit/components/integration_form.vue'; -import OverrideDropdown from '~/integrations/edit/components/override_dropdown.vue'; +import { extendedWrapper } from 'helpers/vue_test_utils_helper'; +import { mockIntegrationProps } from 'jest/integrations/edit/mock_data'; import ActiveCheckbox from '~/integrations/edit/components/active_checkbox.vue'; import ConfirmationModal from '~/integrations/edit/components/confirmation_modal.vue'; -import ResetConfirmationModal from '~/integrations/edit/components/reset_confirmation_modal.vue'; -import JiraTriggerFields from '~/integrations/edit/components/jira_trigger_fields.vue'; +import DynamicField from '~/integrations/edit/components/dynamic_field.vue'; +import IntegrationForm from '~/integrations/edit/components/integration_form.vue'; import JiraIssuesFields from '~/integrations/edit/components/jira_issues_fields.vue'; +import JiraTriggerFields from '~/integrations/edit/components/jira_trigger_fields.vue'; +import OverrideDropdown from '~/integrations/edit/components/override_dropdown.vue'; +import ResetConfirmationModal from '~/integrations/edit/components/reset_confirmation_modal.vue'; import TriggerFields from '~/integrations/edit/components/trigger_fields.vue'; -import DynamicField from '~/integrations/edit/components/dynamic_field.vue'; import { integrationLevels } from '~/integrations/edit/constants'; +import { createStore } from '~/integrations/edit/store'; describe('IntegrationForm', () => { let wrapper; diff --git a/spec/frontend/integrations/edit/components/jira_issues_fields_spec.js b/spec/frontend/integrations/edit/components/jira_issues_fields_spec.js index d6b53261172..3938e7c7c22 100644 --- a/spec/frontend/integrations/edit/components/jira_issues_fields_spec.js +++ b/spec/frontend/integrations/edit/components/jira_issues_fields_spec.js @@ -1,6 +1,5 @@ -import { mount } from '@vue/test-utils'; - import { GlFormCheckbox, GlFormInput } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import JiraIssuesFields from '~/integrations/edit/components/jira_issues_fields.vue'; import eventHub from '~/integrations/edit/event_hub'; diff --git a/spec/frontend/integrations/edit/components/jira_trigger_fields_spec.js b/spec/frontend/integrations/edit/components/jira_trigger_fields_spec.js index a69e8d6e163..c6e7ee44355 100644 --- a/spec/frontend/integrations/edit/components/jira_trigger_fields_spec.js +++ b/spec/frontend/integrations/edit/components/jira_trigger_fields_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlFormCheckbox } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import JiraTriggerFields from '~/integrations/edit/components/jira_trigger_fields.vue'; describe('JiraTriggerFields', () => { diff --git a/spec/frontend/integrations/edit/components/override_dropdown_spec.js b/spec/frontend/integrations/edit/components/override_dropdown_spec.js index f312c456d5f..592f4514e45 100644 --- a/spec/frontend/integrations/edit/components/override_dropdown_spec.js +++ b/spec/frontend/integrations/edit/components/override_dropdown_spec.js @@ -1,9 +1,8 @@ -import { shallowMount } from '@vue/test-utils'; import { GlDropdown, GlLink } from '@gitlab/ui'; -import { createStore } from '~/integrations/edit/store'; - -import { integrationLevels, overrideDropdownDescriptions } from '~/integrations/edit/constants'; +import { shallowMount } from '@vue/test-utils'; import OverrideDropdown from '~/integrations/edit/components/override_dropdown.vue'; +import { integrationLevels, overrideDropdownDescriptions } from '~/integrations/edit/constants'; +import { createStore } from '~/integrations/edit/store'; describe('OverrideDropdown', () => { let wrapper; diff --git a/spec/frontend/integrations/edit/components/trigger_fields_spec.js b/spec/frontend/integrations/edit/components/trigger_fields_spec.js index 3fa1e5b5f5a..3e5326812b1 100644 --- a/spec/frontend/integrations/edit/components/trigger_fields_spec.js +++ b/spec/frontend/integrations/edit/components/trigger_fields_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlFormGroup, GlFormCheckbox, GlFormInput } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import TriggerFields from '~/integrations/edit/components/trigger_fields.vue'; describe('TriggerFields', () => { diff --git a/spec/frontend/integrations/edit/store/actions_spec.js b/spec/frontend/integrations/edit/store/actions_spec.js index 4b7060fae55..e2f4c138ece 100644 --- a/spec/frontend/integrations/edit/store/actions_spec.js +++ b/spec/frontend/integrations/edit/store/actions_spec.js @@ -1,6 +1,4 @@ import testAction from 'helpers/vuex_action_helper'; -import { refreshCurrentPage } from '~/lib/utils/url_utility'; -import createState from '~/integrations/edit/store/state'; import { setOverride, setIsSaving, @@ -14,6 +12,8 @@ import { receiveJiraIssueTypesError, } from '~/integrations/edit/store/actions'; import * as types from '~/integrations/edit/store/mutation_types'; +import createState from '~/integrations/edit/store/state'; +import { refreshCurrentPage } from '~/lib/utils/url_utility'; jest.mock('~/lib/utils/url_utility'); diff --git a/spec/frontend/integrations/edit/store/getters_spec.js b/spec/frontend/integrations/edit/store/getters_spec.js index 7d4532a1059..ad7a887dff2 100644 --- a/spec/frontend/integrations/edit/store/getters_spec.js +++ b/spec/frontend/integrations/edit/store/getters_spec.js @@ -4,9 +4,9 @@ import { isDisabled, propsSource, } from '~/integrations/edit/store/getters'; -import createState from '~/integrations/edit/store/state'; -import mutations from '~/integrations/edit/store/mutations'; import * as types from '~/integrations/edit/store/mutation_types'; +import mutations from '~/integrations/edit/store/mutations'; +import createState from '~/integrations/edit/store/state'; import { mockIntegrationProps } from '../mock_data'; describe('Integration form store getters', () => { diff --git a/spec/frontend/integrations/edit/store/mutations_spec.js b/spec/frontend/integrations/edit/store/mutations_spec.js index bf2a51d4dad..18faa2f6bba 100644 --- a/spec/frontend/integrations/edit/store/mutations_spec.js +++ b/spec/frontend/integrations/edit/store/mutations_spec.js @@ -1,6 +1,6 @@ +import * as types from '~/integrations/edit/store/mutation_types'; import mutations from '~/integrations/edit/store/mutations'; import createState from '~/integrations/edit/store/state'; -import * as types from '~/integrations/edit/store/mutation_types'; describe('Integration form store mutations', () => { let state; diff --git a/spec/frontend/integrations/integration_settings_form_spec.js b/spec/frontend/integrations/integration_settings_form_spec.js index 373f8f196f9..348b942703f 100644 --- a/spec/frontend/integrations/integration_settings_form_spec.js +++ b/spec/frontend/integrations/integration_settings_form_spec.js @@ -1,6 +1,6 @@ import MockAdaptor from 'axios-mock-adapter'; -import axios from '~/lib/utils/axios_utils'; import IntegrationSettingsForm from '~/integrations/integration_settings_form'; +import axios from '~/lib/utils/axios_utils'; import toast from '~/vue_shared/plugins/global_toast'; jest.mock('~/vue_shared/plugins/global_toast'); diff --git a/spec/frontend/invite_member/components/invite_member_modal_spec.js b/spec/frontend/invite_member/components/invite_member_modal_spec.js index 1140c2a9475..4eff19402a8 100644 --- a/spec/frontend/invite_member/components/invite_member_modal_spec.js +++ b/spec/frontend/invite_member/components/invite_member_modal_spec.js @@ -1,7 +1,7 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLink, GlModal } from '@gitlab/ui'; -import { mockTracking, unmockTracking, triggerEvent } from 'helpers/tracking_helper'; +import { shallowMount } from '@vue/test-utils'; import { stubComponent } from 'helpers/stub_component'; +import { mockTracking, unmockTracking, triggerEvent } from 'helpers/tracking_helper'; import InviteMemberModal from '~/invite_member/components/invite_member_modal.vue'; const memberPath = 'member_path'; diff --git a/spec/frontend/invite_member/components/invite_member_trigger_spec.js b/spec/frontend/invite_member/components/invite_member_trigger_spec.js index 57b8918e3da..67c312fd155 100644 --- a/spec/frontend/invite_member/components/invite_member_trigger_spec.js +++ b/spec/frontend/invite_member/components/invite_member_trigger_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLink } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { mockTracking, unmockTracking, triggerEvent } from 'helpers/tracking_helper'; import InviteMemberTrigger from '~/invite_member/components/invite_member_trigger.vue'; import triggerProvides from './invite_member_trigger_mock_data'; diff --git a/spec/frontend/invite_members/components/invite_members_modal_spec.js b/spec/frontend/invite_members/components/invite_members_modal_spec.js index fc039bdf6da..e310a00133c 100644 --- a/spec/frontend/invite_members/components/invite_members_modal_spec.js +++ b/spec/frontend/invite_members/components/invite_members_modal_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlDropdown, GlDropdownItem, GlDatepicker, GlSprintf, GlLink, GlModal } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { stubComponent } from 'helpers/stub_component'; import waitForPromises from 'helpers/wait_for_promises'; import Api from '~/api'; diff --git a/spec/frontend/invite_members/components/invite_members_trigger_spec.js b/spec/frontend/invite_members/components/invite_members_trigger_spec.js index 450d37a9748..18d6662d2d4 100644 --- a/spec/frontend/invite_members/components/invite_members_trigger_spec.js +++ b/spec/frontend/invite_members/components/invite_members_trigger_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon, GlLink } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import InviteMembersTrigger from '~/invite_members/components/invite_members_trigger.vue'; const displayText = 'Invite team members'; diff --git a/spec/frontend/invite_members/components/members_token_select_spec.js b/spec/frontend/invite_members/components/members_token_select_spec.js index ff123a13ce7..a945b99bd54 100644 --- a/spec/frontend/invite_members/components/members_token_select_spec.js +++ b/spec/frontend/invite_members/components/members_token_select_spec.js @@ -1,8 +1,8 @@ +import { GlTokenSelector } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import { nextTick } from 'vue'; -import { GlTokenSelector } from '@gitlab/ui'; -import waitForPromises from 'helpers/wait_for_promises'; import { stubComponent } from 'helpers/stub_component'; +import waitForPromises from 'helpers/wait_for_promises'; import * as UserApi from '~/api/user_api'; import MembersTokenSelect from '~/invite_members/components/members_token_select.vue'; diff --git a/spec/frontend/issuable/components/issuable_by_email_spec.js b/spec/frontend/issuable/components/issuable_by_email_spec.js index 7e40b903754..08a99f29479 100644 --- a/spec/frontend/issuable/components/issuable_by_email_spec.js +++ b/spec/frontend/issuable/components/issuable_by_email_spec.js @@ -1,11 +1,11 @@ +import { GlModal, GlSprintf, GlFormInputGroup, GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; -import { shallowMount } from '@vue/test-utils'; -import { GlModal, GlSprintf, GlFormInputGroup, GlButton } from '@gitlab/ui'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import waitForPromises from 'helpers/wait_for_promises'; -import httpStatus from '~/lib/utils/http_status'; import IssuableByEmail from '~/issuable/components/issuable_by_email.vue'; +import httpStatus from '~/lib/utils/http_status'; const initialEmail = 'user@gitlab.com'; diff --git a/spec/frontend/issuable/related_issues/components/add_issuable_form_spec.js b/spec/frontend/issuable/related_issues/components/add_issuable_form_spec.js index de2671816d8..173d12757e3 100644 --- a/spec/frontend/issuable/related_issues/components/add_issuable_form_spec.js +++ b/spec/frontend/issuable/related_issues/components/add_issuable_form_spec.js @@ -1,6 +1,6 @@ import { mount, shallowMount } from '@vue/test-utils'; -import { issuableTypesMap, linkedIssueTypesMap, PathIdSeparator } from '~/related_issues/constants'; import AddIssuableForm from '~/related_issues/components/add_issuable_form.vue'; +import { issuableTypesMap, linkedIssueTypesMap, PathIdSeparator } from '~/related_issues/constants'; const issuable1 = { id: 200, diff --git a/spec/frontend/issuable/related_issues/components/issue_token_spec.js b/spec/frontend/issuable/related_issues/components/issue_token_spec.js index d5181d4a17a..d6aeacfe07a 100644 --- a/spec/frontend/issuable/related_issues/components/issue_token_spec.js +++ b/spec/frontend/issuable/related_issues/components/issue_token_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; -import { PathIdSeparator } from '~/related_issues/constants'; import IssueToken from '~/related_issues/components/issue_token.vue'; +import { PathIdSeparator } from '~/related_issues/constants'; describe('IssueToken', () => { const idKey = 200; diff --git a/spec/frontend/issuable/related_issues/components/related_issues_block_spec.js b/spec/frontend/issuable/related_issues/components/related_issues_block_spec.js index c0889b09adc..a450f912c4e 100644 --- a/spec/frontend/issuable/related_issues/components/related_issues_block_spec.js +++ b/spec/frontend/issuable/related_issues/components/related_issues_block_spec.js @@ -1,5 +1,5 @@ -import { shallowMount, mount } from '@vue/test-utils'; import { GlButton, GlIcon } from '@gitlab/ui'; +import { shallowMount, mount } from '@vue/test-utils'; import { issuable1, issuable2, diff --git a/spec/frontend/issuable/related_issues/components/related_issues_root_spec.js b/spec/frontend/issuable/related_issues/components/related_issues_root_spec.js index 93fe321957c..e5e3478dc59 100644 --- a/spec/frontend/issuable/related_issues/components/related_issues_root_spec.js +++ b/spec/frontend/issuable/related_issues/components/related_issues_root_spec.js @@ -6,11 +6,11 @@ import { issuable1, issuable2, } from 'jest/vue_shared/components/issue/related_issuable_mock_data'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import RelatedIssuesRoot from '~/related_issues/components/related_issues_root.vue'; -import relatedIssuesService from '~/related_issues/services/related_issues_service'; import { linkedIssueTypesMap } from '~/related_issues/constants'; -import axios from '~/lib/utils/axios_utils'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; +import relatedIssuesService from '~/related_issues/services/related_issues_service'; jest.mock('~/flash'); diff --git a/spec/frontend/issuable_create/components/issuable_form_spec.js b/spec/frontend/issuable_create/components/issuable_form_spec.js index e489d1dae3e..a074fddf091 100644 --- a/spec/frontend/issuable_create/components/issuable_form_spec.js +++ b/spec/frontend/issuable_create/components/issuable_form_spec.js @@ -1,11 +1,10 @@ -import { shallowMount } from '@vue/test-utils'; import { GlFormInput } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; +import IssuableForm from '~/issuable_create/components/issuable_form.vue'; import MarkdownField from '~/vue_shared/components/markdown/field.vue'; import LabelsSelect from '~/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue'; -import IssuableForm from '~/issuable_create/components/issuable_form.vue'; - const createComponent = ({ descriptionPreviewPath = '/gitlab-org/gitlab-shell/preview_markdown', descriptionHelpPath = '/help/user/markdown', diff --git a/spec/frontend/issuable_list/components/issuable_item_spec.js b/spec/frontend/issuable_list/components/issuable_item_spec.js index e84bb5074bc..d6e6816086e 100644 --- a/spec/frontend/issuable_list/components/issuable_item_spec.js +++ b/spec/frontend/issuable_list/components/issuable_item_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLink, GlLabel, GlIcon, GlFormCheckbox } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { useFakeDate } from 'helpers/fake_date'; import IssuableItem from '~/issuable_list/components/issuable_item.vue'; import IssuableAssignees from '~/vue_shared/components/issue/issue_assignees.vue'; diff --git a/spec/frontend/issuable_list/components/issuable_list_root_spec.js b/spec/frontend/issuable_list/components/issuable_list_root_spec.js index add5d9e8e2d..9c57233548c 100644 --- a/spec/frontend/issuable_list/components/issuable_list_root_spec.js +++ b/spec/frontend/issuable_list/components/issuable_list_root_spec.js @@ -1,11 +1,11 @@ -import { mount } from '@vue/test-utils'; import { GlSkeletonLoading, GlPagination } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; +import IssuableItem from '~/issuable_list/components/issuable_item.vue'; import IssuableListRoot from '~/issuable_list/components/issuable_list_root.vue'; import IssuableTabs from '~/issuable_list/components/issuable_tabs.vue'; -import IssuableItem from '~/issuable_list/components/issuable_item.vue'; import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; import { mockIssuableListProps, mockIssuables } from '../mock_data'; diff --git a/spec/frontend/issuable_list/components/issuable_tabs_spec.js b/spec/frontend/issuable_list/components/issuable_tabs_spec.js index 12611400084..3cc237b9ce9 100644 --- a/spec/frontend/issuable_list/components/issuable_tabs_spec.js +++ b/spec/frontend/issuable_list/components/issuable_tabs_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlTab, GlBadge } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import IssuableTabs from '~/issuable_list/components/issuable_tabs.vue'; diff --git a/spec/frontend/issuable_show/components/issuable_body_spec.js b/spec/frontend/issuable_show/components/issuable_body_spec.js index d7455e2774a..bf166bea1e5 100644 --- a/spec/frontend/issuable_show/components/issuable_body_spec.js +++ b/spec/frontend/issuable_show/components/issuable_body_spec.js @@ -3,9 +3,9 @@ import { useFakeDate } from 'helpers/fake_date'; import IssuableBody from '~/issuable_show/components/issuable_body.vue'; -import IssuableTitle from '~/issuable_show/components/issuable_title.vue'; import IssuableDescription from '~/issuable_show/components/issuable_description.vue'; import IssuableEditForm from '~/issuable_show/components/issuable_edit_form.vue'; +import IssuableTitle from '~/issuable_show/components/issuable_title.vue'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import { mockIssuableShowProps, mockIssuable } from '../mock_data'; diff --git a/spec/frontend/issuable_show/components/issuable_description_spec.js b/spec/frontend/issuable_show/components/issuable_description_spec.js index 1dd8348b098..29ecce1002d 100644 --- a/spec/frontend/issuable_show/components/issuable_description_spec.js +++ b/spec/frontend/issuable_show/components/issuable_description_spec.js @@ -1,5 +1,5 @@ -import $ from 'jquery'; import { shallowMount } from '@vue/test-utils'; +import $ from 'jquery'; import IssuableDescription from '~/issuable_show/components/issuable_description.vue'; diff --git a/spec/frontend/issuable_show/components/issuable_edit_form_spec.js b/spec/frontend/issuable_show/components/issuable_edit_form_spec.js index 522374f2e9c..184c9fe251c 100644 --- a/spec/frontend/issuable_show/components/issuable_edit_form_spec.js +++ b/spec/frontend/issuable_show/components/issuable_edit_form_spec.js @@ -1,9 +1,9 @@ -import { shallowMount } from '@vue/test-utils'; import { GlFormInput } from '@gitlab/ui'; -import MarkdownField from '~/vue_shared/components/markdown/field.vue'; +import { shallowMount } from '@vue/test-utils'; import IssuableEditForm from '~/issuable_show/components/issuable_edit_form.vue'; import IssuableEventHub from '~/issuable_show/event_hub'; +import MarkdownField from '~/vue_shared/components/markdown/field.vue'; import { mockIssuableShowProps, mockIssuable } from '../mock_data'; diff --git a/spec/frontend/issuable_show/components/issuable_header_spec.js b/spec/frontend/issuable_show/components/issuable_header_spec.js index 3363a127347..2164caa40a8 100644 --- a/spec/frontend/issuable_show/components/issuable_header_spec.js +++ b/spec/frontend/issuable_show/components/issuable_header_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon, GlAvatarLabeled } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import IssuableHeader from '~/issuable_show/components/issuable_header.vue'; diff --git a/spec/frontend/issuable_show/components/issuable_show_root_spec.js b/spec/frontend/issuable_show/components/issuable_show_root_spec.js index 6cebfc150f9..3e3778492d2 100644 --- a/spec/frontend/issuable_show/components/issuable_show_root_spec.js +++ b/spec/frontend/issuable_show/components/issuable_show_root_spec.js @@ -1,9 +1,9 @@ import { shallowMount } from '@vue/test-utils'; +import IssuableBody from '~/issuable_show/components/issuable_body.vue'; +import IssuableHeader from '~/issuable_show/components/issuable_header.vue'; import IssuableShowRoot from '~/issuable_show/components/issuable_show_root.vue'; -import IssuableHeader from '~/issuable_show/components/issuable_header.vue'; -import IssuableBody from '~/issuable_show/components/issuable_body.vue'; import IssuableSidebar from '~/issuable_sidebar/components/issuable_sidebar_root.vue'; import { mockIssuableShowProps, mockIssuable } from '../mock_data'; diff --git a/spec/frontend/issuable_show/components/issuable_title_spec.js b/spec/frontend/issuable_show/components/issuable_title_spec.js index e8621c763b3..df6fbdea76b 100644 --- a/spec/frontend/issuable_show/components/issuable_title_spec.js +++ b/spec/frontend/issuable_show/components/issuable_title_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon, GlButton, GlIntersectionObserver } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import IssuableTitle from '~/issuable_show/components/issuable_title.vue'; diff --git a/spec/frontend/issuable_sidebar/components/issuable_sidebar_root_spec.js b/spec/frontend/issuable_sidebar/components/issuable_sidebar_root_spec.js index 7686dad4644..62a0016d67b 100644 --- a/spec/frontend/issuable_sidebar/components/issuable_sidebar_root_spec.js +++ b/spec/frontend/issuable_sidebar/components/issuable_sidebar_root_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; +import { shallowMount } from '@vue/test-utils'; import Cookies from 'js-cookie'; import IssuableSidebarRoot from '~/issuable_sidebar/components/issuable_sidebar_root.vue'; diff --git a/spec/frontend/issuable_suggestions/components/item_spec.js b/spec/frontend/issuable_suggestions/components/item_spec.js index d0dde256edd..39083b3d8fb 100644 --- a/spec/frontend/issuable_suggestions/components/item_spec.js +++ b/spec/frontend/issuable_suggestions/components/item_spec.js @@ -1,8 +1,8 @@ -import { shallowMount } from '@vue/test-utils'; import { GlTooltip, GlLink, GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; -import UserAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue'; import Suggestion from '~/issuable_suggestions/components/item.vue'; +import UserAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue'; import mockData from '../mock_data'; describe('Issuable suggestions suggestion component', () => { diff --git a/spec/frontend/issue_show/components/app_spec.js b/spec/frontend/issue_show/components/app_spec.js index a052b856c0e..9e1bc8242fe 100644 --- a/spec/frontend/issue_show/components/app_spec.js +++ b/spec/frontend/issue_show/components/app_spec.js @@ -2,15 +2,15 @@ import { GlIntersectionObserver } from '@gitlab/ui'; import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import { useMockIntersectionObserver } from 'helpers/mock_dom_observer'; -import axios from '~/lib/utils/axios_utils'; -import { visitUrl } from '~/lib/utils/url_utility'; import '~/behaviors/markdown/render_gfm'; import IssuableApp from '~/issue_show/components/app.vue'; -import eventHub from '~/issue_show/event_hub'; -import IncidentTabs from '~/issue_show/components/incidents/incident_tabs.vue'; import DescriptionComponent from '~/issue_show/components/description.vue'; +import IncidentTabs from '~/issue_show/components/incidents/incident_tabs.vue'; import PinnedLinks from '~/issue_show/components/pinned_links.vue'; import { IssuableStatus, IssuableStatusText } from '~/issue_show/constants'; +import eventHub from '~/issue_show/event_hub'; +import axios from '~/lib/utils/axios_utils'; +import { visitUrl } from '~/lib/utils/url_utility'; import { appProps, initialRequest, diff --git a/spec/frontend/issue_show/components/description_spec.js b/spec/frontend/issue_show/components/description_spec.js index de53d98e6be..d59a257a2be 100644 --- a/spec/frontend/issue_show/components/description_spec.js +++ b/spec/frontend/issue_show/components/description_spec.js @@ -1,8 +1,8 @@ import $ from 'jquery'; import Vue from 'vue'; import '~/behaviors/markdown/render_gfm'; -import mountComponent from 'helpers/vue_mount_component_helper'; import { TEST_HOST } from 'helpers/test_constants'; +import mountComponent from 'helpers/vue_mount_component_helper'; import Description from '~/issue_show/components/description.vue'; import TaskList from '~/task_list'; import { descriptionProps as props } from '../mock_data'; diff --git a/spec/frontend/issue_show/components/fields/description_spec.js b/spec/frontend/issue_show/components/fields/description_spec.js index f4579ed43fb..a50be30cf4c 100644 --- a/spec/frontend/issue_show/components/fields/description_spec.js +++ b/spec/frontend/issue_show/components/fields/description_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; import DescriptionField from '~/issue_show/components/fields/description.vue'; -import MarkdownField from '~/vue_shared/components/markdown/field.vue'; import eventHub from '~/issue_show/event_hub'; +import MarkdownField from '~/vue_shared/components/markdown/field.vue'; describe('Description field component', () => { let wrapper; diff --git a/spec/frontend/issue_show/components/form_spec.js b/spec/frontend/issue_show/components/form_spec.js index 5452a1f45f8..4a8ec3cf66a 100644 --- a/spec/frontend/issue_show/components/form_spec.js +++ b/spec/frontend/issue_show/components/form_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import mountComponent from 'helpers/vue_mount_component_helper'; -import formComponent from '~/issue_show/components/form.vue'; import Autosave from '~/autosave'; +import formComponent from '~/issue_show/components/form.vue'; import eventHub from '~/issue_show/event_hub'; jest.mock('~/autosave'); diff --git a/spec/frontend/issue_show/components/incidents/highlight_bar_spec.js b/spec/frontend/issue_show/components/incidents/highlight_bar_spec.js index 112cb4d4c3a..6758e6192b8 100644 --- a/spec/frontend/issue_show/components/incidents/highlight_bar_spec.js +++ b/spec/frontend/issue_show/components/incidents/highlight_bar_spec.js @@ -1,6 +1,6 @@ +import { GlLink } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import merge from 'lodash/merge'; -import { GlLink } from '@gitlab/ui'; import HighlightBar from '~/issue_show/components/incidents/highlight_bar.vue'; import { formatDate } from '~/lib/utils/datetime_utility'; diff --git a/spec/frontend/issue_show/components/incidents/incident_tabs_spec.js b/spec/frontend/issue_show/components/incidents/incident_tabs_spec.js index ef825688b69..f46b6ba6f54 100644 --- a/spec/frontend/issue_show/components/incidents/incident_tabs_spec.js +++ b/spec/frontend/issue_show/components/incidents/incident_tabs_spec.js @@ -1,14 +1,14 @@ +import { GlTab } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import merge from 'lodash/merge'; -import { GlTab } from '@gitlab/ui'; import waitForPromises from 'helpers/wait_for_promises'; -import INVALID_URL from '~/lib/utils/invalid_url'; -import IncidentTabs from '~/issue_show/components/incidents/incident_tabs.vue'; +import { trackIncidentDetailsViewsOptions } from '~/incidents/constants'; import DescriptionComponent from '~/issue_show/components/description.vue'; import HighlightBar from '~/issue_show/components/incidents/highlight_bar.vue'; -import AlertDetailsTable from '~/vue_shared/components/alert_details_table.vue'; +import IncidentTabs from '~/issue_show/components/incidents/incident_tabs.vue'; +import INVALID_URL from '~/lib/utils/invalid_url'; import Tracking from '~/tracking'; -import { trackIncidentDetailsViewsOptions } from '~/incidents/constants'; +import AlertDetailsTable from '~/vue_shared/components/alert_details_table.vue'; import { descriptionProps } from '../../mock_data'; const mockAlert = { diff --git a/spec/frontend/issue_show/components/pinned_links_spec.js b/spec/frontend/issue_show/components/pinned_links_spec.js index 2d140fd068a..3fe1f9fd6d9 100644 --- a/spec/frontend/issue_show/components/pinned_links_spec.js +++ b/spec/frontend/issue_show/components/pinned_links_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import PinnedLinks from '~/issue_show/components/pinned_links.vue'; import { STATUS_PAGE_PUBLISHED, JOIN_ZOOM_MEETING } from '~/issue_show/constants'; diff --git a/spec/frontend/issue_show/components/title_spec.js b/spec/frontend/issue_show/components/title_spec.js index c274048fdd5..78880a7f540 100644 --- a/spec/frontend/issue_show/components/title_spec.js +++ b/spec/frontend/issue_show/components/title_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; -import Store from '~/issue_show/stores'; import titleComponent from '~/issue_show/components/title.vue'; import eventHub from '~/issue_show/event_hub'; +import Store from '~/issue_show/stores'; describe('Title component', () => { let vm; diff --git a/spec/frontend/issue_show/issue_spec.js b/spec/frontend/issue_show/issue_spec.js index 51f3a580e6e..9cb7059dd7f 100644 --- a/spec/frontend/issue_show/issue_spec.js +++ b/spec/frontend/issue_show/issue_spec.js @@ -1,9 +1,9 @@ import MockAdapter from 'axios-mock-adapter'; import { useMockIntersectionObserver } from 'helpers/mock_dom_observer'; import waitForPromises from 'helpers/wait_for_promises'; -import axios from '~/lib/utils/axios_utils'; import { initIssuableApp } from '~/issue_show/issue'; import * as parseData from '~/issue_show/utils/parse_data'; +import axios from '~/lib/utils/axios_utils'; import createStore from '~/notes/stores'; import { appProps } from './mock_data'; diff --git a/spec/frontend/issue_spec.js b/spec/frontend/issue_spec.js index 303267e784f..fb6caef41e2 100644 --- a/spec/frontend/issue_spec.js +++ b/spec/frontend/issue_spec.js @@ -1,7 +1,7 @@ -import $ from 'jquery'; import MockAdapter from 'axios-mock-adapter'; -import axios from '~/lib/utils/axios_utils'; +import $ from 'jquery'; import Issue from '~/issue'; +import axios from '~/lib/utils/axios_utils'; import '~/lib/utils/text_utility'; describe('Issue', () => { diff --git a/spec/frontend/issues_list/components/issuable_spec.js b/spec/frontend/issues_list/components/issuable_spec.js index 776d0f2c2de..a8bf124373b 100644 --- a/spec/frontend/issues_list/components/issuable_spec.js +++ b/spec/frontend/issues_list/components/issuable_spec.js @@ -1,13 +1,13 @@ -import { shallowMount } from '@vue/test-utils'; import { GlSprintf, GlLabel, GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; import { trimText } from 'helpers/text_helper'; -import initUserPopovers from '~/user_popovers'; +import Issuable from '~/issues_list/components/issuable.vue'; +import { isScopedLabel } from '~/lib/utils/common_utils'; import { formatDate } from '~/lib/utils/datetime_utility'; import { mergeUrlParams } from '~/lib/utils/url_utility'; -import Issuable from '~/issues_list/components/issuable.vue'; +import initUserPopovers from '~/user_popovers'; import IssueAssignees from '~/vue_shared/components/issue/issue_assignees.vue'; -import { isScopedLabel } from '~/lib/utils/common_utils'; import { simpleIssue, testAssignees, testLabels } from '../issuable_list_test_data'; jest.mock('~/user_popovers'); diff --git a/spec/frontend/issues_list/components/issuables_list_app_spec.js b/spec/frontend/issues_list/components/issuables_list_app_spec.js index 9d603099ff7..9d69a597f63 100644 --- a/spec/frontend/issues_list/components/issuables_list_app_spec.js +++ b/spec/frontend/issues_list/components/issuables_list_app_spec.js @@ -1,19 +1,19 @@ -import axios from 'axios'; -import MockAdapter from 'axios-mock-adapter'; -import { shallowMount } from '@vue/test-utils'; import { GlEmptyState, GlPagination, GlDeprecatedSkeletonLoading as GlSkeletonLoading, } from '@gitlab/ui'; -import waitForPromises from 'helpers/wait_for_promises'; +import { shallowMount } from '@vue/test-utils'; +import axios from 'axios'; +import MockAdapter from 'axios-mock-adapter'; import { TEST_HOST } from 'helpers/test_constants'; +import waitForPromises from 'helpers/wait_for_promises'; import { deprecatedCreateFlash as flash } from '~/flash'; -import IssuablesListApp from '~/issues_list/components/issuables_list_app.vue'; import Issuable from '~/issues_list/components/issuable.vue'; -import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; -import issueablesEventBus from '~/issues_list/eventhub'; +import IssuablesListApp from '~/issues_list/components/issuables_list_app.vue'; import { PAGE_SIZE, PAGE_SIZE_MANUAL, RELATIVE_POSITION } from '~/issues_list/constants'; +import issueablesEventBus from '~/issues_list/eventhub'; +import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; jest.mock('~/flash'); jest.mock('~/issues_list/eventhub'); diff --git a/spec/frontend/jira_connect/api_spec.js b/spec/frontend/jira_connect/api_spec.js index f98d56a6621..240a57c7917 100644 --- a/spec/frontend/jira_connect/api_spec.js +++ b/spec/frontend/jira_connect/api_spec.js @@ -1,9 +1,8 @@ import MockAdapter from 'axios-mock-adapter'; +import { addSubscription, removeSubscription, fetchGroups } from '~/jira_connect/api'; import axios from '~/lib/utils/axios_utils'; import httpStatus from '~/lib/utils/http_status'; -import { addSubscription, removeSubscription, fetchGroups } from '~/jira_connect/api'; - describe('JiraConnect API', () => { let mock; let response; diff --git a/spec/frontend/jira_connect/components/app_spec.js b/spec/frontend/jira_connect/components/app_spec.js index a9194cfc883..d11b66b2089 100644 --- a/spec/frontend/jira_connect/components/app_spec.js +++ b/spec/frontend/jira_connect/components/app_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlAlert, GlButton, GlModal } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import JiraConnectApp from '~/jira_connect/components/app.vue'; diff --git a/spec/frontend/jira_connect/components/groups_list_item_spec.js b/spec/frontend/jira_connect/components/groups_list_item_spec.js index 2499be1ea5f..bb247534aca 100644 --- a/spec/frontend/jira_connect/components/groups_list_item_spec.js +++ b/spec/frontend/jira_connect/components/groups_list_item_spec.js @@ -1,10 +1,10 @@ -import { mount, shallowMount } from '@vue/test-utils'; import { GlAvatar, GlButton } from '@gitlab/ui'; +import { mount, shallowMount } from '@vue/test-utils'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import waitForPromises from 'helpers/wait_for_promises'; -import GroupsListItem from '~/jira_connect/components/groups_list_item.vue'; import * as JiraConnectApi from '~/jira_connect/api'; +import GroupsListItem from '~/jira_connect/components/groups_list_item.vue'; import { mockGroup1 } from '../mock_data'; describe('GroupsListItem', () => { diff --git a/spec/frontend/jira_connect/components/groups_list_spec.js b/spec/frontend/jira_connect/components/groups_list_spec.js index b18a913ca6a..5c645eccc0e 100644 --- a/spec/frontend/jira_connect/components/groups_list_spec.js +++ b/spec/frontend/jira_connect/components/groups_list_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlAlert, GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import waitForPromises from 'helpers/wait_for_promises'; import { fetchGroups } from '~/jira_connect/api'; diff --git a/spec/frontend/jira_import/components/jira_import_form_spec.js b/spec/frontend/jira_import/components/jira_import_form_spec.js index 1cbd0f5ad30..7a550d85204 100644 --- a/spec/frontend/jira_import/components/jira_import_form_spec.js +++ b/spec/frontend/jira_import/components/jira_import_form_spec.js @@ -11,11 +11,11 @@ import { import { getByRole } from '@testing-library/dom'; import { mount, shallowMount } from '@vue/test-utils'; import AxiosMockAdapter from 'axios-mock-adapter'; -import axios from '~/lib/utils/axios_utils'; import JiraImportForm from '~/jira_import/components/jira_import_form.vue'; import getJiraUserMappingMutation from '~/jira_import/queries/get_jira_user_mapping.mutation.graphql'; import initiateJiraImportMutation from '~/jira_import/queries/initiate_jira_import.mutation.graphql'; import searchProjectMembersQuery from '~/jira_import/queries/search_project_members.query.graphql'; +import axios from '~/lib/utils/axios_utils'; import { imports, issuesPath, diff --git a/spec/frontend/jira_import/mock_data.js b/spec/frontend/jira_import/mock_data.js index 51dd939283e..8dc8ce08f49 100644 --- a/spec/frontend/jira_import/mock_data.js +++ b/spec/frontend/jira_import/mock_data.js @@ -1,6 +1,6 @@ import getJiraImportDetailsQuery from '~/jira_import/queries/get_jira_import_details.query.graphql'; -import { IMPORT_STATE } from '~/jira_import/utils/jira_import_utils'; import { userMappingsPageSize } from '~/jira_import/utils/constants'; +import { IMPORT_STATE } from '~/jira_import/utils/jira_import_utils'; export const fullPath = 'gitlab-org/gitlab-test'; diff --git a/spec/frontend/jira_import/utils/jira_import_utils_spec.js b/spec/frontend/jira_import/utils/jira_import_utils_spec.js index 0992c9e8d16..9696d95f8c4 100644 --- a/spec/frontend/jira_import/utils/jira_import_utils_spec.js +++ b/spec/frontend/jira_import/utils/jira_import_utils_spec.js @@ -1,4 +1,5 @@ import { useLocalStorageSpy } from 'helpers/local_storage_helper'; +import { JIRA_IMPORT_SUCCESS_ALERT_HIDE_MAP_KEY } from '~/issues_list/constants'; import { calculateJiraImportLabel, extractJiraProjectsOptions, @@ -8,7 +9,6 @@ import { setFinishedAlertHideMap, shouldShowFinishedAlert, } from '~/jira_import/utils/jira_import_utils'; -import { JIRA_IMPORT_SUCCESS_ALERT_HIDE_MAP_KEY } from '~/issues_list/constants'; useLocalStorageSpy(); diff --git a/spec/frontend/jobs/components/artifacts_block_spec.js b/spec/frontend/jobs/components/artifacts_block_spec.js index 134463c6763..0c7c0a6c311 100644 --- a/spec/frontend/jobs/components/artifacts_block_spec.js +++ b/spec/frontend/jobs/components/artifacts_block_spec.js @@ -1,7 +1,7 @@ import { mount } from '@vue/test-utils'; import { trimText } from 'helpers/text_helper'; -import { getTimeago } from '~/lib/utils/datetime_utility'; import ArtifactsBlock from '~/jobs/components/artifacts_block.vue'; +import { getTimeago } from '~/lib/utils/datetime_utility'; describe('Artifacts block', () => { let wrapper; diff --git a/spec/frontend/jobs/components/erased_block_spec.js b/spec/frontend/jobs/components/erased_block_spec.js index 9557ecdbb91..057df20ccc2 100644 --- a/spec/frontend/jobs/components/erased_block_spec.js +++ b/spec/frontend/jobs/components/erased_block_spec.js @@ -1,7 +1,7 @@ -import { mount } from '@vue/test-utils'; import { GlLink } from '@gitlab/ui'; -import { getTimeago } from '~/lib/utils/datetime_utility'; +import { mount } from '@vue/test-utils'; import ErasedBlock from '~/jobs/components/erased_block.vue'; +import { getTimeago } from '~/lib/utils/datetime_utility'; describe('Erased block', () => { let wrapper; diff --git a/spec/frontend/jobs/components/job_app_spec.js b/spec/frontend/jobs/components/job_app_spec.js index b9d27932dff..2974e91e46d 100644 --- a/spec/frontend/jobs/components/job_app_spec.js +++ b/spec/frontend/jobs/components/job_app_spec.js @@ -1,18 +1,18 @@ -import Vuex from 'vuex'; -import { mount, createLocalVue } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { mount, createLocalVue } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; +import Vuex from 'vuex'; import { getJSONFixture } from 'helpers/fixtures'; import { TEST_HOST } from 'helpers/test_constants'; -import axios from '~/lib/utils/axios_utils'; +import EmptyState from '~/jobs/components/empty_state.vue'; +import EnvironmentsBlock from '~/jobs/components/environments_block.vue'; +import ErasedBlock from '~/jobs/components/erased_block.vue'; import JobApp from '~/jobs/components/job_app.vue'; import Sidebar from '~/jobs/components/sidebar.vue'; import StuckBlock from '~/jobs/components/stuck_block.vue'; import UnmetPrerequisitesBlock from '~/jobs/components/unmet_prerequisites_block.vue'; -import EnvironmentsBlock from '~/jobs/components/environments_block.vue'; -import ErasedBlock from '~/jobs/components/erased_block.vue'; -import EmptyState from '~/jobs/components/empty_state.vue'; import createStore from '~/jobs/store'; +import axios from '~/lib/utils/axios_utils'; import job from '../mock_data'; describe('Job App', () => { diff --git a/spec/frontend/jobs/components/job_sidebar_details_container_spec.js b/spec/frontend/jobs/components/job_sidebar_details_container_spec.js index a29d88e5c1e..2b56bd2d558 100644 --- a/spec/frontend/jobs/components/job_sidebar_details_container_spec.js +++ b/spec/frontend/jobs/components/job_sidebar_details_container_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; -import SidebarJobDetailsContainer from '~/jobs/components/sidebar_job_details_container.vue'; import DetailRow from '~/jobs/components/sidebar_detail_row.vue'; +import SidebarJobDetailsContainer from '~/jobs/components/sidebar_job_details_container.vue'; import createStore from '~/jobs/store'; import job from '../mock_data'; diff --git a/spec/frontend/jobs/components/log/line_header_spec.js b/spec/frontend/jobs/components/log/line_header_spec.js index bb90949b1f4..9763e2f437b 100644 --- a/spec/frontend/jobs/components/log/line_header_spec.js +++ b/spec/frontend/jobs/components/log/line_header_spec.js @@ -1,7 +1,7 @@ import { mount } from '@vue/test-utils'; +import DurationBadge from '~/jobs/components/log/duration_badge.vue'; import LineHeader from '~/jobs/components/log/line_header.vue'; import LineNumber from '~/jobs/components/log/line_number.vue'; -import DurationBadge from '~/jobs/components/log/duration_badge.vue'; describe('Job Log Header Line', () => { let wrapper; diff --git a/spec/frontend/jobs/components/log/log_spec.js b/spec/frontend/jobs/components/log/log_spec.js index f662ffa1780..b7aff1f3e3b 100644 --- a/spec/frontend/jobs/components/log/log_spec.js +++ b/spec/frontend/jobs/components/log/log_spec.js @@ -1,7 +1,7 @@ import { mount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { logLinesParser } from '~/jobs/store/utils'; import Log from '~/jobs/components/log/log.vue'; +import { logLinesParser } from '~/jobs/store/utils'; import { jobLog } from './mock_data'; describe('Job Log', () => { diff --git a/spec/frontend/jobs/components/manual_variables_form_spec.js b/spec/frontend/jobs/components/manual_variables_form_spec.js index f6c37407e2b..7172a319876 100644 --- a/spec/frontend/jobs/components/manual_variables_form_spec.js +++ b/spec/frontend/jobs/components/manual_variables_form_spec.js @@ -1,5 +1,5 @@ -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; import Form from '~/jobs/components/manual_variables_form.vue'; const localVue = createLocalVue(); diff --git a/spec/frontend/jobs/components/sidebar_detail_row_spec.js b/spec/frontend/jobs/components/sidebar_detail_row_spec.js index 4560a4f1043..bae4d6cf837 100644 --- a/spec/frontend/jobs/components/sidebar_detail_row_spec.js +++ b/spec/frontend/jobs/components/sidebar_detail_row_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLink } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import SidebarDetailRow from '~/jobs/components/sidebar_detail_row.vue'; describe('Sidebar detail row', () => { diff --git a/spec/frontend/jobs/components/sidebar_spec.js b/spec/frontend/jobs/components/sidebar_spec.js index 22d555ffec7..5a2e699137d 100644 --- a/spec/frontend/jobs/components/sidebar_spec.js +++ b/spec/frontend/jobs/components/sidebar_spec.js @@ -1,10 +1,10 @@ import { shallowMount } from '@vue/test-utils'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; -import Sidebar, { forwardDeploymentFailureModalId } from '~/jobs/components/sidebar.vue'; -import StagesDropdown from '~/jobs/components/stages_dropdown.vue'; -import JobsContainer from '~/jobs/components/jobs_container.vue'; import JobRetryForwardDeploymentModal from '~/jobs/components/job_retry_forward_deployment_modal.vue'; import JobRetryButton from '~/jobs/components/job_sidebar_retry_button.vue'; +import JobsContainer from '~/jobs/components/jobs_container.vue'; +import Sidebar, { forwardDeploymentFailureModalId } from '~/jobs/components/sidebar.vue'; +import StagesDropdown from '~/jobs/components/stages_dropdown.vue'; import createStore from '~/jobs/store'; import job, { jobsInStage } from '../mock_data'; diff --git a/spec/frontend/jobs/components/trigger_block_spec.js b/spec/frontend/jobs/components/trigger_block_spec.js index 0af768c6c52..e0eb873dc2f 100644 --- a/spec/frontend/jobs/components/trigger_block_spec.js +++ b/spec/frontend/jobs/components/trigger_block_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlButton, GlTable } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import TriggerBlock from '~/jobs/components/trigger_block.vue'; describe('Trigger block', () => { diff --git a/spec/frontend/jobs/components/unmet_prerequisites_block_spec.js b/spec/frontend/jobs/components/unmet_prerequisites_block_spec.js index 9092d3f8163..aeb85694e60 100644 --- a/spec/frontend/jobs/components/unmet_prerequisites_block_spec.js +++ b/spec/frontend/jobs/components/unmet_prerequisites_block_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlAlert, GlLink } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import UnmetPrerequisitesBlock from '~/jobs/components/unmet_prerequisites_block.vue'; describe('Unmet Prerequisites Block Job component', () => { diff --git a/spec/frontend/jobs/store/actions_spec.js b/spec/frontend/jobs/store/actions_spec.js index 2d757ce76bf..a29bd15099f 100644 --- a/spec/frontend/jobs/store/actions_spec.js +++ b/spec/frontend/jobs/store/actions_spec.js @@ -1,7 +1,6 @@ import MockAdapter from 'axios-mock-adapter'; -import testAction from 'helpers/vuex_action_helper'; import { TEST_HOST } from 'helpers/test_constants'; -import axios from '~/lib/utils/axios_utils'; +import testAction from 'helpers/vuex_action_helper'; import { setJobEndpoint, setTraceOptions, @@ -28,8 +27,9 @@ import { showSidebar, toggleSidebar, } from '~/jobs/store/actions'; -import state from '~/jobs/store/state'; import * as types from '~/jobs/store/mutation_types'; +import state from '~/jobs/store/state'; +import axios from '~/lib/utils/axios_utils'; describe('Job State actions', () => { let mockedState; diff --git a/spec/frontend/jobs/store/mutations_spec.js b/spec/frontend/jobs/store/mutations_spec.js index 608abc8f7c4..1c7e45dfb3d 100644 --- a/spec/frontend/jobs/store/mutations_spec.js +++ b/spec/frontend/jobs/store/mutations_spec.js @@ -1,6 +1,6 @@ -import state from '~/jobs/store/state'; -import mutations from '~/jobs/store/mutations'; import * as types from '~/jobs/store/mutation_types'; +import mutations from '~/jobs/store/mutations'; +import state from '~/jobs/store/state'; describe('Jobs Store Mutations', () => { let stateCopy; diff --git a/spec/frontend/lazy_loader_spec.js b/spec/frontend/lazy_loader_spec.js index f8ac7568724..3d8b0d9c307 100644 --- a/spec/frontend/lazy_loader_spec.js +++ b/spec/frontend/lazy_loader_spec.js @@ -1,6 +1,6 @@ import { noop } from 'lodash'; -import { TEST_HOST } from 'helpers/test_constants'; import { useMockMutationObserver, useMockIntersectionObserver } from 'helpers/mock_dom_observer'; +import { TEST_HOST } from 'helpers/test_constants'; import waitForPromises from 'helpers/wait_for_promises'; import LazyLoader from '~/lazy_loader'; diff --git a/spec/frontend/lib/utils/ajax_cache_spec.js b/spec/frontend/lib/utils/ajax_cache_spec.js index 641dd3684fa..d4b95172d18 100644 --- a/spec/frontend/lib/utils/ajax_cache_spec.js +++ b/spec/frontend/lib/utils/ajax_cache_spec.js @@ -1,6 +1,6 @@ import MockAdapter from 'axios-mock-adapter'; -import axios from '~/lib/utils/axios_utils'; import AjaxCache from '~/lib/utils/ajax_cache'; +import axios from '~/lib/utils/axios_utils'; describe('AjaxCache', () => { const dummyEndpoint = '/AjaxCache/dummyEndpoint'; diff --git a/spec/frontend/lib/utils/poll_spec.js b/spec/frontend/lib/utils/poll_spec.js index f2ca5df3672..861808e3ad8 100644 --- a/spec/frontend/lib/utils/poll_spec.js +++ b/spec/frontend/lib/utils/poll_spec.js @@ -1,6 +1,6 @@ import waitForPromises from 'helpers/wait_for_promises'; -import Poll from '~/lib/utils/poll'; import { successCodes } from '~/lib/utils/http_status'; +import Poll from '~/lib/utils/poll'; describe('Poll', () => { let callbacks; diff --git a/spec/frontend/lib/utils/poll_until_complete_spec.js b/spec/frontend/lib/utils/poll_until_complete_spec.js index 38203c460e3..7509f954a84 100644 --- a/spec/frontend/lib/utils/poll_until_complete_spec.js +++ b/spec/frontend/lib/utils/poll_until_complete_spec.js @@ -1,8 +1,8 @@ import AxiosMockAdapter from 'axios-mock-adapter'; import { TEST_HOST } from 'helpers/test_constants'; import axios from '~/lib/utils/axios_utils'; -import pollUntilComplete from '~/lib/utils/poll_until_complete'; import httpStatusCodes from '~/lib/utils/http_status'; +import pollUntilComplete from '~/lib/utils/poll_until_complete'; const endpoint = `${TEST_HOST}/foo`; const mockData = 'mockData'; diff --git a/spec/frontend/line_highlighter_spec.js b/spec/frontend/line_highlighter_spec.js index 1091bbf8aba..8318f63ab3e 100644 --- a/spec/frontend/line_highlighter_spec.js +++ b/spec/frontend/line_highlighter_spec.js @@ -1,8 +1,8 @@ /* eslint-disable no-return-assign, no-new, no-underscore-dangle */ import $ from 'jquery'; -import LineHighlighter from '~/line_highlighter'; import * as utils from '~/lib/utils/common_utils'; +import LineHighlighter from '~/line_highlighter'; describe('LineHighlighter', () => { const testContext = {}; diff --git a/spec/frontend/logs/components/environment_logs_spec.js b/spec/frontend/logs/components/environment_logs_spec.js index 351ff317feb..b40d9d7d5e2 100644 --- a/spec/frontend/logs/components/environment_logs_spec.js +++ b/spec/frontend/logs/components/environment_logs_spec.js @@ -1,9 +1,9 @@ import { GlSprintf, GlDropdown, GlDropdownItem } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; +import { scrollDown } from '~/lib/utils/scroll_utils'; import EnvironmentLogs from '~/logs/components/environment_logs.vue'; import { createStore } from '~/logs/stores'; -import { scrollDown } from '~/lib/utils/scroll_utils'; import { mockEnvName, mockEnvironments, diff --git a/spec/frontend/logs/components/log_advanced_filters_spec.js b/spec/frontend/logs/components/log_advanced_filters_spec.js index 1fc8d943215..111542ff33e 100644 --- a/spec/frontend/logs/components/log_advanced_filters_spec.js +++ b/spec/frontend/logs/components/log_advanced_filters_spec.js @@ -1,10 +1,10 @@ -import { shallowMount } from '@vue/test-utils'; import { GlFilteredSearch } from '@gitlab/ui'; -import { defaultTimeRange } from '~/vue_shared/constants'; +import { shallowMount } from '@vue/test-utils'; import { convertToFixedRange } from '~/lib/utils/datetime_range'; -import { createStore } from '~/logs/stores'; -import { TOKEN_TYPE_POD_NAME } from '~/logs/constants'; import LogAdvancedFilters from '~/logs/components/log_advanced_filters.vue'; +import { TOKEN_TYPE_POD_NAME } from '~/logs/constants'; +import { createStore } from '~/logs/stores'; +import { defaultTimeRange } from '~/vue_shared/constants'; import { mockPods, mockSearch } from '../mock_data'; const module = 'environmentLogs'; diff --git a/spec/frontend/logs/components/log_control_buttons_spec.js b/spec/frontend/logs/components/log_control_buttons_spec.js index 55b28445786..9c1617e4daa 100644 --- a/spec/frontend/logs/components/log_control_buttons_spec.js +++ b/spec/frontend/logs/components/log_control_buttons_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import LogControlButtons from '~/logs/components/log_control_buttons.vue'; describe('LogControlButtons', () => { diff --git a/spec/frontend/logs/components/log_simple_filters_spec.js b/spec/frontend/logs/components/log_simple_filters_spec.js index 5d2b22da3b5..04ad2e03542 100644 --- a/spec/frontend/logs/components/log_simple_filters_spec.js +++ b/spec/frontend/logs/components/log_simple_filters_spec.js @@ -1,7 +1,7 @@ import { GlDropdownItem } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; -import { createStore } from '~/logs/stores'; import LogSimpleFilters from '~/logs/components/log_simple_filters.vue'; +import { createStore } from '~/logs/stores'; import { mockPods, mockPodName } from '../mock_data'; const module = 'environmentLogs'; diff --git a/spec/frontend/logs/stores/actions_spec.js b/spec/frontend/logs/stores/actions_spec.js index 471b8603a94..92c2f82af27 100644 --- a/spec/frontend/logs/stores/actions_spec.js +++ b/spec/frontend/logs/stores/actions_spec.js @@ -1,9 +1,9 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; -import Tracking from '~/tracking'; -import * as types from '~/logs/stores/mutation_types'; +import { deprecatedCreateFlash as flash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { convertToFixedRange } from '~/lib/utils/datetime_range'; -import logsPageState from '~/logs/stores/state'; +import { TOKEN_TYPE_POD_NAME } from '~/logs/constants'; import { setInitData, showFilteredLogs, @@ -13,13 +13,12 @@ import { fetchMoreLogsPrepend, fetchManagedApps, } from '~/logs/stores/actions'; +import * as types from '~/logs/stores/mutation_types'; +import logsPageState from '~/logs/stores/state'; +import Tracking from '~/tracking'; import { defaultTimeRange } from '~/vue_shared/constants'; -import axios from '~/lib/utils/axios_utils'; -import { deprecatedCreateFlash as flash } from '~/flash'; - -import { TOKEN_TYPE_POD_NAME } from '~/logs/constants'; import { mockPodName, mockEnvironmentsEndpoint, diff --git a/spec/frontend/logs/stores/mutations_spec.js b/spec/frontend/logs/stores/mutations_spec.js index 51f6494b011..111c795ba52 100644 --- a/spec/frontend/logs/stores/mutations_spec.js +++ b/spec/frontend/logs/stores/mutations_spec.js @@ -1,5 +1,5 @@ -import mutations from '~/logs/stores/mutations'; import * as types from '~/logs/stores/mutation_types'; +import mutations from '~/logs/stores/mutations'; import logsPageState from '~/logs/stores/state'; import { diff --git a/spec/frontend/members/components/action_buttons/access_request_action_buttons_spec.js b/spec/frontend/members/components/action_buttons/access_request_action_buttons_spec.js index 30166e2d5ae..f86237dc160 100644 --- a/spec/frontend/members/components/action_buttons/access_request_action_buttons_spec.js +++ b/spec/frontend/members/components/action_buttons/access_request_action_buttons_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; import AccessRequestActionButtons from '~/members/components/action_buttons/access_request_action_buttons.vue'; -import RemoveMemberButton from '~/members/components/action_buttons/remove_member_button.vue'; import ApproveAccessRequestButton from '~/members/components/action_buttons/approve_access_request_button.vue'; +import RemoveMemberButton from '~/members/components/action_buttons/remove_member_button.vue'; import { accessRequest as member } from '../../mock_data'; describe('AccessRequestActionButtons', () => { diff --git a/spec/frontend/members/components/action_buttons/approve_access_request_button_spec.js b/spec/frontend/members/components/action_buttons/approve_access_request_button_spec.js index 7ce2c633bb3..f77d41a642e 100644 --- a/spec/frontend/members/components/action_buttons/approve_access_request_button_spec.js +++ b/spec/frontend/members/components/action_buttons/approve_access_request_button_spec.js @@ -1,6 +1,6 @@ +import { GlButton, GlForm } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlButton, GlForm } from '@gitlab/ui'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import ApproveAccessRequestButton from '~/members/components/action_buttons/approve_access_request_button.vue'; diff --git a/spec/frontend/members/components/action_buttons/leave_button_spec.js b/spec/frontend/members/components/action_buttons/leave_button_spec.js index 2afe112c74b..4859d033464 100644 --- a/spec/frontend/members/components/action_buttons/leave_button_spec.js +++ b/spec/frontend/members/components/action_buttons/leave_button_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import LeaveButton from '~/members/components/action_buttons/leave_button.vue'; import LeaveModal from '~/members/components/modals/leave_modal.vue'; diff --git a/spec/frontend/members/components/action_buttons/remove_group_link_button_spec.js b/spec/frontend/members/components/action_buttons/remove_group_link_button_spec.js index 45283788676..f6e342898cb 100644 --- a/spec/frontend/members/components/action_buttons/remove_group_link_button_spec.js +++ b/spec/frontend/members/components/action_buttons/remove_group_link_button_spec.js @@ -1,6 +1,6 @@ +import { GlButton } from '@gitlab/ui'; import { mount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlButton } from '@gitlab/ui'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import RemoveGroupLinkButton from '~/members/components/action_buttons/remove_group_link_button.vue'; import { group } from '../../mock_data'; diff --git a/spec/frontend/members/components/action_buttons/resend_invite_button_spec.js b/spec/frontend/members/components/action_buttons/resend_invite_button_spec.js index 05ea0dc2886..49b6979f954 100644 --- a/spec/frontend/members/components/action_buttons/resend_invite_button_spec.js +++ b/spec/frontend/members/components/action_buttons/resend_invite_button_spec.js @@ -1,6 +1,6 @@ +import { GlButton } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlButton } from '@gitlab/ui'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import ResendInviteButton from '~/members/components/action_buttons/resend_invite_button.vue'; diff --git a/spec/frontend/members/components/action_buttons/user_action_buttons_spec.js b/spec/frontend/members/components/action_buttons/user_action_buttons_spec.js index f28e5040006..1d7ea5b3109 100644 --- a/spec/frontend/members/components/action_buttons/user_action_buttons_spec.js +++ b/spec/frontend/members/components/action_buttons/user_action_buttons_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; -import UserActionButtons from '~/members/components/action_buttons/user_action_buttons.vue'; -import RemoveMemberButton from '~/members/components/action_buttons/remove_member_button.vue'; import LeaveButton from '~/members/components/action_buttons/leave_button.vue'; +import RemoveMemberButton from '~/members/components/action_buttons/remove_member_button.vue'; +import UserActionButtons from '~/members/components/action_buttons/user_action_buttons.vue'; import { member, orphanedMember } from '../../mock_data'; describe('UserActionButtons', () => { diff --git a/spec/frontend/members/components/app_spec.js b/spec/frontend/members/components/app_spec.js index 8fac0f5c5e6..a1329c3ee9f 100644 --- a/spec/frontend/members/components/app_spec.js +++ b/spec/frontend/members/components/app_spec.js @@ -1,10 +1,10 @@ +import { GlAlert } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import { nextTick } from 'vue'; import Vuex from 'vuex'; -import { GlAlert } from '@gitlab/ui'; +import * as commonUtils from '~/lib/utils/common_utils'; import MembersApp from '~/members/components/app.vue'; import FilterSortContainer from '~/members/components/filter_sort/filter_sort_container.vue'; -import * as commonUtils from '~/lib/utils/common_utils'; import { RECEIVE_MEMBER_ROLE_ERROR, HIDE_ERROR } from '~/members/store/mutation_types'; import mutations from '~/members/store/mutations'; diff --git a/spec/frontend/members/components/avatars/group_avatar_spec.js b/spec/frontend/members/components/avatars/group_avatar_spec.js index 2720181aeb8..9c1574a84ee 100644 --- a/spec/frontend/members/components/avatars/group_avatar_spec.js +++ b/spec/frontend/members/components/avatars/group_avatar_spec.js @@ -1,6 +1,6 @@ -import { mount, createWrapper } from '@vue/test-utils'; -import { getByText as getByTextHelper } from '@testing-library/dom'; import { GlAvatarLink } from '@gitlab/ui'; +import { getByText as getByTextHelper } from '@testing-library/dom'; +import { mount, createWrapper } from '@vue/test-utils'; import GroupAvatar from '~/members/components/avatars/group_avatar.vue'; import { group as member } from '../../mock_data'; diff --git a/spec/frontend/members/components/avatars/invite_avatar_spec.js b/spec/frontend/members/components/avatars/invite_avatar_spec.js index 8ebfdf31127..b197a46c0d1 100644 --- a/spec/frontend/members/components/avatars/invite_avatar_spec.js +++ b/spec/frontend/members/components/avatars/invite_avatar_spec.js @@ -1,5 +1,5 @@ -import { mount, createWrapper } from '@vue/test-utils'; import { getByText as getByTextHelper } from '@testing-library/dom'; +import { mount, createWrapper } from '@vue/test-utils'; import InviteAvatar from '~/members/components/avatars/invite_avatar.vue'; import { invite as member } from '../../mock_data'; diff --git a/spec/frontend/members/components/avatars/user_avatar_spec.js b/spec/frontend/members/components/avatars/user_avatar_spec.js index d6305652616..303c82582a3 100644 --- a/spec/frontend/members/components/avatars/user_avatar_spec.js +++ b/spec/frontend/members/components/avatars/user_avatar_spec.js @@ -1,6 +1,6 @@ -import { mount, createWrapper } from '@vue/test-utils'; -import { within } from '@testing-library/dom'; import { GlAvatarLink, GlBadge } from '@gitlab/ui'; +import { within } from '@testing-library/dom'; +import { mount, createWrapper } from '@vue/test-utils'; import UserAvatar from '~/members/components/avatars/user_avatar.vue'; import { member as memberMock, orphanedMember } from '../../mock_data'; diff --git a/spec/frontend/members/components/filter_sort/members_filtered_search_bar_spec.js b/spec/frontend/members/components/filter_sort/members_filtered_search_bar_spec.js index 2bed1e803ca..14b437a8c4e 100644 --- a/spec/frontend/members/components/filter_sort/members_filtered_search_bar_spec.js +++ b/spec/frontend/members/components/filter_sort/members_filtered_search_bar_spec.js @@ -1,6 +1,6 @@ +import { GlFilteredSearchToken } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlFilteredSearchToken } from '@gitlab/ui'; import MembersFilteredSearchBar from '~/members/components/filter_sort/members_filtered_search_bar.vue'; import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; diff --git a/spec/frontend/members/components/filter_sort/sort_dropdown_spec.js b/spec/frontend/members/components/filter_sort/sort_dropdown_spec.js index d98c9116512..357fad741e9 100644 --- a/spec/frontend/members/components/filter_sort/sort_dropdown_spec.js +++ b/spec/frontend/members/components/filter_sort/sort_dropdown_spec.js @@ -1,8 +1,8 @@ +import { GlSorting, GlSortingItem } from '@gitlab/ui'; import { mount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlSorting, GlSortingItem } from '@gitlab/ui'; -import SortDropdown from '~/members/components/filter_sort/sort_dropdown.vue'; import * as urlUtilities from '~/lib/utils/url_utility'; +import SortDropdown from '~/members/components/filter_sort/sort_dropdown.vue'; const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/spec/frontend/members/components/modals/leave_modal_spec.js b/spec/frontend/members/components/modals/leave_modal_spec.js index dca47d1f6af..2d52911572f 100644 --- a/spec/frontend/members/components/modals/leave_modal_spec.js +++ b/spec/frontend/members/components/modals/leave_modal_spec.js @@ -1,7 +1,7 @@ -import { mount, createLocalVue, createWrapper } from '@vue/test-utils'; import { GlModal, GlForm } from '@gitlab/ui'; -import { nextTick } from 'vue'; import { within } from '@testing-library/dom'; +import { mount, createLocalVue, createWrapper } from '@vue/test-utils'; +import { nextTick } from 'vue'; import Vuex from 'vuex'; import LeaveModal from '~/members/components/modals/leave_modal.vue'; import { LEAVE_MODAL_ID } from '~/members/constants'; diff --git a/spec/frontend/members/components/modals/remove_group_link_modal_spec.js b/spec/frontend/members/components/modals/remove_group_link_modal_spec.js index 234857419b6..62df912c1a2 100644 --- a/spec/frontend/members/components/modals/remove_group_link_modal_spec.js +++ b/spec/frontend/members/components/modals/remove_group_link_modal_spec.js @@ -1,7 +1,7 @@ -import { mount, createLocalVue, createWrapper } from '@vue/test-utils'; import { GlModal, GlForm } from '@gitlab/ui'; -import { nextTick } from 'vue'; import { within } from '@testing-library/dom'; +import { mount, createLocalVue, createWrapper } from '@vue/test-utils'; +import { nextTick } from 'vue'; import Vuex from 'vuex'; import RemoveGroupLinkModal from '~/members/components/modals/remove_group_link_modal.vue'; import { REMOVE_GROUP_LINK_MODAL_ID } from '~/members/constants'; diff --git a/spec/frontend/members/components/table/created_at_spec.js b/spec/frontend/members/components/table/created_at_spec.js index dc1f62722ab..74b71e22893 100644 --- a/spec/frontend/members/components/table/created_at_spec.js +++ b/spec/frontend/members/components/table/created_at_spec.js @@ -1,5 +1,5 @@ -import { mount, createWrapper } from '@vue/test-utils'; import { within } from '@testing-library/dom'; +import { mount, createWrapper } from '@vue/test-utils'; import { useFakeDate } from 'helpers/fake_date'; import CreatedAt from '~/members/components/table/created_at.vue'; import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; diff --git a/spec/frontend/members/components/table/expiration_datepicker_spec.js b/spec/frontend/members/components/table/expiration_datepicker_spec.js index 0caaafb8d7b..d26172b4ed1 100644 --- a/spec/frontend/members/components/table/expiration_datepicker_spec.js +++ b/spec/frontend/members/components/table/expiration_datepicker_spec.js @@ -1,7 +1,7 @@ +import { GlDatepicker } from '@gitlab/ui'; import { mount, createLocalVue } from '@vue/test-utils'; -import Vuex from 'vuex'; import { nextTick } from 'vue'; -import { GlDatepicker } from '@gitlab/ui'; +import Vuex from 'vuex'; import { useFakeDate } from 'helpers/fake_date'; import waitForPromises from 'helpers/wait_for_promises'; import ExpirationDatepicker from '~/members/components/table/expiration_datepicker.vue'; diff --git a/spec/frontend/members/components/table/expires_at_spec.js b/spec/frontend/members/components/table/expires_at_spec.js index 321008727cd..02fe3c6d684 100644 --- a/spec/frontend/members/components/table/expires_at_spec.js +++ b/spec/frontend/members/components/table/expires_at_spec.js @@ -1,5 +1,5 @@ -import { mount, createWrapper } from '@vue/test-utils'; import { within } from '@testing-library/dom'; +import { mount, createWrapper } from '@vue/test-utils'; import { useFakeDate } from 'helpers/fake_date'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import ExpiresAt from '~/members/components/table/expires_at.vue'; diff --git a/spec/frontend/members/components/table/member_action_buttons_spec.js b/spec/frontend/members/components/table/member_action_buttons_spec.js index 064c8403423..546d09732d6 100644 --- a/spec/frontend/members/components/table/member_action_buttons_spec.js +++ b/spec/frontend/members/components/table/member_action_buttons_spec.js @@ -1,10 +1,10 @@ import { shallowMount } from '@vue/test-utils'; -import { MEMBER_TYPES } from '~/members/constants'; -import MemberActionButtons from '~/members/components/table/member_action_buttons.vue'; -import UserActionButtons from '~/members/components/action_buttons/user_action_buttons.vue'; +import AccessRequestActionButtons from '~/members/components/action_buttons/access_request_action_buttons.vue'; import GroupActionButtons from '~/members/components/action_buttons/group_action_buttons.vue'; import InviteActionButtons from '~/members/components/action_buttons/invite_action_buttons.vue'; -import AccessRequestActionButtons from '~/members/components/action_buttons/access_request_action_buttons.vue'; +import UserActionButtons from '~/members/components/action_buttons/user_action_buttons.vue'; +import MemberActionButtons from '~/members/components/table/member_action_buttons.vue'; +import { MEMBER_TYPES } from '~/members/constants'; import { member as memberMock, group, invite, accessRequest } from '../../mock_data'; describe('MemberActionButtons', () => { diff --git a/spec/frontend/members/components/table/member_avatar_spec.js b/spec/frontend/members/components/table/member_avatar_spec.js index a6f9f157532..3cce64effbc 100644 --- a/spec/frontend/members/components/table/member_avatar_spec.js +++ b/spec/frontend/members/components/table/member_avatar_spec.js @@ -1,9 +1,9 @@ import { shallowMount } from '@vue/test-utils'; -import { MEMBER_TYPES } from '~/members/constants'; -import MemberAvatar from '~/members/components/table/member_avatar.vue'; -import UserAvatar from '~/members/components/avatars/user_avatar.vue'; import GroupAvatar from '~/members/components/avatars/group_avatar.vue'; import InviteAvatar from '~/members/components/avatars/invite_avatar.vue'; +import UserAvatar from '~/members/components/avatars/user_avatar.vue'; +import MemberAvatar from '~/members/components/table/member_avatar.vue'; +import { MEMBER_TYPES } from '~/members/constants'; import { member as memberMock, group, invite, accessRequest } from '../../mock_data'; describe('MemberList', () => { diff --git a/spec/frontend/members/components/table/member_source_spec.js b/spec/frontend/members/components/table/member_source_spec.js index 95547090aed..2cd888207b1 100644 --- a/spec/frontend/members/components/table/member_source_spec.js +++ b/spec/frontend/members/components/table/member_source_spec.js @@ -1,5 +1,5 @@ -import { mount, createWrapper } from '@vue/test-utils'; import { getByText as getByTextHelper } from '@testing-library/dom'; +import { mount, createWrapper } from '@vue/test-utils'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import MemberSource from '~/members/components/table/member_source.vue'; diff --git a/spec/frontend/members/components/table/members_table_cell_spec.js b/spec/frontend/members/components/table/members_table_cell_spec.js index 69795a4d670..b7dcd2a9fae 100644 --- a/spec/frontend/members/components/table/members_table_cell_spec.js +++ b/spec/frontend/members/components/table/members_table_cell_spec.js @@ -1,7 +1,7 @@ import { mount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { MEMBER_TYPES } from '~/members/constants'; import MembersTableCell from '~/members/components/table/members_table_cell.vue'; +import { MEMBER_TYPES } from '~/members/constants'; import { member as memberMock, directMember, diff --git a/spec/frontend/members/components/table/members_table_spec.js b/spec/frontend/members/components/table/members_table_spec.js index 729b65f37aa..cf5811e72e7 100644 --- a/spec/frontend/members/components/table/members_table_spec.js +++ b/spec/frontend/members/components/table/members_table_spec.js @@ -1,19 +1,19 @@ -import { mount, createLocalVue, createWrapper } from '@vue/test-utils'; -import Vuex from 'vuex'; +import { GlBadge, GlTable } from '@gitlab/ui'; import { getByText as getByTextHelper, getByTestId as getByTestIdHelper, within, } from '@testing-library/dom'; -import { GlBadge, GlTable } from '@gitlab/ui'; -import MembersTable from '~/members/components/table/members_table.vue'; -import MemberAvatar from '~/members/components/table/member_avatar.vue'; -import MemberSource from '~/members/components/table/member_source.vue'; -import ExpiresAt from '~/members/components/table/expires_at.vue'; +import { mount, createLocalVue, createWrapper } from '@vue/test-utils'; +import Vuex from 'vuex'; import CreatedAt from '~/members/components/table/created_at.vue'; -import RoleDropdown from '~/members/components/table/role_dropdown.vue'; import ExpirationDatepicker from '~/members/components/table/expiration_datepicker.vue'; +import ExpiresAt from '~/members/components/table/expires_at.vue'; import MemberActionButtons from '~/members/components/table/member_action_buttons.vue'; +import MemberAvatar from '~/members/components/table/member_avatar.vue'; +import MemberSource from '~/members/components/table/member_source.vue'; +import MembersTable from '~/members/components/table/members_table.vue'; +import RoleDropdown from '~/members/components/table/role_dropdown.vue'; import * as initUserPopovers from '~/user_popovers'; import { member as memberMock, directMember, invite, accessRequest } from '../../mock_data'; diff --git a/spec/frontend/members/components/table/role_dropdown_spec.js b/spec/frontend/members/components/table/role_dropdown_spec.js index 3cc52379026..aa280599061 100644 --- a/spec/frontend/members/components/table/role_dropdown_spec.js +++ b/spec/frontend/members/components/table/role_dropdown_spec.js @@ -1,12 +1,12 @@ -import { mount, createWrapper, createLocalVue } from '@vue/test-utils'; -import Vuex from 'vuex'; -import { nextTick } from 'vue'; -import { within } from '@testing-library/dom'; import { GlDropdown, GlDropdownItem } from '@gitlab/ui'; import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; +import { within } from '@testing-library/dom'; +import { mount, createWrapper, createLocalVue } from '@vue/test-utils'; +import { nextTick } from 'vue'; +import Vuex from 'vuex'; import waitForPromises from 'helpers/wait_for_promises'; -import RoleDropdown from '~/members/components/table/role_dropdown.vue'; import { BV_DROPDOWN_SHOW } from '~/lib/utils/constants'; +import RoleDropdown from '~/members/components/table/role_dropdown.vue'; import { member } from '../../mock_data'; const localVue = createLocalVue(); diff --git a/spec/frontend/members/index_spec.js b/spec/frontend/members/index_spec.js index d73e3b03f07..dd3b9ddd912 100644 --- a/spec/frontend/members/index_spec.js +++ b/spec/frontend/members/index_spec.js @@ -1,6 +1,6 @@ import { createWrapper } from '@vue/test-utils'; -import { initMembersApp } from '~/members/index'; import MembersApp from '~/members/components/app.vue'; +import { initMembersApp } from '~/members/index'; import { membersJsonString, members } from './mock_data'; describe('initMembersApp', () => { diff --git a/spec/frontend/members/store/actions_spec.js b/spec/frontend/members/store/actions_spec.js index b0f863e6163..d913c5c56df 100644 --- a/spec/frontend/members/store/actions_spec.js +++ b/spec/frontend/members/store/actions_spec.js @@ -1,17 +1,17 @@ -import { noop } from 'lodash'; import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; -import { members, group } from 'jest/members/mock_data'; -import testAction from 'helpers/vuex_action_helper'; +import { noop } from 'lodash'; import { useFakeDate } from 'helpers/fake_date'; +import testAction from 'helpers/vuex_action_helper'; +import { members, group } from 'jest/members/mock_data'; import httpStatusCodes from '~/lib/utils/http_status'; -import * as types from '~/members/store/mutation_types'; import { updateMemberRole, showRemoveGroupLinkModal, hideRemoveGroupLinkModal, updateMemberExpiration, } from '~/members/store/actions'; +import * as types from '~/members/store/mutation_types'; describe('Vuex members actions', () => { describe('update member actions', () => { diff --git a/spec/frontend/members/store/mutations_spec.js b/spec/frontend/members/store/mutations_spec.js index a56e6a72d9e..7ad7034eb6d 100644 --- a/spec/frontend/members/store/mutations_spec.js +++ b/spec/frontend/members/store/mutations_spec.js @@ -1,6 +1,6 @@ import { members, group } from 'jest/members/mock_data'; -import mutations from '~/members/store/mutations'; import * as types from '~/members/store/mutation_types'; +import mutations from '~/members/store/mutations'; describe('Vuex members mutations', () => { describe('update member mutations', () => { diff --git a/spec/frontend/members/utils_spec.js b/spec/frontend/members/utils_spec.js index 5c9484fe128..f447a4c4ee9 100644 --- a/spec/frontend/members/utils_spec.js +++ b/spec/frontend/members/utils_spec.js @@ -1,3 +1,4 @@ +import { DEFAULT_SORT } from '~/members/constants'; import { generateBadges, isGroup, @@ -12,7 +13,6 @@ import { parseDataAttributes, groupLinkRequestFormatter, } from '~/members/utils'; -import { DEFAULT_SORT } from '~/members/constants'; import { member as memberMock, directMember, diff --git a/spec/frontend/merge_request/components/status_box_spec.js b/spec/frontend/merge_request/components/status_box_spec.js index e7623aed4b3..9212ae19c2d 100644 --- a/spec/frontend/merge_request/components/status_box_spec.js +++ b/spec/frontend/merge_request/components/status_box_spec.js @@ -1,6 +1,6 @@ -import { nextTick } from 'vue'; -import { shallowMount } from '@vue/test-utils'; import { GlSprintf } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; +import { nextTick } from 'vue'; import StatusBox from '~/merge_request/components/status_box.vue'; import mrEventHub from '~/merge_request/eventhub'; diff --git a/spec/frontend/merge_request_spec.js b/spec/frontend/merge_request_spec.js index 5624043260a..84647a108b2 100644 --- a/spec/frontend/merge_request_spec.js +++ b/spec/frontend/merge_request_spec.js @@ -1,5 +1,5 @@ -import $ from 'jquery'; import MockAdapter from 'axios-mock-adapter'; +import $ from 'jquery'; import { TEST_HOST } from 'spec/test_constants'; import axios from '~/lib/utils/axios_utils'; import MergeRequest from '~/merge_request'; diff --git a/spec/frontend/merge_request_tabs_spec.js b/spec/frontend/merge_request_tabs_spec.js index 82462036219..31cfb56e426 100644 --- a/spec/frontend/merge_request_tabs_spec.js +++ b/spec/frontend/merge_request_tabs_spec.js @@ -1,5 +1,5 @@ -import $ from 'jquery'; import MockAdapter from 'axios-mock-adapter'; +import $ from 'jquery'; import initMrPage from 'helpers/init_vue_mr_page_helper'; import axios from '~/lib/utils/axios_utils'; import MergeRequestTabs from '~/merge_request_tabs'; diff --git a/spec/frontend/milestones/milestone_combobox_spec.js b/spec/frontend/milestones/milestone_combobox_spec.js index b0061189a48..4d1a0a0a440 100644 --- a/spec/frontend/milestones/milestone_combobox_spec.js +++ b/spec/frontend/milestones/milestone_combobox_spec.js @@ -1,9 +1,9 @@ -import Vue, { nextTick } from 'vue'; -import Vuex from 'vuex'; +import { GlLoadingIcon, GlSearchBoxByType, GlDropdownItem } from '@gitlab/ui'; import { mount } from '@vue/test-utils'; import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; -import { GlLoadingIcon, GlSearchBoxByType, GlDropdownItem } from '@gitlab/ui'; +import Vue, { nextTick } from 'vue'; +import Vuex from 'vuex'; import { ENTER_KEY } from '~/lib/utils/keys'; import MilestoneCombobox from '~/milestones/components/milestone_combobox.vue'; import createStore from '~/milestones/stores/'; diff --git a/spec/frontend/milestones/stores/actions_spec.js b/spec/frontend/milestones/stores/actions_spec.js index a62b0c49a80..4355ea71fb2 100644 --- a/spec/frontend/milestones/stores/actions_spec.js +++ b/spec/frontend/milestones/stores/actions_spec.js @@ -1,7 +1,7 @@ import testAction from 'helpers/vuex_action_helper'; -import createState from '~/milestones/stores/state'; import * as actions from '~/milestones/stores/actions'; import * as types from '~/milestones/stores/mutation_types'; +import createState from '~/milestones/stores/state'; let mockProjectMilestonesReturnValue; let mockGroupMilestonesReturnValue; diff --git a/spec/frontend/milestones/stores/mutations_spec.js b/spec/frontend/milestones/stores/mutations_spec.js index 0b69a9d572d..91b2acf23c5 100644 --- a/spec/frontend/milestones/stores/mutations_spec.js +++ b/spec/frontend/milestones/stores/mutations_spec.js @@ -1,6 +1,6 @@ -import createState from '~/milestones/stores/state'; -import mutations from '~/milestones/stores/mutations'; import * as types from '~/milestones/stores/mutation_types'; +import mutations from '~/milestones/stores/mutations'; +import createState from '~/milestones/stores/state'; describe('Milestones combobox Vuex store mutations', () => { let state; diff --git a/spec/frontend/mini_pipeline_graph_dropdown_spec.js b/spec/frontend/mini_pipeline_graph_dropdown_spec.js index b21ddabbfb1..3ff34c967e4 100644 --- a/spec/frontend/mini_pipeline_graph_dropdown_spec.js +++ b/spec/frontend/mini_pipeline_graph_dropdown_spec.js @@ -1,5 +1,5 @@ -import $ from 'jquery'; import MockAdapter from 'axios-mock-adapter'; +import $ from 'jquery'; import waitForPromises from 'helpers/wait_for_promises'; import axios from '~/lib/utils/axios_utils'; import MiniPipelineGraph from '~/mini_pipeline_graph_dropdown'; diff --git a/spec/frontend/monitoring/alert_widget_spec.js b/spec/frontend/monitoring/alert_widget_spec.js index fd9fb374274..1f0597bac67 100644 --- a/spec/frontend/monitoring/alert_widget_spec.js +++ b/spec/frontend/monitoring/alert_widget_spec.js @@ -1,8 +1,8 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon, GlTooltip, GlSprintf, GlBadge } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import waitForPromises from 'helpers/wait_for_promises'; -import AlertWidget from '~/monitoring/components/alert_widget.vue'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import AlertWidget from '~/monitoring/components/alert_widget.vue'; const mockReadAlert = jest.fn(); const mockCreateAlert = jest.fn(); diff --git a/spec/frontend/monitoring/components/alert_widget_form_spec.js b/spec/frontend/monitoring/components/alert_widget_form_spec.js index 6d87fb85f4d..e0ef1040f6b 100644 --- a/spec/frontend/monitoring/components/alert_widget_form_spec.js +++ b/spec/frontend/monitoring/components/alert_widget_form_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLink } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import INVALID_URL from '~/lib/utils/invalid_url'; import AlertWidgetForm from '~/monitoring/components/alert_widget_form.vue'; import ModalStub from '../stubs/modal_stub'; diff --git a/spec/frontend/monitoring/components/charts/anomaly_spec.js b/spec/frontend/monitoring/components/charts/anomaly_spec.js index 00e843722d6..c44fd8dce33 100644 --- a/spec/frontend/monitoring/components/charts/anomaly_spec.js +++ b/spec/frontend/monitoring/components/charts/anomaly_spec.js @@ -2,10 +2,10 @@ import { shallowMount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; import Anomaly from '~/monitoring/components/charts/anomaly.vue'; -import { colorValues } from '~/monitoring/constants'; import MonitorTimeSeriesChart from '~/monitoring/components/charts/time_series.vue'; -import { anomalyDeploymentData, mockProjectDir } from '../../mock_data'; +import { colorValues } from '~/monitoring/constants'; import { anomalyGraphData } from '../../graph_data'; +import { anomalyDeploymentData, mockProjectDir } from '../../mock_data'; const mockProjectPath = `${TEST_HOST}${mockProjectDir}`; diff --git a/spec/frontend/monitoring/components/charts/bar_spec.js b/spec/frontend/monitoring/components/charts/bar_spec.js index 40edde5f666..6368c53943a 100644 --- a/spec/frontend/monitoring/components/charts/bar_spec.js +++ b/spec/frontend/monitoring/components/charts/bar_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlBarChart } from '@gitlab/ui/dist/charts'; +import { shallowMount } from '@vue/test-utils'; import Bar from '~/monitoring/components/charts/bar.vue'; import { barGraphData } from '../../graph_data'; diff --git a/spec/frontend/monitoring/components/charts/column_spec.js b/spec/frontend/monitoring/components/charts/column_spec.js index 0c4b6e8990d..e10cb3a456a 100644 --- a/spec/frontend/monitoring/components/charts/column_spec.js +++ b/spec/frontend/monitoring/components/charts/column_spec.js @@ -1,6 +1,6 @@ +import { GlColumnChart } from '@gitlab/ui/dist/charts'; import { shallowMount } from '@vue/test-utils'; import timezoneMock from 'timezone-mock'; -import { GlColumnChart } from '@gitlab/ui/dist/charts'; import ColumnChart from '~/monitoring/components/charts/column.vue'; jest.mock('~/lib/utils/icon_utils', () => ({ diff --git a/spec/frontend/monitoring/components/charts/gauge_spec.js b/spec/frontend/monitoring/components/charts/gauge_spec.js index 9215f2e411f..c8f67d5d8c7 100644 --- a/spec/frontend/monitoring/components/charts/gauge_spec.js +++ b/spec/frontend/monitoring/components/charts/gauge_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlGaugeChart } from '@gitlab/ui/dist/charts'; +import { shallowMount } from '@vue/test-utils'; import GaugeChart from '~/monitoring/components/charts/gauge.vue'; import { gaugeChartGraphData } from '../../graph_data'; diff --git a/spec/frontend/monitoring/components/charts/heatmap_spec.js b/spec/frontend/monitoring/components/charts/heatmap_spec.js index c8375810a7b..841b7e0648a 100644 --- a/spec/frontend/monitoring/components/charts/heatmap_spec.js +++ b/spec/frontend/monitoring/components/charts/heatmap_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlHeatmap } from '@gitlab/ui/dist/charts'; +import { shallowMount } from '@vue/test-utils'; import timezoneMock from 'timezone-mock'; import Heatmap from '~/monitoring/components/charts/heatmap.vue'; import { heatmapGraphData } from '../../graph_data'; diff --git a/spec/frontend/monitoring/components/charts/single_stat_spec.js b/spec/frontend/monitoring/components/charts/single_stat_spec.js index 144a4e0c968..8633b49565f 100644 --- a/spec/frontend/monitoring/components/charts/single_stat_spec.js +++ b/spec/frontend/monitoring/components/charts/single_stat_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlSingleStat } from '@gitlab/ui/dist/charts'; +import { shallowMount } from '@vue/test-utils'; import SingleStatChart from '~/monitoring/components/charts/single_stat.vue'; import { singleStatGraphData } from '../../graph_data'; diff --git a/spec/frontend/monitoring/components/charts/stacked_column_spec.js b/spec/frontend/monitoring/components/charts/stacked_column_spec.js index 4d4224a8b11..f47728313c6 100644 --- a/spec/frontend/monitoring/components/charts/stacked_column_spec.js +++ b/spec/frontend/monitoring/components/charts/stacked_column_spec.js @@ -1,7 +1,7 @@ +import { GlStackedColumnChart, GlChartLegend } from '@gitlab/ui/dist/charts'; import { shallowMount, mount } from '@vue/test-utils'; -import timezoneMock from 'timezone-mock'; import { cloneDeep } from 'lodash'; -import { GlStackedColumnChart, GlChartLegend } from '@gitlab/ui/dist/charts'; +import timezoneMock from 'timezone-mock'; import StackedColumnChart from '~/monitoring/components/charts/stacked_column.vue'; import { stackedColumnGraphData } from '../../graph_data'; diff --git a/spec/frontend/monitoring/components/charts/time_series_spec.js b/spec/frontend/monitoring/components/charts/time_series_spec.js index 89b7e82e84a..afa63bcff29 100644 --- a/spec/frontend/monitoring/components/charts/time_series_spec.js +++ b/spec/frontend/monitoring/components/charts/time_series_spec.js @@ -1,5 +1,3 @@ -import { mount, shallowMount } from '@vue/test-utils'; -import timezoneMock from 'timezone-mock'; import { GlLink } from '@gitlab/ui'; import { GlAreaChart, @@ -7,11 +5,14 @@ import { GlChartSeriesLabel, GlChartLegend, } from '@gitlab/ui/dist/charts'; +import { mount, shallowMount } from '@vue/test-utils'; +import timezoneMock from 'timezone-mock'; import { TEST_HOST } from 'helpers/test_constants'; import { setTestTimeout } from 'helpers/timeout'; import { shallowWrapperContainsSlotText } from 'helpers/vue_test_utils_helper'; -import { panelTypes, chartHeight } from '~/monitoring/constants'; import TimeSeries from '~/monitoring/components/charts/time_series.vue'; +import { panelTypes, chartHeight } from '~/monitoring/constants'; +import { timeSeriesGraphData } from '../../graph_data'; import { deploymentData, mockProjectDir, @@ -19,8 +20,6 @@ import { mockFixedTimeRange, } from '../../mock_data'; -import { timeSeriesGraphData } from '../../graph_data'; - jest.mock('lodash/throttle', () => // this throttle mock executes immediately jest.fn((func) => { diff --git a/spec/frontend/monitoring/components/create_dashboard_modal_spec.js b/spec/frontend/monitoring/components/create_dashboard_modal_spec.js index d1028445638..8202d423ff3 100644 --- a/spec/frontend/monitoring/components/create_dashboard_modal_spec.js +++ b/spec/frontend/monitoring/components/create_dashboard_modal_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlModal } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import CreateDashboardModal from '~/monitoring/components/create_dashboard_modal.vue'; describe('Create dashboard modal', () => { diff --git a/spec/frontend/monitoring/components/dashboard_actions_menu_spec.js b/spec/frontend/monitoring/components/dashboard_actions_menu_spec.js index 7a2f4a3de9a..6e98ca28071 100644 --- a/spec/frontend/monitoring/components/dashboard_actions_menu_spec.js +++ b/spec/frontend/monitoring/components/dashboard_actions_menu_spec.js @@ -1,12 +1,12 @@ -import { shallowMount } from '@vue/test-utils'; import { GlDropdownItem } from '@gitlab/ui'; -import { createStore } from '~/monitoring/stores'; -import { DASHBOARD_PAGE, PANEL_NEW_PAGE } from '~/monitoring/router/constants'; +import { shallowMount } from '@vue/test-utils'; +import CustomMetricsFormFields from '~/custom_metrics/components/custom_metrics_form_fields.vue'; import { redirectTo } from '~/lib/utils/url_utility'; -import Tracking from '~/tracking'; import ActionsMenu from '~/monitoring/components/dashboard_actions_menu.vue'; -import CustomMetricsFormFields from '~/custom_metrics/components/custom_metrics_form_fields.vue'; +import { DASHBOARD_PAGE, PANEL_NEW_PAGE } from '~/monitoring/router/constants'; +import { createStore } from '~/monitoring/stores'; import * as types from '~/monitoring/stores/mutation_types'; +import Tracking from '~/tracking'; import { dashboardActionsMenuProps, dashboardGitResponse } from '../mock_data'; import { setupAllDashboards, setupStoreWithData } from '../store_utils'; diff --git a/spec/frontend/monitoring/components/dashboard_header_spec.js b/spec/frontend/monitoring/components/dashboard_header_spec.js index e431b17a965..8be7d641953 100644 --- a/spec/frontend/monitoring/components/dashboard_header_spec.js +++ b/spec/frontend/monitoring/components/dashboard_header_spec.js @@ -1,20 +1,20 @@ -import { shallowMount } from '@vue/test-utils'; import { GlDropdownItem, GlSearchBoxByType, GlLoadingIcon, GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; +import { redirectTo } from '~/lib/utils/url_utility'; +import ActionsMenu from '~/monitoring/components/dashboard_actions_menu.vue'; +import DashboardHeader from '~/monitoring/components/dashboard_header.vue'; +import DashboardsDropdown from '~/monitoring/components/dashboards_dropdown.vue'; +import RefreshButton from '~/monitoring/components/refresh_button.vue'; import { createStore } from '~/monitoring/stores'; import * as types from '~/monitoring/stores/mutation_types'; import DateTimePicker from '~/vue_shared/components/date_time_picker/date_time_picker.vue'; -import RefreshButton from '~/monitoring/components/refresh_button.vue'; -import DashboardHeader from '~/monitoring/components/dashboard_header.vue'; -import DashboardsDropdown from '~/monitoring/components/dashboards_dropdown.vue'; -import ActionsMenu from '~/monitoring/components/dashboard_actions_menu.vue'; -import { redirectTo } from '~/lib/utils/url_utility'; -import { setupAllDashboards, setupStoreWithDashboard, setupStoreWithData } from '../store_utils'; import { environmentData, dashboardGitResponse, selfMonitoringDashboardGitResponse, dashboardHeaderProps, } from '../mock_data'; +import { setupAllDashboards, setupStoreWithDashboard, setupStoreWithData } from '../store_utils'; const mockProjectPath = 'https://path/to/project'; diff --git a/spec/frontend/monitoring/components/dashboard_panel_builder_spec.js b/spec/frontend/monitoring/components/dashboard_panel_builder_spec.js index 37939a11c4d..b794d0c571e 100644 --- a/spec/frontend/monitoring/components/dashboard_panel_builder_spec.js +++ b/spec/frontend/monitoring/components/dashboard_panel_builder_spec.js @@ -1,9 +1,9 @@ -import { shallowMount } from '@vue/test-utils'; import { GlCard, GlForm, GlFormTextarea, GlAlert } from '@gitlab/ui'; -import { createStore } from '~/monitoring/stores'; +import { shallowMount } from '@vue/test-utils'; import DashboardPanel from '~/monitoring/components/dashboard_panel.vue'; -import * as types from '~/monitoring/stores/mutation_types'; import DashboardPanelBuilder from '~/monitoring/components/dashboard_panel_builder.vue'; +import { createStore } from '~/monitoring/stores'; +import * as types from '~/monitoring/stores/mutation_types'; import DateTimePicker from '~/vue_shared/components/date_time_picker/date_time_picker.vue'; import { metricsDashboardResponse } from '../fixture_data'; import { mockTimeRange } from '../mock_data'; diff --git a/spec/frontend/monitoring/components/dashboard_panel_spec.js b/spec/frontend/monitoring/components/dashboard_panel_spec.js index b3257f66cc5..a72dbbd0f41 100644 --- a/spec/frontend/monitoring/components/dashboard_panel_spec.js +++ b/spec/frontend/monitoring/components/dashboard_panel_spec.js @@ -1,34 +1,32 @@ -import Vuex from 'vuex'; +import { GlDropdownItem } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import AxiosMockAdapter from 'axios-mock-adapter'; -import { GlDropdownItem } from '@gitlab/ui'; +import Vuex from 'vuex'; import { setTestTimeout } from 'helpers/timeout'; -import invalidUrl from '~/lib/utils/invalid_url'; import axios from '~/lib/utils/axios_utils'; +import invalidUrl from '~/lib/utils/invalid_url'; import AlertWidget from '~/monitoring/components/alert_widget.vue'; -import DashboardPanel from '~/monitoring/components/dashboard_panel.vue'; - -import { panelTypes } from '~/monitoring/constants'; - -import MonitorEmptyChart from '~/monitoring/components/charts/empty_chart.vue'; -import MonitorTimeSeriesChart from '~/monitoring/components/charts/time_series.vue'; import MonitorAnomalyChart from '~/monitoring/components/charts/anomaly.vue'; -import MonitorSingleStatChart from '~/monitoring/components/charts/single_stat.vue'; -import MonitorHeatmapChart from '~/monitoring/components/charts/heatmap.vue'; -import MonitorColumnChart from '~/monitoring/components/charts/column.vue'; import MonitorBarChart from '~/monitoring/components/charts/bar.vue'; +import MonitorColumnChart from '~/monitoring/components/charts/column.vue'; +import MonitorEmptyChart from '~/monitoring/components/charts/empty_chart.vue'; +import MonitorHeatmapChart from '~/monitoring/components/charts/heatmap.vue'; +import MonitorSingleStatChart from '~/monitoring/components/charts/single_stat.vue'; import MonitorStackedColumnChart from '~/monitoring/components/charts/stacked_column.vue'; +import MonitorTimeSeriesChart from '~/monitoring/components/charts/time_series.vue'; +import DashboardPanel from '~/monitoring/components/dashboard_panel.vue'; +import { panelTypes } from '~/monitoring/constants'; import { createStore, monitoringDashboard } from '~/monitoring/stores'; import { createStore as createEmbedGroupStore } from '~/monitoring/stores/embed_group'; +import { dashboardProps, graphData, graphDataEmpty } from '../fixture_data'; import { anomalyGraphData, singleStatGraphData, heatmapGraphData, barGraphData, } from '../graph_data'; -import { dashboardProps, graphData, graphDataEmpty } from '../fixture_data'; import { mockAlert, mockLogsHref, diff --git a/spec/frontend/monitoring/components/dashboard_spec.js b/spec/frontend/monitoring/components/dashboard_spec.js index 062a87c4091..5c7042d4cb5 100644 --- a/spec/frontend/monitoring/components/dashboard_spec.js +++ b/spec/frontend/monitoring/components/dashboard_spec.js @@ -1,22 +1,28 @@ import { shallowMount, mount } from '@vue/test-utils'; -import VueDraggable from 'vuedraggable'; import MockAdapter from 'axios-mock-adapter'; +import VueDraggable from 'vuedraggable'; import { TEST_HOST } from 'helpers/test_constants'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { ESC_KEY } from '~/lib/utils/keys'; import { objectToQuery } from '~/lib/utils/url_utility'; -import axios from '~/lib/utils/axios_utils'; -import { dashboardEmptyStates, metricStates } from '~/monitoring/constants'; import Dashboard from '~/monitoring/components/dashboard.vue'; import DashboardHeader from '~/monitoring/components/dashboard_header.vue'; -import EmptyState from '~/monitoring/components/empty_state.vue'; -import GroupEmptyState from '~/monitoring/components/group_empty_state.vue'; import DashboardPanel from '~/monitoring/components/dashboard_panel.vue'; +import EmptyState from '~/monitoring/components/empty_state.vue'; import GraphGroup from '~/monitoring/components/graph_group.vue'; +import GroupEmptyState from '~/monitoring/components/group_empty_state.vue'; import LinksSection from '~/monitoring/components/links_section.vue'; +import { dashboardEmptyStates, metricStates } from '~/monitoring/constants'; import { createStore } from '~/monitoring/stores'; import * as types from '~/monitoring/stores/mutation_types'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; +import { + metricsDashboardViewModel, + metricsDashboardPanelCount, + dashboardProps, +} from '../fixture_data'; +import { dashboardGitResponse, storeVariables } from '../mock_data'; import { setupAllDashboards, setupStoreWithDashboard, @@ -25,12 +31,6 @@ import { setupStoreWithDataForPanelCount, setupStoreWithLinks, } from '../store_utils'; -import { dashboardGitResponse, storeVariables } from '../mock_data'; -import { - metricsDashboardViewModel, - metricsDashboardPanelCount, - dashboardProps, -} from '../fixture_data'; jest.mock('~/flash'); diff --git a/spec/frontend/monitoring/components/dashboard_template_spec.js b/spec/frontend/monitoring/components/dashboard_template_spec.js index 8941e57c4ce..4e220d724f4 100644 --- a/spec/frontend/monitoring/components/dashboard_template_spec.js +++ b/spec/frontend/monitoring/components/dashboard_template_spec.js @@ -4,8 +4,8 @@ import axios from '~/lib/utils/axios_utils'; import Dashboard from '~/monitoring/components/dashboard.vue'; import DashboardHeader from '~/monitoring/components/dashboard_header.vue'; import { createStore } from '~/monitoring/stores'; -import { setupAllDashboards } from '../store_utils'; import { dashboardProps } from '../fixture_data'; +import { setupAllDashboards } from '../store_utils'; jest.mock('~/lib/utils/url_utility'); diff --git a/spec/frontend/monitoring/components/dashboard_url_time_spec.js b/spec/frontend/monitoring/components/dashboard_url_time_spec.js index 40610e5f542..9830b6d047f 100644 --- a/spec/frontend/monitoring/components/dashboard_url_time_spec.js +++ b/spec/frontend/monitoring/components/dashboard_url_time_spec.js @@ -1,6 +1,7 @@ import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { queryToObject, redirectTo, @@ -8,7 +9,6 @@ import { mergeUrlParams, updateHistory, } from '~/lib/utils/url_utility'; -import axios from '~/lib/utils/axios_utils'; import Dashboard from '~/monitoring/components/dashboard.vue'; import DashboardHeader from '~/monitoring/components/dashboard_header.vue'; diff --git a/spec/frontend/monitoring/components/dashboards_dropdown_spec.js b/spec/frontend/monitoring/components/dashboards_dropdown_spec.js index 6ed190051ce..c9241834789 100644 --- a/spec/frontend/monitoring/components/dashboards_dropdown_spec.js +++ b/spec/frontend/monitoring/components/dashboards_dropdown_spec.js @@ -1,6 +1,6 @@ -import { nextTick } from 'vue'; -import { shallowMount } from '@vue/test-utils'; import { GlDropdownItem, GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; +import { nextTick } from 'vue'; import DashboardsDropdown from '~/monitoring/components/dashboards_dropdown.vue'; diff --git a/spec/frontend/monitoring/components/duplicate_dashboard_form_spec.js b/spec/frontend/monitoring/components/duplicate_dashboard_form_spec.js index 4abb5b2e27b..9672f6a315a 100644 --- a/spec/frontend/monitoring/components/duplicate_dashboard_form_spec.js +++ b/spec/frontend/monitoring/components/duplicate_dashboard_form_spec.js @@ -1,5 +1,5 @@ -import { nextTick } from 'vue'; import { mount } from '@vue/test-utils'; +import { nextTick } from 'vue'; import DuplicateDashboardForm from '~/monitoring/components/duplicate_dashboard_form.vue'; import { dashboardGitResponse } from '../mock_data'; diff --git a/spec/frontend/monitoring/components/duplicate_dashboard_modal_spec.js b/spec/frontend/monitoring/components/duplicate_dashboard_modal_spec.js index 7e7065da179..1bc89e509b5 100644 --- a/spec/frontend/monitoring/components/duplicate_dashboard_modal_spec.js +++ b/spec/frontend/monitoring/components/duplicate_dashboard_modal_spec.js @@ -1,12 +1,12 @@ -import Vuex from 'vuex'; -import Vue from 'vue'; -import { shallowMount } from '@vue/test-utils'; import { GlAlert, GlLoadingIcon, GlModal } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; +import Vue from 'vue'; +import Vuex from 'vuex'; import waitForPromises from 'helpers/wait_for_promises'; -import DuplicateDashboardModal from '~/monitoring/components/duplicate_dashboard_modal.vue'; import DuplicateDashboardForm from '~/monitoring/components/duplicate_dashboard_form.vue'; +import DuplicateDashboardModal from '~/monitoring/components/duplicate_dashboard_modal.vue'; import { dashboardGitResponse } from '../mock_data'; diff --git a/spec/frontend/monitoring/components/embeds/embed_group_spec.js b/spec/frontend/monitoring/components/embeds/embed_group_spec.js index cb06a1a6b64..79b223d96e4 100644 --- a/spec/frontend/monitoring/components/embeds/embed_group_spec.js +++ b/spec/frontend/monitoring/components/embeds/embed_group_spec.js @@ -1,6 +1,6 @@ +import { GlButton, GlCard } from '@gitlab/ui'; import { createLocalVue, mount, shallowMount } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlButton, GlCard } from '@gitlab/ui'; import { TEST_HOST } from 'helpers/test_constants'; import EmbedGroup from '~/monitoring/components/embeds/embed_group.vue'; import MetricEmbed from '~/monitoring/components/embeds/metric_embed.vue'; diff --git a/spec/frontend/monitoring/components/embeds/metric_embed_spec.js b/spec/frontend/monitoring/components/embeds/metric_embed_spec.js index 74f265930b1..90647f50b14 100644 --- a/spec/frontend/monitoring/components/embeds/metric_embed_spec.js +++ b/spec/frontend/monitoring/components/embeds/metric_embed_spec.js @@ -1,7 +1,7 @@ import { createLocalVue, shallowMount } from '@vue/test-utils'; import Vuex from 'vuex'; -import { TEST_HOST } from 'helpers/test_constants'; import { setHTMLFixture } from 'helpers/fixtures'; +import { TEST_HOST } from 'helpers/test_constants'; import DashboardPanel from '~/monitoring/components/dashboard_panel.vue'; import MetricEmbed from '~/monitoring/components/embeds/metric_embed.vue'; import { groups, initialState, metricsData, metricsWithData } from './mock_data'; diff --git a/spec/frontend/monitoring/components/empty_state_spec.js b/spec/frontend/monitoring/components/empty_state_spec.js index abb8b21e9f4..1ecb101574b 100644 --- a/spec/frontend/monitoring/components/empty_state_spec.js +++ b/spec/frontend/monitoring/components/empty_state_spec.js @@ -1,7 +1,7 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon, GlEmptyState } from '@gitlab/ui'; -import { dashboardEmptyStates } from '~/monitoring/constants'; +import { shallowMount } from '@vue/test-utils'; import EmptyState from '~/monitoring/components/empty_state.vue'; +import { dashboardEmptyStates } from '~/monitoring/constants'; function createComponent(props) { return shallowMount(EmptyState, { diff --git a/spec/frontend/monitoring/components/graph_group_spec.js b/spec/frontend/monitoring/components/graph_group_spec.js index c57461c2d09..625dd3f0b33 100644 --- a/spec/frontend/monitoring/components/graph_group_spec.js +++ b/spec/frontend/monitoring/components/graph_group_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon, GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import GraphGroup from '~/monitoring/components/graph_group.vue'; describe('Graph group component', () => { diff --git a/spec/frontend/monitoring/components/links_section_spec.js b/spec/frontend/monitoring/components/links_section_spec.js index 2daad77d513..8fc287c50e4 100644 --- a/spec/frontend/monitoring/components/links_section_spec.js +++ b/spec/frontend/monitoring/components/links_section_spec.js @@ -1,7 +1,7 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLink } from '@gitlab/ui'; -import { createStore } from '~/monitoring/stores'; +import { shallowMount } from '@vue/test-utils'; import LinksSection from '~/monitoring/components/links_section.vue'; +import { createStore } from '~/monitoring/stores'; describe('Links Section component', () => { let store; diff --git a/spec/frontend/monitoring/components/refresh_button_spec.js b/spec/frontend/monitoring/components/refresh_button_spec.js index a03d29309d4..248cf32d54b 100644 --- a/spec/frontend/monitoring/components/refresh_button_spec.js +++ b/spec/frontend/monitoring/components/refresh_button_spec.js @@ -1,8 +1,8 @@ +import { GlDropdown, GlDropdownItem, GlButton } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import Visibility from 'visibilityjs'; -import { GlDropdown, GlDropdownItem, GlButton } from '@gitlab/ui'; -import { createStore } from '~/monitoring/stores'; import RefreshButton from '~/monitoring/components/refresh_button.vue'; +import { createStore } from '~/monitoring/stores'; describe('RefreshButton', () => { let wrapper; diff --git a/spec/frontend/monitoring/components/variables/dropdown_field_spec.js b/spec/frontend/monitoring/components/variables/dropdown_field_spec.js index f5db17ce367..f5ee32e78e6 100644 --- a/spec/frontend/monitoring/components/variables/dropdown_field_spec.js +++ b/spec/frontend/monitoring/components/variables/dropdown_field_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlDropdown, GlDropdownItem } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import DropdownField from '~/monitoring/components/variables/dropdown_field.vue'; describe('Custom variable component', () => { diff --git a/spec/frontend/monitoring/components/variables/text_field_spec.js b/spec/frontend/monitoring/components/variables/text_field_spec.js index 99c6facac38..28e02dff4bf 100644 --- a/spec/frontend/monitoring/components/variables/text_field_spec.js +++ b/spec/frontend/monitoring/components/variables/text_field_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlFormInput } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import TextField from '~/monitoring/components/variables/text_field.vue'; describe('Text variable component', () => { diff --git a/spec/frontend/monitoring/components/variables_section_spec.js b/spec/frontend/monitoring/components/variables_section_spec.js index 3097906ee68..6157de0dafe 100644 --- a/spec/frontend/monitoring/components/variables_section_spec.js +++ b/spec/frontend/monitoring/components/variables_section_spec.js @@ -1,9 +1,9 @@ import { shallowMount } from '@vue/test-utils'; import Vuex from 'vuex'; -import VariablesSection from '~/monitoring/components/variables_section.vue'; +import { updateHistory, mergeUrlParams } from '~/lib/utils/url_utility'; import DropdownField from '~/monitoring/components/variables/dropdown_field.vue'; import TextField from '~/monitoring/components/variables/text_field.vue'; -import { updateHistory, mergeUrlParams } from '~/lib/utils/url_utility'; +import VariablesSection from '~/monitoring/components/variables_section.vue'; import { createStore } from '~/monitoring/stores'; import { convertVariablesForURL } from '~/monitoring/utils'; import { storeVariables } from '../mock_data'; diff --git a/spec/frontend/monitoring/fixture_data.js b/spec/frontend/monitoring/fixture_data.js index 0f3dbaac493..d20a111c701 100644 --- a/spec/frontend/monitoring/fixture_data.js +++ b/spec/frontend/monitoring/fixture_data.js @@ -1,7 +1,7 @@ -import { stateAndPropsFromDataset } from '~/monitoring/utils'; -import { mapToDashboardViewModel } from '~/monitoring/stores/utils'; -import { metricStates } from '~/monitoring/constants'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; +import { metricStates } from '~/monitoring/constants'; +import { mapToDashboardViewModel } from '~/monitoring/stores/utils'; +import { stateAndPropsFromDataset } from '~/monitoring/utils'; import { metricsResult } from './mock_data'; diff --git a/spec/frontend/monitoring/graph_data.js b/spec/frontend/monitoring/graph_data.js index 0b23ee41927..981955efebb 100644 --- a/spec/frontend/monitoring/graph_data.js +++ b/spec/frontend/monitoring/graph_data.js @@ -1,5 +1,5 @@ -import { mapPanelToViewModel, normalizeQueryResponseData } from '~/monitoring/stores/utils'; import { panelTypes, metricStates } from '~/monitoring/constants'; +import { mapPanelToViewModel, normalizeQueryResponseData } from '~/monitoring/stores/utils'; const initTime = 1435781450; // "Wed, 01 Jul 2015 20:10:50 GMT" const intervalSeconds = 120; diff --git a/spec/frontend/monitoring/pages/dashboard_page_spec.js b/spec/frontend/monitoring/pages/dashboard_page_spec.js index 675165e9e56..dbe9cc21ad5 100644 --- a/spec/frontend/monitoring/pages/dashboard_page_spec.js +++ b/spec/frontend/monitoring/pages/dashboard_page_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; -import { createStore } from '~/monitoring/stores'; -import DashboardPage from '~/monitoring/pages/dashboard_page.vue'; import Dashboard from '~/monitoring/components/dashboard.vue'; +import DashboardPage from '~/monitoring/pages/dashboard_page.vue'; +import { createStore } from '~/monitoring/stores'; import { dashboardProps } from '../fixture_data'; describe('monitoring/pages/dashboard_page', () => { diff --git a/spec/frontend/monitoring/pages/panel_new_page_spec.js b/spec/frontend/monitoring/pages/panel_new_page_spec.js index 83365b754d9..c89cbc52bcb 100644 --- a/spec/frontend/monitoring/pages/panel_new_page_spec.js +++ b/spec/frontend/monitoring/pages/panel_new_page_spec.js @@ -1,10 +1,9 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; -import { DASHBOARD_PAGE, PANEL_NEW_PAGE } from '~/monitoring/router/constants'; -import { createStore } from '~/monitoring/stores'; +import { shallowMount } from '@vue/test-utils'; import DashboardPanelBuilder from '~/monitoring/components/dashboard_panel_builder.vue'; - import PanelNewPage from '~/monitoring/pages/panel_new_page.vue'; +import { DASHBOARD_PAGE, PANEL_NEW_PAGE } from '~/monitoring/router/constants'; +import { createStore } from '~/monitoring/stores'; const dashboard = 'dashboard.yml'; diff --git a/spec/frontend/monitoring/requests/index_spec.js b/spec/frontend/monitoring/requests/index_spec.js index b590fe749e0..b30b1e60575 100644 --- a/spec/frontend/monitoring/requests/index_spec.js +++ b/spec/frontend/monitoring/requests/index_spec.js @@ -1,8 +1,8 @@ import MockAdapter from 'axios-mock-adapter'; import { backoffMockImplementation } from 'helpers/backoff_helper'; import axios from '~/lib/utils/axios_utils'; -import statusCodes from '~/lib/utils/http_status'; import * as commonUtils from '~/lib/utils/common_utils'; +import statusCodes from '~/lib/utils/http_status'; import { getDashboard, getPrometheusQueryData } from '~/monitoring/requests'; import { metricsDashboardResponse } from '../fixture_data'; diff --git a/spec/frontend/monitoring/router_spec.js b/spec/frontend/monitoring/router_spec.js index c30c4c56a6c..b027d60f61e 100644 --- a/spec/frontend/monitoring/router_spec.js +++ b/spec/frontend/monitoring/router_spec.js @@ -1,10 +1,10 @@ import { mount, createLocalVue } from '@vue/test-utils'; import VueRouter from 'vue-router'; +import Dashboard from '~/monitoring/components/dashboard.vue'; import DashboardPage from '~/monitoring/pages/dashboard_page.vue'; import PanelNewPage from '~/monitoring/pages/panel_new_page.vue'; -import Dashboard from '~/monitoring/components/dashboard.vue'; -import { createStore } from '~/monitoring/stores'; import createRouter from '~/monitoring/router'; +import { createStore } from '~/monitoring/stores'; import { dashboardProps } from './fixture_data'; import { dashboardHeaderProps } from './mock_data'; diff --git a/spec/frontend/monitoring/store/actions_spec.js b/spec/frontend/monitoring/store/actions_spec.js index 319441b5ba2..b7f741c449f 100644 --- a/spec/frontend/monitoring/store/actions_spec.js +++ b/spec/frontend/monitoring/store/actions_spec.js @@ -1,17 +1,16 @@ import MockAdapter from 'axios-mock-adapter'; -import testAction from 'helpers/vuex_action_helper'; import { backoffMockImplementation } from 'helpers/backoff_helper'; -import Tracking from '~/tracking'; +import testAction from 'helpers/vuex_action_helper'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; -import statusCodes from '~/lib/utils/http_status'; import * as commonUtils from '~/lib/utils/common_utils'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; -import { defaultTimeRange } from '~/vue_shared/constants'; -import * as getters from '~/monitoring/stores/getters'; +import statusCodes from '~/lib/utils/http_status'; import { ENVIRONMENT_AVAILABLE_STATE } from '~/monitoring/constants'; +import getAnnotations from '~/monitoring/queries/getAnnotations.query.graphql'; +import getDashboardValidationWarnings from '~/monitoring/queries/getDashboardValidationWarnings.query.graphql'; +import getEnvironments from '~/monitoring/queries/getEnvironments.query.graphql'; import { createStore } from '~/monitoring/stores'; -import * as types from '~/monitoring/stores/mutation_types'; import { setGettingStartedEmptyState, setInitialState, @@ -33,15 +32,21 @@ import { fetchVariableMetricLabelValues, fetchPanelPreview, } from '~/monitoring/stores/actions'; +import * as getters from '~/monitoring/stores/getters'; +import * as types from '~/monitoring/stores/mutation_types'; +import storeState from '~/monitoring/stores/state'; import { gqClient, parseEnvironmentsResponse, parseAnnotationsResponse, } from '~/monitoring/stores/utils'; -import getEnvironments from '~/monitoring/queries/getEnvironments.query.graphql'; -import getAnnotations from '~/monitoring/queries/getAnnotations.query.graphql'; -import getDashboardValidationWarnings from '~/monitoring/queries/getDashboardValidationWarnings.query.graphql'; -import storeState from '~/monitoring/stores/state'; +import Tracking from '~/tracking'; +import { defaultTimeRange } from '~/vue_shared/constants'; +import { + metricsDashboardResponse, + metricsDashboardViewModel, + metricsDashboardPanelCount, +} from '../fixture_data'; import { deploymentData, environmentData, @@ -49,11 +54,6 @@ import { dashboardGitResponse, mockDashboardsErrorResponse, } from '../mock_data'; -import { - metricsDashboardResponse, - metricsDashboardViewModel, - metricsDashboardPanelCount, -} from '../fixture_data'; jest.mock('~/flash'); diff --git a/spec/frontend/monitoring/store/embed_group/mutations_spec.js b/spec/frontend/monitoring/store/embed_group/mutations_spec.js index a1d04e23e41..2f8d7687aad 100644 --- a/spec/frontend/monitoring/store/embed_group/mutations_spec.js +++ b/spec/frontend/monitoring/store/embed_group/mutations_spec.js @@ -1,6 +1,6 @@ -import state from '~/monitoring/stores/embed_group/state'; -import mutations from '~/monitoring/stores/embed_group/mutations'; import * as types from '~/monitoring/stores/embed_group/mutation_types'; +import mutations from '~/monitoring/stores/embed_group/mutations'; +import state from '~/monitoring/stores/embed_group/state'; import { mockNamespace } from '../../mock_data'; describe('Embed group mutations', () => { diff --git a/spec/frontend/monitoring/store/getters_spec.js b/spec/frontend/monitoring/store/getters_spec.js index 771ec0ea549..c7f3bdbf1f8 100644 --- a/spec/frontend/monitoring/store/getters_spec.js +++ b/spec/frontend/monitoring/store/getters_spec.js @@ -1,8 +1,9 @@ import _ from 'lodash'; +import { metricStates } from '~/monitoring/constants'; import * as getters from '~/monitoring/stores/getters'; -import mutations from '~/monitoring/stores/mutations'; import * as types from '~/monitoring/stores/mutation_types'; -import { metricStates } from '~/monitoring/constants'; +import mutations from '~/monitoring/stores/mutations'; +import { metricsDashboardPayload } from '../fixture_data'; import { customDashboardBasePath, environmentData, @@ -11,7 +12,6 @@ import { storeVariables, mockLinks, } from '../mock_data'; -import { metricsDashboardPayload } from '../fixture_data'; describe('Monitoring store Getters', () => { let state; diff --git a/spec/frontend/monitoring/store/mutations_spec.js b/spec/frontend/monitoring/store/mutations_spec.js index 571828eb67c..ae1a4e16b30 100644 --- a/spec/frontend/monitoring/store/mutations_spec.js +++ b/spec/frontend/monitoring/store/mutations_spec.js @@ -1,12 +1,12 @@ import httpStatusCodes from '~/lib/utils/http_status'; -import mutations from '~/monitoring/stores/mutations'; +import { dashboardEmptyStates, metricStates } from '~/monitoring/constants'; import * as types from '~/monitoring/stores/mutation_types'; +import mutations from '~/monitoring/stores/mutations'; import state from '~/monitoring/stores/state'; -import { dashboardEmptyStates, metricStates } from '~/monitoring/constants'; -import { deploymentData, dashboardGitResponse, storeTextVariables } from '../mock_data'; -import { prometheusMatrixMultiResult } from '../graph_data'; import { metricsDashboardPayload } from '../fixture_data'; +import { prometheusMatrixMultiResult } from '../graph_data'; +import { deploymentData, dashboardGitResponse, storeTextVariables } from '../mock_data'; describe('Monitoring mutations', () => { let stateCopy; diff --git a/spec/frontend/monitoring/store/utils_spec.js b/spec/frontend/monitoring/store/utils_spec.js index 2221909583c..697bdb9185f 100644 --- a/spec/frontend/monitoring/store/utils_spec.js +++ b/spec/frontend/monitoring/store/utils_spec.js @@ -1,4 +1,6 @@ import { SUPPORTED_FORMATS } from '~/lib/utils/unit_format'; +import * as urlUtils from '~/lib/utils/url_utility'; +import { NOT_IN_DB_PREFIX } from '~/monitoring/constants'; import { uniqMetricsId, parseEnvironmentsResponse, @@ -10,8 +12,6 @@ import { addDashboardMetaDataToLink, normalizeCustomDashboardPath, } from '~/monitoring/stores/utils'; -import * as urlUtils from '~/lib/utils/url_utility'; -import { NOT_IN_DB_PREFIX } from '~/monitoring/constants'; import { annotationsData } from '../mock_data'; const projectPath = 'gitlab-org/gitlab-test'; diff --git a/spec/frontend/monitoring/store/variable_mapping_spec.js b/spec/frontend/monitoring/store/variable_mapping_spec.js index 85e87f361b5..58e7175c04c 100644 --- a/spec/frontend/monitoring/store/variable_mapping_spec.js +++ b/spec/frontend/monitoring/store/variable_mapping_spec.js @@ -1,9 +1,9 @@ +import * as urlUtils from '~/lib/utils/url_utility'; import { parseTemplatingVariables, mergeURLVariables, optionsFromSeriesData, } from '~/monitoring/stores/variable_mapping'; -import * as urlUtils from '~/lib/utils/url_utility'; import { templatingVariablesExamples, storeTextVariables, diff --git a/spec/frontend/monitoring/store_utils.js b/spec/frontend/monitoring/store_utils.js index 911ccc78f7b..96219661b9b 100644 --- a/spec/frontend/monitoring/store_utils.js +++ b/spec/frontend/monitoring/store_utils.js @@ -1,6 +1,6 @@ import * as types from '~/monitoring/stores/mutation_types'; -import { metricsResult, environmentData, dashboardGitResponse } from './mock_data'; import { metricsDashboardPayload } from './fixture_data'; +import { metricsResult, environmentData, dashboardGitResponse } from './mock_data'; export const setMetricResult = ({ store, result, group = 0, panel = 0, metric = 0 }) => { const { dashboard } = store.state.monitoringDashboard; diff --git a/spec/frontend/monitoring/utils_spec.js b/spec/frontend/monitoring/utils_spec.js index cd49e4c7968..25ae4dcd702 100644 --- a/spec/frontend/monitoring/utils_spec.js +++ b/spec/frontend/monitoring/utils_spec.js @@ -1,9 +1,9 @@ import { TEST_HOST } from 'helpers/test_constants'; -import * as monitoringUtils from '~/monitoring/utils'; import * as urlUtils from '~/lib/utils/url_utility'; -import { mockProjectDir, barMockData } from './mock_data'; -import { singleStatGraphData, anomalyGraphData } from './graph_data'; +import * as monitoringUtils from '~/monitoring/utils'; import { metricsDashboardViewModel, graphData } from './fixture_data'; +import { singleStatGraphData, anomalyGraphData } from './graph_data'; +import { mockProjectDir, barMockData } from './mock_data'; const mockPath = `${TEST_HOST}${mockProjectDir}/-/environments/29/metrics`; diff --git a/spec/frontend/namespace_select_spec.js b/spec/frontend/namespace_select_spec.js index d6f3eb75cd9..a38508dd601 100644 --- a/spec/frontend/namespace_select_spec.js +++ b/spec/frontend/namespace_select_spec.js @@ -1,5 +1,5 @@ -import NamespaceSelect from '~/namespace_select'; import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; +import NamespaceSelect from '~/namespace_select'; jest.mock('~/deprecated_jquery_dropdown'); diff --git a/spec/frontend/notebook/cells/markdown_spec.js b/spec/frontend/notebook/cells/markdown_spec.js index ad33858da22..4d6addaf47c 100644 --- a/spec/frontend/notebook/cells/markdown_spec.js +++ b/spec/frontend/notebook/cells/markdown_spec.js @@ -1,5 +1,5 @@ -import Vue from 'vue'; import katex from 'katex'; +import Vue from 'vue'; import MarkdownComponent from '~/notebook/cells/markdown.vue'; const Component = Vue.extend(MarkdownComponent); diff --git a/spec/frontend/notes/components/comment_form_spec.js b/spec/frontend/notes/components/comment_form_spec.js index 2307510e119..2f58f75ab70 100644 --- a/spec/frontend/notes/components/comment_form_spec.js +++ b/spec/frontend/notes/components/comment_form_spec.js @@ -1,15 +1,15 @@ -import { nextTick } from 'vue'; import { mount, shallowMount } from '@vue/test-utils'; import Autosize from 'autosize'; import MockAdapter from 'axios-mock-adapter'; +import { nextTick } from 'vue'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; +import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests'; import { deprecatedCreateFlash as flash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; -import createStore from '~/notes/stores'; import CommentForm from '~/notes/components/comment_form.vue'; import * as constants from '~/notes/constants'; import eventHub from '~/notes/event_hub'; -import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests'; +import createStore from '~/notes/stores'; import { loggedOutnoteableData, notesDataMock, userDataMock, noteableDataMock } from '../mock_data'; jest.mock('autosize'); diff --git a/spec/frontend/notes/components/diff_discussion_header_spec.js b/spec/frontend/notes/components/diff_discussion_header_spec.js index 3940439a32b..fdc89522901 100644 --- a/spec/frontend/notes/components/diff_discussion_header_spec.js +++ b/spec/frontend/notes/components/diff_discussion_header_spec.js @@ -1,10 +1,10 @@ import { mount } from '@vue/test-utils'; -import createStore from '~/notes/stores'; import diffDiscussionHeader from '~/notes/components/diff_discussion_header.vue'; +import createStore from '~/notes/stores'; -import { discussionMock } from '../mock_data'; import mockDiffFile from '../../diffs/mock_data/diff_discussions'; +import { discussionMock } from '../mock_data'; const discussionWithTwoUnresolvedNotes = 'merge_requests/resolved_diff_discussion.json'; diff --git a/spec/frontend/notes/components/diff_with_note_spec.js b/spec/frontend/notes/components/diff_with_note_spec.js index 6480af015db..e997fc4da50 100644 --- a/spec/frontend/notes/components/diff_with_note_spec.js +++ b/spec/frontend/notes/components/diff_with_note_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; -import DiffWithNote from '~/notes/components/diff_with_note.vue'; import { createStore } from '~/mr_notes/stores'; +import DiffWithNote from '~/notes/components/diff_with_note.vue'; const discussionFixture = 'merge_requests/diff_discussion.json'; const imageDiscussionFixture = 'merge_requests/image_diff_discussion.json'; diff --git a/spec/frontend/notes/components/discussion_counter_spec.js b/spec/frontend/notes/components/discussion_counter_spec.js index ca1972c9f61..9db0f823d84 100644 --- a/spec/frontend/notes/components/discussion_counter_spec.js +++ b/spec/frontend/notes/components/discussion_counter_spec.js @@ -1,8 +1,8 @@ -import Vuex from 'vuex'; -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; -import notesModule from '~/notes/stores/modules'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import DiscussionCounter from '~/notes/components/discussion_counter.vue'; +import notesModule from '~/notes/stores/modules'; import * as types from '~/notes/stores/mutation_types'; import { noteableDataMock, discussionMock, notesDataMock, userDataMock } from '../mock_data'; diff --git a/spec/frontend/notes/components/discussion_filter_note_spec.js b/spec/frontend/notes/components/discussion_filter_note_spec.js index 9ae3f08df77..ad9a2e898eb 100644 --- a/spec/frontend/notes/components/discussion_filter_note_spec.js +++ b/spec/frontend/notes/components/discussion_filter_note_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton, GlSprintf } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import DiscussionFilterNote from '~/notes/components/discussion_filter_note.vue'; import eventHub from '~/notes/event_hub'; diff --git a/spec/frontend/notes/components/discussion_filter_spec.js b/spec/frontend/notes/components/discussion_filter_spec.js index aeba8e8056c..6f62b8ba528 100644 --- a/spec/frontend/notes/components/discussion_filter_spec.js +++ b/spec/frontend/notes/components/discussion_filter_spec.js @@ -1,13 +1,13 @@ -import Vuex from 'vuex'; import { createLocalVue, mount } from '@vue/test-utils'; import AxiosMockAdapter from 'axios-mock-adapter'; +import Vuex from 'vuex'; import { TEST_HOST } from 'helpers/test_constants'; import createEventHub from '~/helpers/event_hub_factory'; import axios from '~/lib/utils/axios_utils'; -import notesModule from '~/notes/stores/modules'; import DiscussionFilter from '~/notes/components/discussion_filter.vue'; import { DISCUSSION_FILTERS_DEFAULT_VALUE, DISCUSSION_FILTER_TYPES } from '~/notes/constants'; +import notesModule from '~/notes/stores/modules'; import { discussionFiltersMock, discussionMock } from '../mock_data'; diff --git a/spec/frontend/notes/components/discussion_navigator_spec.js b/spec/frontend/notes/components/discussion_navigator_spec.js index 122814b8e3f..4d55eee2ffa 100644 --- a/spec/frontend/notes/components/discussion_navigator_spec.js +++ b/spec/frontend/notes/components/discussion_navigator_spec.js @@ -1,7 +1,7 @@ /* global Mousetrap */ import 'mousetrap'; -import Vue from 'vue'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vue from 'vue'; import DiscussionNavigator from '~/notes/components/discussion_navigator.vue'; import eventHub from '~/notes/event_hub'; diff --git a/spec/frontend/notes/components/discussion_notes_spec.js b/spec/frontend/notes/components/discussion_notes_spec.js index d37969fede4..cd24b9afbdf 100644 --- a/spec/frontend/notes/components/discussion_notes_spec.js +++ b/spec/frontend/notes/components/discussion_notes_spec.js @@ -1,13 +1,13 @@ -import { shallowMount } from '@vue/test-utils'; import { getByRole } from '@testing-library/dom'; +import { shallowMount } from '@vue/test-utils'; import '~/behaviors/markdown/render_gfm'; -import { SYSTEM_NOTE } from '~/notes/constants'; import DiscussionNotes from '~/notes/components/discussion_notes.vue'; import NoteableNote from '~/notes/components/noteable_note.vue'; +import { SYSTEM_NOTE } from '~/notes/constants'; +import createStore from '~/notes/stores'; import PlaceholderNote from '~/vue_shared/components/notes/placeholder_note.vue'; import PlaceholderSystemNote from '~/vue_shared/components/notes/placeholder_system_note.vue'; import SystemNote from '~/vue_shared/components/notes/system_note.vue'; -import createStore from '~/notes/stores'; import { noteableDataMock, discussionMock, notesDataMock } from '../mock_data'; const LINE_RANGE = {}; diff --git a/spec/frontend/notes/components/discussion_resolve_button_spec.js b/spec/frontend/notes/components/discussion_resolve_button_spec.js index 5105e1013d3..64e061830b9 100644 --- a/spec/frontend/notes/components/discussion_resolve_button_spec.js +++ b/spec/frontend/notes/components/discussion_resolve_button_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import resolveDiscussionButton from '~/notes/components/discussion_resolve_button.vue'; const buttonTitle = 'Resolve discussion'; diff --git a/spec/frontend/notes/components/multiline_comment_form_spec.js b/spec/frontend/notes/components/multiline_comment_form_spec.js index 081fd6e10ef..b6d603c6358 100644 --- a/spec/frontend/notes/components/multiline_comment_form_spec.js +++ b/spec/frontend/notes/components/multiline_comment_form_spec.js @@ -1,7 +1,7 @@ +import { GlFormSelect } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import Vue from 'vue'; import Vuex from 'vuex'; -import { mount } from '@vue/test-utils'; -import { GlFormSelect } from '@gitlab/ui'; import MultilineCommentForm from '~/notes/components/multiline_comment_form.vue'; import notesModule from '~/notes/stores/modules'; diff --git a/spec/frontend/notes/components/note_actions/reply_button_spec.js b/spec/frontend/notes/components/note_actions/reply_button_spec.js index 720ab10b270..a8e8d23a6c1 100644 --- a/spec/frontend/notes/components/note_actions/reply_button_spec.js +++ b/spec/frontend/notes/components/note_actions/reply_button_spec.js @@ -1,5 +1,5 @@ -import Vuex from 'vuex'; import { createLocalVue, mount } from '@vue/test-utils'; +import Vuex from 'vuex'; import ReplyButton from '~/notes/components/note_actions/reply_button.vue'; const localVue = createLocalVue(); diff --git a/spec/frontend/notes/components/note_actions_spec.js b/spec/frontend/notes/components/note_actions_spec.js index 7c3d747711c..17717ebd09a 100644 --- a/spec/frontend/notes/components/note_actions_spec.js +++ b/spec/frontend/notes/components/note_actions_spec.js @@ -1,11 +1,11 @@ -import Vue from 'vue'; import { mount, createLocalVue, createWrapper } from '@vue/test-utils'; import AxiosMockAdapter from 'axios-mock-adapter'; +import Vue from 'vue'; import { TEST_HOST } from 'spec/test_constants'; -import createStore from '~/notes/stores'; -import noteActions from '~/notes/components/note_actions.vue'; import axios from '~/lib/utils/axios_utils'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; +import noteActions from '~/notes/components/note_actions.vue'; +import createStore from '~/notes/stores'; import { userDataMock } from '../mock_data'; describe('noteActions', () => { diff --git a/spec/frontend/notes/components/note_awards_list_spec.js b/spec/frontend/notes/components/note_awards_list_spec.js index 13a817902e6..9fc89ffa473 100644 --- a/spec/frontend/notes/components/note_awards_list_spec.js +++ b/spec/frontend/notes/components/note_awards_list_spec.js @@ -1,9 +1,9 @@ -import Vue from 'vue'; import AxiosMockAdapter from 'axios-mock-adapter'; +import Vue from 'vue'; import { TEST_HOST } from 'helpers/test_constants'; import axios from '~/lib/utils/axios_utils'; -import createStore from '~/notes/stores'; import awardsNote from '~/notes/components/note_awards_list.vue'; +import createStore from '~/notes/stores'; import { noteableDataMock, notesDataMock } from '../mock_data'; describe('note_awards_list component', () => { diff --git a/spec/frontend/notes/components/note_body_spec.js b/spec/frontend/notes/components/note_body_spec.js index 07b8d99a79a..4922de987fa 100644 --- a/spec/frontend/notes/components/note_body_spec.js +++ b/spec/frontend/notes/components/note_body_spec.js @@ -1,13 +1,13 @@ -import Vue from 'vue'; import { shallowMount } from '@vue/test-utils'; +import Vue from 'vue'; import Vuex from 'vuex'; -import notes from '~/notes/stores/modules/index'; -import createStore from '~/notes/stores'; import { suggestionCommitMessage } from '~/diffs/store/getters'; +import noteBody from '~/notes/components/note_body.vue'; +import createStore from '~/notes/stores'; +import notes from '~/notes/stores/modules/index'; import Suggestions from '~/vue_shared/components/markdown/suggestions.vue'; -import noteBody from '~/notes/components/note_body.vue'; import { noteableDataMock, notesDataMock, note } from '../mock_data'; diff --git a/spec/frontend/notes/components/note_form_spec.js b/spec/frontend/notes/components/note_form_spec.js index 2ef99297540..7615f3b70f1 100644 --- a/spec/frontend/notes/components/note_form_spec.js +++ b/spec/frontend/notes/components/note_form_spec.js @@ -1,10 +1,10 @@ import { mount } from '@vue/test-utils'; import { nextTick } from 'vue'; -import createStore from '~/notes/stores'; -import NoteForm from '~/notes/components/note_form.vue'; import batchComments from '~/batch_comments/stores/modules/batch_comments'; -import MarkdownField from '~/vue_shared/components/markdown/field.vue'; import { getDraft, updateDraft } from '~/lib/utils/autosave'; +import NoteForm from '~/notes/components/note_form.vue'; +import createStore from '~/notes/stores'; +import MarkdownField from '~/vue_shared/components/markdown/field.vue'; import { noteableDataMock, notesDataMock, discussionMock } from '../mock_data'; jest.mock('~/lib/utils/autosave'); diff --git a/spec/frontend/notes/components/note_header_spec.js b/spec/frontend/notes/components/note_header_spec.js index 132e3d8aa7e..4760e2b9a0a 100644 --- a/spec/frontend/notes/components/note_header_spec.js +++ b/spec/frontend/notes/components/note_header_spec.js @@ -1,7 +1,7 @@ +import { GlSprintf } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import { nextTick } from 'vue'; import Vuex from 'vuex'; -import { GlSprintf } from '@gitlab/ui'; import NoteHeader from '~/notes/components/note_header.vue'; import { AVAILABILITY_STATUS } from '~/set_status_modal/utils'; diff --git a/spec/frontend/notes/components/noteable_discussion_spec.js b/spec/frontend/notes/components/noteable_discussion_spec.js index b87c6cd7f2b..87538279c3d 100644 --- a/spec/frontend/notes/components/noteable_discussion_spec.js +++ b/spec/frontend/notes/components/noteable_discussion_spec.js @@ -1,13 +1,13 @@ -import { nextTick } from 'vue'; import { mount } from '@vue/test-utils'; -import mockDiffFile from 'jest/diffs/mock_data/diff_file'; +import { nextTick } from 'vue'; import { trimText } from 'helpers/text_helper'; -import createStore from '~/notes/stores'; -import NoteableDiscussion from '~/notes/components/noteable_discussion.vue'; +import mockDiffFile from 'jest/diffs/mock_data/diff_file'; import DiscussionNotes from '~/notes/components/discussion_notes.vue'; import ReplyPlaceholder from '~/notes/components/discussion_reply_placeholder.vue'; import ResolveWithIssueButton from '~/notes/components/discussion_resolve_with_issue_button.vue'; import NoteForm from '~/notes/components/note_form.vue'; +import NoteableDiscussion from '~/notes/components/noteable_discussion.vue'; +import createStore from '~/notes/stores'; import '~/behaviors/markdown/render_gfm'; import { noteableDataMock, diff --git a/spec/frontend/notes/components/noteable_note_spec.js b/spec/frontend/notes/components/noteable_note_spec.js index 1f38364fc01..fe78e086403 100644 --- a/spec/frontend/notes/components/noteable_note_spec.js +++ b/spec/frontend/notes/components/noteable_note_spec.js @@ -1,11 +1,11 @@ -import { escape } from 'lodash'; import { mount, createLocalVue } from '@vue/test-utils'; -import createStore from '~/notes/stores'; -import issueNote from '~/notes/components/noteable_note.vue'; -import NoteHeader from '~/notes/components/note_header.vue'; -import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; +import { escape } from 'lodash'; import NoteActions from '~/notes/components/note_actions.vue'; import NoteBody from '~/notes/components/note_body.vue'; +import NoteHeader from '~/notes/components/note_header.vue'; +import issueNote from '~/notes/components/noteable_note.vue'; +import createStore from '~/notes/stores'; +import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; import { noteableDataMock, notesDataMock, note } from '../mock_data'; describe('issue_note', () => { diff --git a/spec/frontend/notes/components/notes_app_spec.js b/spec/frontend/notes/components/notes_app_spec.js index 45fbba2524a..efee72dea96 100644 --- a/spec/frontend/notes/components/notes_app_spec.js +++ b/spec/frontend/notes/components/notes_app_spec.js @@ -1,16 +1,16 @@ -import $ from 'jquery'; +import { mount, shallowMount } from '@vue/test-utils'; import AxiosMockAdapter from 'axios-mock-adapter'; +import $ from 'jquery'; import Vue from 'vue'; -import { mount, shallowMount } from '@vue/test-utils'; import { setTestTimeout } from 'helpers/timeout'; import axios from '~/lib/utils/axios_utils'; -import NotesApp from '~/notes/components/notes_app.vue'; +import * as urlUtility from '~/lib/utils/url_utility'; import CommentForm from '~/notes/components/comment_form.vue'; -import createStore from '~/notes/stores'; +import NotesApp from '~/notes/components/notes_app.vue'; import * as constants from '~/notes/constants'; +import createStore from '~/notes/stores'; import '~/behaviors/markdown/render_gfm'; // TODO: use generated fixture (https://gitlab.com/gitlab-org/gitlab-foss/issues/62491) -import * as urlUtility from '~/lib/utils/url_utility'; import OrderedLayout from '~/vue_shared/components/ordered_layout.vue'; import * as mockData from '../mock_data'; diff --git a/spec/frontend/notes/components/sort_discussion_spec.js b/spec/frontend/notes/components/sort_discussion_spec.js index 739e247735d..60f03a0f5b5 100644 --- a/spec/frontend/notes/components/sort_discussion_spec.js +++ b/spec/frontend/notes/components/sort_discussion_spec.js @@ -1,10 +1,10 @@ import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; import SortDiscussion from '~/notes/components/sort_discussion.vue'; -import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; -import createStore from '~/notes/stores'; import { ASC, DESC } from '~/notes/constants'; +import createStore from '~/notes/stores'; import Tracking from '~/tracking'; +import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/spec/frontend/notes/components/timeline_toggle_spec.js b/spec/frontend/notes/components/timeline_toggle_spec.js index b8df6fc7996..73fb2079e31 100644 --- a/spec/frontend/notes/components/timeline_toggle_spec.js +++ b/spec/frontend/notes/components/timeline_toggle_spec.js @@ -1,12 +1,12 @@ -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; import TimelineToggle, { timelineEnabledTooltip, timelineDisabledTooltip, } from '~/notes/components/timeline_toggle.vue'; -import createStore from '~/notes/stores'; import { ASC, DESC } from '~/notes/constants'; +import createStore from '~/notes/stores'; import { trackToggleTimelineView } from '~/notes/utils'; import Tracking from '~/tracking'; diff --git a/spec/frontend/notes/mixins/discussion_navigation_spec.js b/spec/frontend/notes/mixins/discussion_navigation_spec.js index 9c9a648d213..6a6e47ffcc5 100644 --- a/spec/frontend/notes/mixins/discussion_navigation_spec.js +++ b/spec/frontend/notes/mixins/discussion_navigation_spec.js @@ -1,10 +1,10 @@ -import Vuex from 'vuex'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import { setHTMLFixture } from 'helpers/fixtures'; +import createEventHub from '~/helpers/event_hub_factory'; import * as utils from '~/lib/utils/common_utils'; -import discussionNavigation from '~/notes/mixins/discussion_navigation'; import eventHub from '~/notes/event_hub'; -import createEventHub from '~/helpers/event_hub_factory'; +import discussionNavigation from '~/notes/mixins/discussion_navigation'; import notesModule from '~/notes/stores/modules'; const discussion = (id, index) => ({ diff --git a/spec/frontend/notes/old_notes_spec.js b/spec/frontend/notes/old_notes_spec.js index 00821980e8a..432b660c4b3 100644 --- a/spec/frontend/notes/old_notes_spec.js +++ b/spec/frontend/notes/old_notes_spec.js @@ -1,13 +1,13 @@ /* eslint-disable import/no-commonjs, no-new */ -import $ from 'jquery'; import MockAdapter from 'axios-mock-adapter'; +import $ from 'jquery'; import '~/behaviors/markdown/render_gfm'; import { createSpyObj } from 'helpers/jest_helpers'; -import { setTestTimeoutOnce } from 'helpers/timeout'; import { TEST_HOST } from 'helpers/test_constants'; -import * as urlUtility from '~/lib/utils/url_utility'; +import { setTestTimeoutOnce } from 'helpers/timeout'; import axios from '~/lib/utils/axios_utils'; +import * as urlUtility from '~/lib/utils/url_utility'; // These must be imported synchronously because they pull dependencies // from the DOM. diff --git a/spec/frontend/notes/stores/actions_spec.js b/spec/frontend/notes/stores/actions_spec.js index e2a7a16dbf2..1852108b39f 100644 --- a/spec/frontend/notes/stores/actions_spec.js +++ b/spec/frontend/notes/stores/actions_spec.js @@ -1,19 +1,20 @@ import AxiosMockAdapter from 'axios-mock-adapter'; -import { TEST_HOST } from 'spec/test_constants'; import testAction from 'helpers/vuex_action_helper'; +import { TEST_HOST } from 'spec/test_constants'; import Api from '~/api'; import { deprecatedCreateFlash as Flash } from '~/flash'; -import * as actions from '~/notes/stores/actions'; -import mutations from '~/notes/stores/mutations'; -import * as mutationTypes from '~/notes/stores/mutation_types'; +import axios from '~/lib/utils/axios_utils'; import * as notesConstants from '~/notes/constants'; import createStore from '~/notes/stores'; -import mrWidgetEventHub from '~/vue_merge_request_widget/event_hub'; -import axios from '~/lib/utils/axios_utils'; +import * as actions from '~/notes/stores/actions'; +import * as mutationTypes from '~/notes/stores/mutation_types'; +import mutations from '~/notes/stores/mutations'; import * as utils from '~/notes/stores/utils'; import updateIssueConfidentialMutation from '~/sidebar/components/confidential/mutations/update_issue_confidential.mutation.graphql'; -import updateMergeRequestLockMutation from '~/sidebar/components/lock/mutations/update_merge_request_lock.mutation.graphql'; import updateIssueLockMutation from '~/sidebar/components/lock/mutations/update_issue_lock.mutation.graphql'; +import updateMergeRequestLockMutation from '~/sidebar/components/lock/mutations/update_merge_request_lock.mutation.graphql'; +import mrWidgetEventHub from '~/vue_merge_request_widget/event_hub'; +import { resetStore } from '../helpers'; import { discussionMock, notesDataMock, @@ -22,7 +23,6 @@ import { individualNote, batchSuggestionsInfoMock, } from '../mock_data'; -import { resetStore } from '../helpers'; const TEST_ERROR_MESSAGE = 'Test error message'; jest.mock('~/flash'); diff --git a/spec/frontend/notes/stores/getters_spec.js b/spec/frontend/notes/stores/getters_spec.js index fd04d08b6a5..4ebfc679310 100644 --- a/spec/frontend/notes/stores/getters_spec.js +++ b/spec/frontend/notes/stores/getters_spec.js @@ -1,5 +1,5 @@ -import * as getters from '~/notes/stores/getters'; import { DESC } from '~/notes/constants'; +import * as getters from '~/notes/stores/getters'; import { notesDataMock, userDataMock, diff --git a/spec/frontend/notes/stores/mutation_spec.js b/spec/frontend/notes/stores/mutation_spec.js index c4301f63470..99e24f724f4 100644 --- a/spec/frontend/notes/stores/mutation_spec.js +++ b/spec/frontend/notes/stores/mutation_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import mutations from '~/notes/stores/mutations'; import { DISCUSSION_NOTE, ASC, DESC } from '~/notes/constants'; +import mutations from '~/notes/stores/mutations'; import { note, discussionMock, diff --git a/spec/frontend/notifications/components/custom_notifications_modal_spec.js b/spec/frontend/notifications/components/custom_notifications_modal_spec.js index 192fc194015..3e87f3107bd 100644 --- a/spec/frontend/notifications/components/custom_notifications_modal_spec.js +++ b/spec/frontend/notifications/components/custom_notifications_modal_spec.js @@ -1,7 +1,7 @@ +import { GlSprintf, GlModal, GlFormGroup, GlFormCheckbox, GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; -import { shallowMount } from '@vue/test-utils'; -import { GlSprintf, GlModal, GlFormGroup, GlFormCheckbox, GlLoadingIcon } from '@gitlab/ui'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import waitForPromises from 'helpers/wait_for_promises'; import httpStatus from '~/lib/utils/http_status'; diff --git a/spec/frontend/notifications/components/notifications_dropdown_spec.js b/spec/frontend/notifications/components/notifications_dropdown_spec.js index 37926f6f1bc..0673fb51a91 100644 --- a/spec/frontend/notifications/components/notifications_dropdown_spec.js +++ b/spec/frontend/notifications/components/notifications_dropdown_spec.js @@ -1,13 +1,13 @@ +import { GlButtonGroup, GlButton, GlDropdown, GlDropdownItem } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; -import { shallowMount } from '@vue/test-utils'; -import { GlButtonGroup, GlButton, GlDropdown, GlDropdownItem } from '@gitlab/ui'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import waitForPromises from 'helpers/wait_for_promises'; import httpStatus from '~/lib/utils/http_status'; +import CustomNotificationsModal from '~/notifications/components/custom_notifications_modal.vue'; import NotificationsDropdown from '~/notifications/components/notifications_dropdown.vue'; import NotificationsDropdownItem from '~/notifications/components/notifications_dropdown_item.vue'; -import CustomNotificationsModal from '~/notifications/components/custom_notifications_modal.vue'; const mockDropdownItems = ['global', 'watch', 'participating', 'mention', 'disabled']; const mockToastShow = jest.fn(); diff --git a/spec/frontend/operation_settings/components/metrics_settings_spec.js b/spec/frontend/operation_settings/components/metrics_settings_spec.js index 3216eece391..272e9b71f67 100644 --- a/spec/frontend/operation_settings/components/metrics_settings_spec.js +++ b/spec/frontend/operation_settings/components/metrics_settings_spec.js @@ -1,15 +1,15 @@ -import { mount, shallowMount } from '@vue/test-utils'; import { GlButton, GlLink, GlFormGroup, GlFormInput, GlFormSelect } from '@gitlab/ui'; +import { mount, shallowMount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; +import { refreshCurrentPage } from '~/lib/utils/url_utility'; +import { timezones } from '~/monitoring/format_date'; +import DashboardTimezone from '~/operation_settings/components/form_group/dashboard_timezone.vue'; +import ExternalDashboard from '~/operation_settings/components/form_group/external_dashboard.vue'; import MetricsSettings from '~/operation_settings/components/metrics_settings.vue'; -import ExternalDashboard from '~/operation_settings/components/form_group/external_dashboard.vue'; -import DashboardTimezone from '~/operation_settings/components/form_group/dashboard_timezone.vue'; -import { timezones } from '~/monitoring/format_date'; import store from '~/operation_settings/store'; -import axios from '~/lib/utils/axios_utils'; -import { refreshCurrentPage } from '~/lib/utils/url_utility'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; jest.mock('~/lib/utils/url_utility'); jest.mock('~/flash'); diff --git a/spec/frontend/operation_settings/store/mutations_spec.js b/spec/frontend/operation_settings/store/mutations_spec.js index 88eb66095ad..db6b54b503d 100644 --- a/spec/frontend/operation_settings/store/mutations_spec.js +++ b/spec/frontend/operation_settings/store/mutations_spec.js @@ -1,6 +1,6 @@ +import { timezones } from '~/monitoring/format_date'; import mutations from '~/operation_settings/store/mutations'; import createState from '~/operation_settings/store/state'; -import { timezones } from '~/monitoring/format_date'; describe('operation settings mutations', () => { let localState; diff --git a/spec/frontend/packages/details/components/additional_metadata_spec.js b/spec/frontend/packages/details/components/additional_metadata_spec.js index 8466a630ecb..b339aa84348 100644 --- a/spec/frontend/packages/details/components/additional_metadata_spec.js +++ b/spec/frontend/packages/details/components/additional_metadata_spec.js @@ -1,7 +1,7 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLink, GlSprintf } from '@gitlab/ui'; -import DetailsRow from '~/vue_shared/components/registry/details_row.vue'; +import { shallowMount } from '@vue/test-utils'; import component from '~/packages/details/components/additional_metadata.vue'; +import DetailsRow from '~/vue_shared/components/registry/details_row.vue'; import { mavenPackage, conanPackage, nugetPackage, npmPackage } from '../../mock_data'; diff --git a/spec/frontend/packages/details/components/app_spec.js b/spec/frontend/packages/details/components/app_spec.js index 97df117df0b..11dad7ba34d 100644 --- a/spec/frontend/packages/details/components/app_spec.js +++ b/spec/frontend/packages/details/components/app_spec.js @@ -1,22 +1,21 @@ -import Vuex from 'vuex'; -import { mount, createLocalVue } from '@vue/test-utils'; import { GlEmptyState, GlModal } from '@gitlab/ui'; +import { mount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import stubChildren from 'helpers/stub_children'; -import Tracking from '~/tracking'; -import * as getters from '~/packages/details/store/getters'; -import PackagesApp from '~/packages/details/components/app.vue'; -import PackageTitle from '~/packages/details/components/package_title.vue'; - -import * as SharedUtils from '~/packages/shared/utils'; -import { TrackingActions } from '~/packages/shared/constants'; -import PackagesListLoader from '~/packages/shared/components/packages_list_loader.vue'; -import PackageListRow from '~/packages/shared/components/package_list_row.vue'; -import DependencyRow from '~/packages/details/components/dependency_row.vue'; -import PackageHistory from '~/packages/details/components/package_history.vue'; import AdditionalMetadata from '~/packages/details/components/additional_metadata.vue'; +import PackagesApp from '~/packages/details/components/app.vue'; +import DependencyRow from '~/packages/details/components/dependency_row.vue'; import InstallationCommands from '~/packages/details/components/installation_commands.vue'; import PackageFiles from '~/packages/details/components/package_files.vue'; +import PackageHistory from '~/packages/details/components/package_history.vue'; +import PackageTitle from '~/packages/details/components/package_title.vue'; +import * as getters from '~/packages/details/store/getters'; +import PackageListRow from '~/packages/shared/components/package_list_row.vue'; +import PackagesListLoader from '~/packages/shared/components/packages_list_loader.vue'; +import { TrackingActions } from '~/packages/shared/constants'; +import * as SharedUtils from '~/packages/shared/utils'; +import Tracking from '~/tracking'; import { composerPackage, diff --git a/spec/frontend/packages/details/components/composer_installation_spec.js b/spec/frontend/packages/details/components/composer_installation_spec.js index b44609e8ae7..a1d30d0ed22 100644 --- a/spec/frontend/packages/details/components/composer_installation_spec.js +++ b/spec/frontend/packages/details/components/composer_installation_spec.js @@ -1,6 +1,6 @@ -import Vuex from 'vuex'; -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { GlSprintf, GlLink } from '@gitlab/ui'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import { registryUrl as composerHelpPath } from 'jest/packages/details/mock_data'; import { composerPackage as packageEntity } from 'jest/packages/mock_data'; import ComposerInstallation from '~/packages/details/components/composer_installation.vue'; diff --git a/spec/frontend/packages/details/components/conan_installation_spec.js b/spec/frontend/packages/details/components/conan_installation_spec.js index 92c1f8e7f4a..bf8a92a6350 100644 --- a/spec/frontend/packages/details/components/conan_installation_spec.js +++ b/spec/frontend/packages/details/components/conan_installation_spec.js @@ -1,5 +1,5 @@ -import Vuex from 'vuex'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import ConanInstallation from '~/packages/details/components/conan_installation.vue'; import CodeInstructions from '~/vue_shared/components/registry/code_instruction.vue'; import { conanPackage as packageEntity } from '../../mock_data'; diff --git a/spec/frontend/packages/details/components/installations_commands_spec.js b/spec/frontend/packages/details/components/installations_commands_spec.js index 60da34ebcd9..065bf503585 100644 --- a/spec/frontend/packages/details/components/installations_commands_spec.js +++ b/spec/frontend/packages/details/components/installations_commands_spec.js @@ -1,12 +1,12 @@ import { shallowMount } from '@vue/test-utils'; +import ComposerInstallation from '~/packages/details/components/composer_installation.vue'; +import ConanInstallation from '~/packages/details/components/conan_installation.vue'; import InstallationCommands from '~/packages/details/components/installation_commands.vue'; -import NpmInstallation from '~/packages/details/components/npm_installation.vue'; import MavenInstallation from '~/packages/details/components/maven_installation.vue'; -import ConanInstallation from '~/packages/details/components/conan_installation.vue'; +import NpmInstallation from '~/packages/details/components/npm_installation.vue'; import NugetInstallation from '~/packages/details/components/nuget_installation.vue'; import PypiInstallation from '~/packages/details/components/pypi_installation.vue'; -import ComposerInstallation from '~/packages/details/components/composer_installation.vue'; import { conanPackage, diff --git a/spec/frontend/packages/details/components/maven_installation_spec.js b/spec/frontend/packages/details/components/maven_installation_spec.js index ff62969e709..dfeb6002186 100644 --- a/spec/frontend/packages/details/components/maven_installation_spec.js +++ b/spec/frontend/packages/details/components/maven_installation_spec.js @@ -1,10 +1,10 @@ -import Vuex from 'vuex'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import { registryUrl as mavenPath } from 'jest/packages/details/mock_data'; import { mavenPackage as packageEntity } from 'jest/packages/mock_data'; import MavenInstallation from '~/packages/details/components/maven_installation.vue'; -import CodeInstructions from '~/vue_shared/components/registry/code_instruction.vue'; import { TrackingActions } from '~/packages/details/constants'; +import CodeInstructions from '~/vue_shared/components/registry/code_instruction.vue'; const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/spec/frontend/packages/details/components/npm_installation_spec.js b/spec/frontend/packages/details/components/npm_installation_spec.js index dd6e62185a9..df820e7e948 100644 --- a/spec/frontend/packages/details/components/npm_installation_spec.js +++ b/spec/frontend/packages/details/components/npm_installation_spec.js @@ -1,11 +1,11 @@ -import Vuex from 'vuex'; import { shallowMount, createLocalVue } from '@vue/test-utils'; -import { npmPackage as packageEntity } from 'jest/packages/mock_data'; +import Vuex from 'vuex'; import { registryUrl as nugetPath } from 'jest/packages/details/mock_data'; +import { npmPackage as packageEntity } from 'jest/packages/mock_data'; import NpmInstallation from '~/packages/details/components/npm_installation.vue'; -import CodeInstructions from '~/vue_shared/components/registry/code_instruction.vue'; import { TrackingActions } from '~/packages/details/constants'; import { npmInstallationCommand, npmSetupCommand } from '~/packages/details/store/getters'; +import CodeInstructions from '~/vue_shared/components/registry/code_instruction.vue'; const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/spec/frontend/packages/details/components/nuget_installation_spec.js b/spec/frontend/packages/details/components/nuget_installation_spec.js index 685d0808dd9..100e369751c 100644 --- a/spec/frontend/packages/details/components/nuget_installation_spec.js +++ b/spec/frontend/packages/details/components/nuget_installation_spec.js @@ -1,10 +1,10 @@ -import Vuex from 'vuex'; import { shallowMount, createLocalVue } from '@vue/test-utils'; -import { nugetPackage as packageEntity } from 'jest/packages/mock_data'; +import Vuex from 'vuex'; import { registryUrl as nugetPath } from 'jest/packages/details/mock_data'; +import { nugetPackage as packageEntity } from 'jest/packages/mock_data'; import NugetInstallation from '~/packages/details/components/nuget_installation.vue'; -import CodeInstructions from '~/vue_shared/components/registry/code_instruction.vue'; import { TrackingActions } from '~/packages/details/constants'; +import CodeInstructions from '~/vue_shared/components/registry/code_instruction.vue'; const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/spec/frontend/packages/details/components/package_files_spec.js b/spec/frontend/packages/details/components/package_files_spec.js index 9bcf6ed9235..b4e62bac8a3 100644 --- a/spec/frontend/packages/details/components/package_files_spec.js +++ b/spec/frontend/packages/details/components/package_files_spec.js @@ -1,8 +1,8 @@ import { mount } from '@vue/test-utils'; import stubChildren from 'helpers/stub_children'; -import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; -import FileIcon from '~/vue_shared/components/file_icon.vue'; import component from '~/packages/details/components/package_files.vue'; +import FileIcon from '~/vue_shared/components/file_icon.vue'; +import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import { npmFiles, mavenFiles } from '../../mock_data'; diff --git a/spec/frontend/packages/details/components/package_history_spec.js b/spec/frontend/packages/details/components/package_history_spec.js index 5a6b386e2ca..244805a9c82 100644 --- a/spec/frontend/packages/details/components/package_history_spec.js +++ b/spec/frontend/packages/details/components/package_history_spec.js @@ -1,10 +1,10 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLink, GlSprintf } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { stubComponent } from 'helpers/stub_component'; -import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; -import HistoryItem from '~/vue_shared/components/registry/history_item.vue'; -import { HISTORY_PIPELINES_LIMIT } from '~/packages/details/constants'; import component from '~/packages/details/components/package_history.vue'; +import { HISTORY_PIPELINES_LIMIT } from '~/packages/details/constants'; +import HistoryItem from '~/vue_shared/components/registry/history_item.vue'; +import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import { mavenPackage, mockPipelineInfo } from '../../mock_data'; diff --git a/spec/frontend/packages/details/components/package_title_spec.js b/spec/frontend/packages/details/components/package_title_spec.js index 61c6e824ab7..512cec85b40 100644 --- a/spec/frontend/packages/details/components/package_title_spec.js +++ b/spec/frontend/packages/details/components/package_title_spec.js @@ -1,6 +1,6 @@ -import Vuex from 'vuex'; -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { GlBreakpointInstance } from '@gitlab/ui/dist/utils'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import PackageTitle from '~/packages/details/components/package_title.vue'; import PackageTags from '~/packages/shared/components/package_tags.vue'; import TitleArea from '~/vue_shared/components/registry/title_area.vue'; diff --git a/spec/frontend/packages/details/components/pypi_installation_spec.js b/spec/frontend/packages/details/components/pypi_installation_spec.js index da30b4ba565..a6ccba71554 100644 --- a/spec/frontend/packages/details/components/pypi_installation_spec.js +++ b/spec/frontend/packages/details/components/pypi_installation_spec.js @@ -1,5 +1,5 @@ -import Vuex from 'vuex'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import { pypiPackage as packageEntity } from 'jest/packages/mock_data'; import PypiInstallation from '~/packages/details/components/pypi_installation.vue'; diff --git a/spec/frontend/packages/details/store/actions_spec.js b/spec/frontend/packages/details/store/actions_spec.js index e823a00ebc4..d11ee548b72 100644 --- a/spec/frontend/packages/details/store/actions_spec.js +++ b/spec/frontend/packages/details/store/actions_spec.js @@ -1,9 +1,9 @@ import testAction from 'helpers/vuex_action_helper'; import Api from '~/api'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import { FETCH_PACKAGE_VERSIONS_ERROR } from '~/packages/details/constants'; import { fetchPackageVersions, deletePackage } from '~/packages/details/store/actions'; import * as types from '~/packages/details/store/mutation_types'; -import { FETCH_PACKAGE_VERSIONS_ERROR } from '~/packages/details/constants'; import { DELETE_PACKAGE_ERROR_MESSAGE } from '~/packages/shared/constants'; import { npmPackage as packageEntity } from '../../mock_data'; diff --git a/spec/frontend/packages/details/store/getters_spec.js b/spec/frontend/packages/details/store/getters_spec.js index e5b130cd958..07c120f57f7 100644 --- a/spec/frontend/packages/details/store/getters_spec.js +++ b/spec/frontend/packages/details/store/getters_spec.js @@ -1,3 +1,4 @@ +import { NpmManager } from '~/packages/details/constants'; import { conanInstallationCommand, conanSetupCommand, @@ -17,7 +18,6 @@ import { composerPackageInclude, groupExists, } from '~/packages/details/store/getters'; -import { NpmManager } from '~/packages/details/constants'; import { conanPackage, npmPackage, diff --git a/spec/frontend/packages/details/store/mutations_spec.js b/spec/frontend/packages/details/store/mutations_spec.js index 501a56dcdde..6bc5fb7241f 100644 --- a/spec/frontend/packages/details/store/mutations_spec.js +++ b/spec/frontend/packages/details/store/mutations_spec.js @@ -1,5 +1,5 @@ -import mutations from '~/packages/details/store/mutations'; import * as types from '~/packages/details/store/mutation_types'; +import mutations from '~/packages/details/store/mutations'; import { npmPackage as packageEntity } from '../../mock_data'; describe('Mutations package details Store', () => { diff --git a/spec/frontend/packages/list/components/packages_list_app_spec.js b/spec/frontend/packages/list/components/packages_list_app_spec.js index b3094b81c85..6862d23c4ff 100644 --- a/spec/frontend/packages/list/components/packages_list_app_spec.js +++ b/spec/frontend/packages/list/components/packages_list_app_spec.js @@ -1,12 +1,12 @@ -import Vuex from 'vuex'; -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { GlEmptyState, GlSprintf, GlLink } from '@gitlab/ui'; -import * as commonUtils from '~/lib/utils/common_utils'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import createFlash from '~/flash'; -import PackageListApp from '~/packages/list/components/packages_list_app.vue'; +import * as commonUtils from '~/lib/utils/common_utils'; import PackageSearch from '~/packages/list/components/package_search.vue'; -import { SHOW_DELETE_SUCCESS_ALERT } from '~/packages/shared/constants'; +import PackageListApp from '~/packages/list/components/packages_list_app.vue'; import { DELETE_PACKAGE_SUCCESS_MESSAGE } from '~/packages/list/constants'; +import { SHOW_DELETE_SUCCESS_ALERT } from '~/packages/shared/constants'; jest.mock('~/lib/utils/common_utils'); jest.mock('~/flash'); diff --git a/spec/frontend/packages/list/components/packages_list_spec.js b/spec/frontend/packages/list/components/packages_list_spec.js index f981cc2851a..b1478a5e6dc 100644 --- a/spec/frontend/packages/list/components/packages_list_spec.js +++ b/spec/frontend/packages/list/components/packages_list_spec.js @@ -1,14 +1,14 @@ -import Vuex from 'vuex'; -import { last } from 'lodash'; import { GlTable, GlPagination, GlModal } from '@gitlab/ui'; import { mount, createLocalVue } from '@vue/test-utils'; +import { last } from 'lodash'; +import Vuex from 'vuex'; import stubChildren from 'helpers/stub_children'; -import Tracking from '~/tracking'; import PackagesList from '~/packages/list/components/packages_list.vue'; -import PackagesListLoader from '~/packages/shared/components/packages_list_loader.vue'; import PackagesListRow from '~/packages/shared/components/package_list_row.vue'; -import * as SharedUtils from '~/packages/shared/utils'; +import PackagesListLoader from '~/packages/shared/components/packages_list_loader.vue'; import { TrackingActions } from '~/packages/shared/constants'; +import * as SharedUtils from '~/packages/shared/utils'; +import Tracking from '~/tracking'; import { packageList } from '../../mock_data'; const localVue = createLocalVue(); diff --git a/spec/frontend/packages/list/components/packages_search_spec.js b/spec/frontend/packages/list/components/packages_search_spec.js index 5a1b0ce2c80..9b62dde8d2b 100644 --- a/spec/frontend/packages/list/components/packages_search_spec.js +++ b/spec/frontend/packages/list/components/packages_search_spec.js @@ -1,9 +1,9 @@ -import Vuex from 'vuex'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import component from '~/packages/list/components/package_search.vue'; -import RegistrySearch from '~/vue_shared/components/registry/registry_search.vue'; import PackageTypeToken from '~/packages/list/components/tokens/package_type_token.vue'; import getTableHeaders from '~/packages/list/utils'; +import RegistrySearch from '~/vue_shared/components/registry/registry_search.vue'; const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/spec/frontend/packages/list/components/packages_title_spec.js b/spec/frontend/packages/list/components/packages_title_spec.js index 5e9ebd8ecb0..3716e8daa7c 100644 --- a/spec/frontend/packages/list/components/packages_title_spec.js +++ b/spec/frontend/packages/list/components/packages_title_spec.js @@ -1,8 +1,8 @@ import { shallowMount } from '@vue/test-utils'; +import { LIST_INTRO_TEXT, LIST_TITLE_TEXT } from '~/packages/list//constants'; import PackageTitle from '~/packages/list/components/package_title.vue'; -import TitleArea from '~/vue_shared/components/registry/title_area.vue'; import MetadataItem from '~/vue_shared/components/registry/metadata_item.vue'; -import { LIST_INTRO_TEXT, LIST_TITLE_TEXT } from '~/packages/list//constants'; +import TitleArea from '~/vue_shared/components/registry/title_area.vue'; describe('PackageTitle', () => { let wrapper; diff --git a/spec/frontend/packages/list/components/tokens/package_type_token_spec.js b/spec/frontend/packages/list/components/tokens/package_type_token_spec.js index a654f431266..b0cbe34f0b9 100644 --- a/spec/frontend/packages/list/components/tokens/package_type_token_spec.js +++ b/spec/frontend/packages/list/components/tokens/package_type_token_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlFilteredSearchToken, GlFilteredSearchSuggestion } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import component from '~/packages/list/components/tokens/package_type_token.vue'; import { PACKAGE_TYPES } from '~/packages/list/constants'; diff --git a/spec/frontend/packages/list/stores/actions_spec.js b/spec/frontend/packages/list/stores/actions_spec.js index d33851e6ab3..b5b0177eb4e 100644 --- a/spec/frontend/packages/list/stores/actions_spec.js +++ b/spec/frontend/packages/list/stores/actions_spec.js @@ -3,9 +3,9 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; import Api from '~/api'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import { MISSING_DELETE_PATH_ERROR } from '~/packages/list/constants'; import * as actions from '~/packages/list/stores/actions'; import * as types from '~/packages/list/stores/mutation_types'; -import { MISSING_DELETE_PATH_ERROR } from '~/packages/list/constants'; import { DELETE_PACKAGE_ERROR_MESSAGE } from '~/packages/shared/constants'; jest.mock('~/flash.js'); diff --git a/spec/frontend/packages/list/stores/mutations_spec.js b/spec/frontend/packages/list/stores/mutations_spec.js index 743de595eb5..2ddf3a1da33 100644 --- a/spec/frontend/packages/list/stores/mutations_spec.js +++ b/spec/frontend/packages/list/stores/mutations_spec.js @@ -1,7 +1,7 @@ -import mutations from '~/packages/list/stores/mutations'; +import * as commonUtils from '~/lib/utils/common_utils'; import * as types from '~/packages/list/stores/mutation_types'; +import mutations from '~/packages/list/stores/mutations'; import createState from '~/packages/list/stores/state'; -import * as commonUtils from '~/lib/utils/common_utils'; import { npmPackage, mavenPackage } from '../../mock_data'; describe('Mutations Registry Store', () => { diff --git a/spec/frontend/packages/shared/components/package_list_row_spec.js b/spec/frontend/packages/shared/components/package_list_row_spec.js index 0d0ea4e2122..bd122167273 100644 --- a/spec/frontend/packages/shared/components/package_list_row_spec.js +++ b/spec/frontend/packages/shared/components/package_list_row_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; import PackagesListRow from '~/packages/shared/components/package_list_row.vue'; -import PackageTags from '~/packages/shared/components/package_tags.vue'; import PackagePath from '~/packages/shared/components/package_path.vue'; +import PackageTags from '~/packages/shared/components/package_tags.vue'; import ListItem from '~/vue_shared/components/registry/list_item.vue'; import { packageList } from '../../mock_data'; diff --git a/spec/frontend/packages/shared/utils_spec.js b/spec/frontend/packages/shared/utils_spec.js index 590e3814bee..506f37f8895 100644 --- a/spec/frontend/packages/shared/utils_spec.js +++ b/spec/frontend/packages/shared/utils_spec.js @@ -1,10 +1,10 @@ +import { PackageType, TrackingCategories } from '~/packages/shared/constants'; import { packageTypeToTrackCategory, beautifyPath, getPackageTypeLabel, getCommitLink, } from '~/packages/shared/utils'; -import { PackageType, TrackingCategories } from '~/packages/shared/constants'; import { packageList } from '../mock_data'; describe('Packages shared utils', () => { diff --git a/spec/frontend/packages_and_registries/settings/group/components/group_settings_app_spec.js b/spec/frontend/packages_and_registries/settings/group/components/group_settings_app_spec.js index 7790232236a..be0d7114e6e 100644 --- a/spec/frontend/packages_and_registries/settings/group/components/group_settings_app_spec.js +++ b/spec/frontend/packages_and_registries/settings/group/components/group_settings_app_spec.js @@ -1,9 +1,8 @@ -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { GlSprintf, GlLink, GlAlert } from '@gitlab/ui'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; import VueApollo from 'vue-apollo'; import createMockApollo from 'helpers/mock_apollo_helper'; import waitForPromises from 'helpers/wait_for_promises'; -import SettingsBlock from '~/vue_shared/components/settings/settings_block.vue'; import component from '~/packages_and_registries/settings/group/components/group_settings_app.vue'; import MavenSettings from '~/packages_and_registries/settings/group/components/maven_settings.vue'; import { @@ -14,8 +13,9 @@ import { SUCCESS_UPDATING_SETTINGS, } from '~/packages_and_registries/settings/group/constants'; -import getGroupPackagesSettingsQuery from '~/packages_and_registries/settings/group/graphql/queries/get_group_packages_settings.query.graphql'; import updateNamespacePackageSettings from '~/packages_and_registries/settings/group/graphql/mutations/update_group_packages_settings.mutation.graphql'; +import getGroupPackagesSettingsQuery from '~/packages_and_registries/settings/group/graphql/queries/get_group_packages_settings.query.graphql'; +import SettingsBlock from '~/vue_shared/components/settings/settings_block.vue'; import { groupPackageSettingsMock, groupPackageSettingsMutationMock, diff --git a/spec/frontend/packages_and_registries/settings/group/components/maven_settings_spec.js b/spec/frontend/packages_and_registries/settings/group/components/maven_settings_spec.js index e101b9a58f6..2433c50ff24 100644 --- a/spec/frontend/packages_and_registries/settings/group/components/maven_settings_spec.js +++ b/spec/frontend/packages_and_registries/settings/group/components/maven_settings_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlSprintf, GlToggle, GlFormGroup, GlFormInput } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import component from '~/packages_and_registries/settings/group/components/maven_settings.vue'; import { diff --git a/spec/frontend/packages_and_registries/settings/group/graphl/utils/cache_update_spec.js b/spec/frontend/packages_and_registries/settings/group/graphl/utils/cache_update_spec.js index b9e0fde60f5..e1a46f97318 100644 --- a/spec/frontend/packages_and_registries/settings/group/graphl/utils/cache_update_spec.js +++ b/spec/frontend/packages_and_registries/settings/group/graphl/utils/cache_update_spec.js @@ -1,5 +1,5 @@ -import { updateGroupPackageSettings } from '~/packages_and_registries/settings/group/graphql/utils/cache_update'; import expirationPolicyQuery from '~/packages_and_registries/settings/group/graphql/queries/get_group_packages_settings.query.graphql'; +import { updateGroupPackageSettings } from '~/packages_and_registries/settings/group/graphql/utils/cache_update'; describe('Package and Registries settings group cache updates', () => { let client; diff --git a/spec/frontend/pager_spec.js b/spec/frontend/pager_spec.js index c8a129e38e7..ad4222e7cb2 100644 --- a/spec/frontend/pager_spec.js +++ b/spec/frontend/pager_spec.js @@ -1,9 +1,9 @@ -import $ from 'jquery'; import MockAdapter from 'axios-mock-adapter'; +import $ from 'jquery'; import { TEST_HOST } from 'helpers/test_constants'; import axios from '~/lib/utils/axios_utils'; -import Pager from '~/pager'; import { removeParams } from '~/lib/utils/url_utility'; +import Pager from '~/pager'; jest.mock('~/lib/utils/url_utility', () => ({ removeParams: jest.fn().mockName('removeParams'), diff --git a/spec/frontend/pages/admin/jobs/index/components/stop_jobs_modal_spec.js b/spec/frontend/pages/admin/jobs/index/components/stop_jobs_modal_spec.js index 81750b4827f..52648d3ce00 100644 --- a/spec/frontend/pages/admin/jobs/index/components/stop_jobs_modal_spec.js +++ b/spec/frontend/pages/admin/jobs/index/components/stop_jobs_modal_spec.js @@ -1,8 +1,8 @@ import Vue from 'vue'; -import mountComponent from 'helpers/vue_mount_component_helper'; import { TEST_HOST } from 'helpers/test_constants'; -import { redirectTo } from '~/lib/utils/url_utility'; +import mountComponent from 'helpers/vue_mount_component_helper'; import axios from '~/lib/utils/axios_utils'; +import { redirectTo } from '~/lib/utils/url_utility'; import stopJobsModal from '~/pages/admin/jobs/index/components/stop_jobs_modal.vue'; jest.mock('~/lib/utils/url_utility', () => ({ diff --git a/spec/frontend/pages/admin/users/components/delete_user_modal_spec.js b/spec/frontend/pages/admin/users/components/delete_user_modal_spec.js index d203a8ea0e0..c7293b00adf 100644 --- a/spec/frontend/pages/admin/users/components/delete_user_modal_spec.js +++ b/spec/frontend/pages/admin/users/components/delete_user_modal_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton, GlFormInput } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import DeleteUserModal from '~/pages/admin/users/components/delete_user_modal.vue'; import ModalStub from './stubs/modal_stub'; diff --git a/spec/frontend/pages/dashboard/projects/index/components/customize_homepage_banner_spec.js b/spec/frontend/pages/dashboard/projects/index/components/customize_homepage_banner_spec.js index fbe2274c40d..63c1260560b 100644 --- a/spec/frontend/pages/dashboard/projects/index/components/customize_homepage_banner_spec.js +++ b/spec/frontend/pages/dashboard/projects/index/components/customize_homepage_banner_spec.js @@ -1,9 +1,9 @@ -import { shallowMount } from '@vue/test-utils'; import { GlBanner } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import { mockTracking, unmockTracking, triggerEvent } from 'helpers/tracking_helper'; -import CustomizeHomepageBanner from '~/pages/dashboard/projects/index/components/customize_homepage_banner.vue'; import axios from '~/lib/utils/axios_utils'; +import CustomizeHomepageBanner from '~/pages/dashboard/projects/index/components/customize_homepage_banner.vue'; const svgPath = '/illustrations/background'; const provide = { diff --git a/spec/frontend/pages/dashboard/todos/index/todos_spec.js b/spec/frontend/pages/dashboard/todos/index/todos_spec.js index 5018b0c4f73..5ff1b961fc9 100644 --- a/spec/frontend/pages/dashboard/todos/index/todos_spec.js +++ b/spec/frontend/pages/dashboard/todos/index/todos_spec.js @@ -1,5 +1,5 @@ -import $ from 'jquery'; import MockAdapter from 'axios-mock-adapter'; +import $ from 'jquery'; import Todos from '~/pages/dashboard/todos/index/todos'; import '~/lib/utils/common_utils'; import axios from '~/lib/utils/axios_utils'; diff --git a/spec/frontend/pages/import/bitbucket_server/components/bitbucket_server_status_table_spec.js b/spec/frontend/pages/import/bitbucket_server/components/bitbucket_server_status_table_spec.js index a91fc5abe09..7a8a249cb2a 100644 --- a/spec/frontend/pages/import/bitbucket_server/components/bitbucket_server_status_table_spec.js +++ b/spec/frontend/pages/import/bitbucket_server/components/bitbucket_server_status_table_spec.js @@ -1,8 +1,8 @@ +import { GlButton } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; -import { GlButton } from '@gitlab/ui'; -import BitbucketServerStatusTable from '~/pages/import/bitbucket_server/status/components/bitbucket_server_status_table.vue'; import BitbucketStatusTable from '~/import_entities/import_projects/components/bitbucket_status_table.vue'; +import BitbucketServerStatusTable from '~/pages/import/bitbucket_server/status/components/bitbucket_server_status_table.vue'; const BitbucketStatusTableStub = { name: 'BitbucketStatusTable', diff --git a/spec/frontend/pages/labels/components/promote_label_modal_spec.js b/spec/frontend/pages/labels/components/promote_label_modal_spec.js index 19807313c77..4d5d1f98b59 100644 --- a/spec/frontend/pages/labels/components/promote_label_modal_spec.js +++ b/spec/frontend/pages/labels/components/promote_label_modal_spec.js @@ -1,9 +1,9 @@ import Vue from 'vue'; -import mountComponent from 'helpers/vue_mount_component_helper'; import { TEST_HOST } from 'helpers/test_constants'; +import mountComponent from 'helpers/vue_mount_component_helper'; +import axios from '~/lib/utils/axios_utils'; import promoteLabelModal from '~/pages/projects/labels/components/promote_label_modal.vue'; import eventHub from '~/pages/projects/labels/event_hub'; -import axios from '~/lib/utils/axios_utils'; describe('Promote label modal', () => { let vm; diff --git a/spec/frontend/pages/milestones/shared/components/delete_milestone_modal_spec.js b/spec/frontend/pages/milestones/shared/components/delete_milestone_modal_spec.js index 7bb637356c2..1fbec0d996d 100644 --- a/spec/frontend/pages/milestones/shared/components/delete_milestone_modal_spec.js +++ b/spec/frontend/pages/milestones/shared/components/delete_milestone_modal_spec.js @@ -1,8 +1,8 @@ import Vue from 'vue'; -import mountComponent from 'helpers/vue_mount_component_helper'; import { TEST_HOST } from 'helpers/test_constants'; -import { redirectTo } from '~/lib/utils/url_utility'; +import mountComponent from 'helpers/vue_mount_component_helper'; import axios from '~/lib/utils/axios_utils'; +import { redirectTo } from '~/lib/utils/url_utility'; import deleteMilestoneModal from '~/pages/milestones/shared/components/delete_milestone_modal.vue'; import eventHub from '~/pages/milestones/shared/event_hub'; diff --git a/spec/frontend/pages/milestones/shared/components/promote_milestone_modal_spec.js b/spec/frontend/pages/milestones/shared/components/promote_milestone_modal_spec.js index 7cd94deb3da..d22e0474e06 100644 --- a/spec/frontend/pages/milestones/shared/components/promote_milestone_modal_spec.js +++ b/spec/frontend/pages/milestones/shared/components/promote_milestone_modal_spec.js @@ -1,12 +1,12 @@ import { GlModal } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; -import { TEST_HOST } from 'helpers/test_constants'; import { setHTMLFixture } from 'helpers/fixtures'; +import { TEST_HOST } from 'helpers/test_constants'; import waitForPromises from 'helpers/wait_for_promises'; -import PromoteMilestoneModal from '~/pages/milestones/shared/components/promote_milestone_modal.vue'; +import * as flash from '~/flash'; import axios from '~/lib/utils/axios_utils'; import * as urlUtils from '~/lib/utils/url_utility'; -import * as flash from '~/flash'; +import PromoteMilestoneModal from '~/pages/milestones/shared/components/promote_milestone_modal.vue'; jest.mock('~/lib/utils/url_utility'); jest.mock('~/flash'); diff --git a/spec/frontend/pages/projects/forks/new/components/fork_groups_list_item_spec.js b/spec/frontend/pages/projects/forks/new/components/fork_groups_list_item_spec.js index fbf51cd8852..b5425fa6f2e 100644 --- a/spec/frontend/pages/projects/forks/new/components/fork_groups_list_item_spec.js +++ b/spec/frontend/pages/projects/forks/new/components/fork_groups_list_item_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlBadge, GlButton, GlLink } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import ForkGroupsListItem from '~/pages/projects/forks/new/components/fork_groups_list_item.vue'; describe('Fork groups list item component', () => { diff --git a/spec/frontend/pages/projects/forks/new/components/fork_groups_list_spec.js b/spec/frontend/pages/projects/forks/new/components/fork_groups_list_spec.js index 244f560a87a..e7ac837a4c8 100644 --- a/spec/frontend/pages/projects/forks/new/components/fork_groups_list_spec.js +++ b/spec/frontend/pages/projects/forks/new/components/fork_groups_list_spec.js @@ -1,10 +1,10 @@ -import AxiosMockAdapter from 'axios-mock-adapter'; -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon, GlSearchBoxByType } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; +import AxiosMockAdapter from 'axios-mock-adapter'; import { nextTick } from 'vue'; import waitForPromises from 'helpers/wait_for_promises'; -import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import ForkGroupsList from '~/pages/projects/forks/new/components/fork_groups_list.vue'; import ForkGroupsListItem from '~/pages/projects/forks/new/components/fork_groups_list_item.vue'; diff --git a/spec/frontend/pages/projects/graphs/code_coverage_spec.js b/spec/frontend/pages/projects/graphs/code_coverage_spec.js index c9420285bad..1f9029b40c7 100644 --- a/spec/frontend/pages/projects/graphs/code_coverage_spec.js +++ b/spec/frontend/pages/projects/graphs/code_coverage_spec.js @@ -1,12 +1,12 @@ -import MockAdapter from 'axios-mock-adapter'; -import { shallowMount } from '@vue/test-utils'; import { GlAlert, GlDropdown, GlDropdownItem } from '@gitlab/ui'; import { GlAreaChart } from '@gitlab/ui/dist/charts'; +import { shallowMount } from '@vue/test-utils'; +import MockAdapter from 'axios-mock-adapter'; import waitForPromises from 'helpers/wait_for_promises'; import axios from '~/lib/utils/axios_utils'; -import CodeCoverage from '~/pages/projects/graphs/components/code_coverage.vue'; import httpStatusCodes from '~/lib/utils/http_status'; +import CodeCoverage from '~/pages/projects/graphs/components/code_coverage.vue'; import { codeCoverageMockData, sortedDataByDates } from './mock_data'; describe('Code Coverage', () => { diff --git a/spec/frontend/pages/projects/pipeline_schedules/shared/components/pipeline_schedule_callout_spec.js b/spec/frontend/pages/projects/pipeline_schedules/shared/components/pipeline_schedule_callout_spec.js index cfe54016410..5fed9fcaad2 100644 --- a/spec/frontend/pages/projects/pipeline_schedules/shared/components/pipeline_schedule_callout_spec.js +++ b/spec/frontend/pages/projects/pipeline_schedules/shared/components/pipeline_schedule_callout_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import Cookies from 'js-cookie'; import PipelineSchedulesCallout from '~/pages/projects/pipeline_schedules/shared/components/pipeline_schedules_callout.vue'; diff --git a/spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js b/spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js index 1c89fbfa505..d7c754fd3cc 100644 --- a/spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js +++ b/spec/frontend/pages/projects/shared/permissions/components/settings_panel_spec.js @@ -1,12 +1,12 @@ import { GlToggle } from '@gitlab/ui'; import { shallowMount, mount } from '@vue/test-utils'; +import projectFeatureSetting from '~/pages/projects/shared/permissions/components/project_feature_setting.vue'; import settingsPanel from '~/pages/projects/shared/permissions/components/settings_panel.vue'; import { featureAccessLevel, visibilityLevelDescriptions, visibilityOptions, } from '~/pages/projects/shared/permissions/constants'; -import projectFeatureSetting from '~/pages/projects/shared/permissions/components/project_feature_setting.vue'; const defaultProps = { currentSettings: { diff --git a/spec/frontend/performance_bar/components/detailed_metric_spec.js b/spec/frontend/performance_bar/components/detailed_metric_spec.js index 754ffcc12e3..6ddd047d549 100644 --- a/spec/frontend/performance_bar/components/detailed_metric_spec.js +++ b/spec/frontend/performance_bar/components/detailed_metric_spec.js @@ -1,5 +1,5 @@ -import { nextTick } from 'vue'; import { shallowMount } from '@vue/test-utils'; +import { nextTick } from 'vue'; import { trimText } from 'helpers/text_helper'; import DetailedMetric from '~/performance_bar/components/detailed_metric.vue'; import RequestWarning from '~/performance_bar/components/request_warning.vue'; diff --git a/spec/frontend/persistent_user_callout_spec.js b/spec/frontend/persistent_user_callout_spec.js index 578fd8d836a..403142d7ff7 100644 --- a/spec/frontend/persistent_user_callout_spec.js +++ b/spec/frontend/persistent_user_callout_spec.js @@ -1,8 +1,8 @@ import MockAdapter from 'axios-mock-adapter'; import waitForPromises from 'helpers/wait_for_promises'; +import { deprecatedCreateFlash as Flash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import PersistentUserCallout from '~/persistent_user_callout'; -import { deprecatedCreateFlash as Flash } from '~/flash'; jest.mock('~/flash'); diff --git a/spec/frontend/pipeline_editor/components/commit/commit_form_spec.js b/spec/frontend/pipeline_editor/components/commit/commit_form_spec.js index 76c56bd2815..5dae77a4626 100644 --- a/spec/frontend/pipeline_editor/components/commit/commit_form_spec.js +++ b/spec/frontend/pipeline_editor/components/commit/commit_form_spec.js @@ -1,5 +1,5 @@ -import { shallowMount, mount } from '@vue/test-utils'; import { GlFormInput, GlFormTextarea } from '@gitlab/ui'; +import { shallowMount, mount } from '@vue/test-utils'; import CommitForm from '~/pipeline_editor/components/commit/commit_form.vue'; diff --git a/spec/frontend/pipeline_editor/components/commit/commit_section_spec.js b/spec/frontend/pipeline_editor/components/commit/commit_section_spec.js index 269c0cb525e..b87ff6ec0de 100644 --- a/spec/frontend/pipeline_editor/components/commit/commit_section_spec.js +++ b/spec/frontend/pipeline_editor/components/commit/commit_section_spec.js @@ -1,11 +1,11 @@ -import { mount } from '@vue/test-utils'; import { GlFormTextarea, GlFormInput, GlLoadingIcon } from '@gitlab/ui'; -import CommitSection from '~/pipeline_editor/components/commit/commit_section.vue'; -import CommitForm from '~/pipeline_editor/components/commit/commit_form.vue'; +import { mount } from '@vue/test-utils'; import { objectToQuery, redirectTo } from '~/lib/utils/url_utility'; +import CommitForm from '~/pipeline_editor/components/commit/commit_form.vue'; +import CommitSection from '~/pipeline_editor/components/commit/commit_section.vue'; +import { COMMIT_SUCCESS } from '~/pipeline_editor/constants'; import commitCreate from '~/pipeline_editor/graphql/mutations/commit_ci_file.mutation.graphql'; -import { COMMIT_SUCCESS } from '~/pipeline_editor/constants'; import { mockCiConfigPath, mockCiYml, diff --git a/spec/frontend/pipeline_editor/components/editor/ci_config_merged_preview_spec.js b/spec/frontend/pipeline_editor/components/editor/ci_config_merged_preview_spec.js index 8ec2b6d8bef..866069f337b 100644 --- a/spec/frontend/pipeline_editor/components/editor/ci_config_merged_preview_spec.js +++ b/spec/frontend/pipeline_editor/components/editor/ci_config_merged_preview_spec.js @@ -1,10 +1,10 @@ -import { shallowMount } from '@vue/test-utils'; import { GlAlert, GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { EDITOR_READY_EVENT } from '~/editor/constants'; -import { INVALID_CI_CONFIG } from '~/pipelines/constants'; import CiConfigMergedPreview from '~/pipeline_editor/components/editor/ci_config_merged_preview.vue'; import { CI_CONFIG_STATUS_INVALID } from '~/pipeline_editor/constants'; +import { INVALID_CI_CONFIG } from '~/pipelines/constants'; import { mockLintResponse, mockCiConfigPath } from '../../mock_data'; describe('Text editor component', () => { diff --git a/spec/frontend/pipeline_editor/components/header/validation_segment_spec.js b/spec/frontend/pipeline_editor/components/header/validation_segment_spec.js index c5b88e4b904..cf1d89e1d7c 100644 --- a/spec/frontend/pipeline_editor/components/header/validation_segment_spec.js +++ b/spec/frontend/pipeline_editor/components/header/validation_segment_spec.js @@ -1,6 +1,6 @@ -import { escape } from 'lodash'; -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; +import { escape } from 'lodash'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import { sprintf } from '~/locale'; import ValidationSegment, { diff --git a/spec/frontend/pipeline_editor/components/lint/ci_lint_results_spec.js b/spec/frontend/pipeline_editor/components/lint/ci_lint_results_spec.js index 5e9471376bd..6775433deb9 100644 --- a/spec/frontend/pipeline_editor/components/lint/ci_lint_results_spec.js +++ b/spec/frontend/pipeline_editor/components/lint/ci_lint_results_spec.js @@ -1,7 +1,7 @@ -import { shallowMount, mount } from '@vue/test-utils'; import { GlTable, GlLink } from '@gitlab/ui'; -import CiLintResults from '~/pipeline_editor/components/lint/ci_lint_results.vue'; +import { shallowMount, mount } from '@vue/test-utils'; import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; +import CiLintResults from '~/pipeline_editor/components/lint/ci_lint_results.vue'; import { mockJobs, mockErrors, mockWarnings } from '../../mock_data'; describe('CI Lint Results', () => { diff --git a/spec/frontend/pipeline_editor/components/lint/ci_lint_spec.js b/spec/frontend/pipeline_editor/components/lint/ci_lint_spec.js index 5ccf4bbdab4..fdddca3d62b 100644 --- a/spec/frontend/pipeline_editor/components/lint/ci_lint_spec.js +++ b/spec/frontend/pipeline_editor/components/lint/ci_lint_spec.js @@ -1,5 +1,5 @@ -import { shallowMount, mount } from '@vue/test-utils'; import { GlAlert, GlLink } from '@gitlab/ui'; +import { shallowMount, mount } from '@vue/test-utils'; import CiLint from '~/pipeline_editor/components/lint/ci_lint.vue'; import { CI_CONFIG_STATUS_INVALID } from '~/pipeline_editor/constants'; import { mergeUnwrappedCiConfig, mockLintHelpPagePath } from '../../mock_data'; diff --git a/spec/frontend/pipeline_editor/components/lint/ci_lint_warnings_spec.js b/spec/frontend/pipeline_editor/components/lint/ci_lint_warnings_spec.js index b441d26c146..4b576508ee9 100644 --- a/spec/frontend/pipeline_editor/components/lint/ci_lint_warnings_spec.js +++ b/spec/frontend/pipeline_editor/components/lint/ci_lint_warnings_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlAlert, GlSprintf } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import { trimText } from 'helpers/text_helper'; import CiLintWarnings from '~/pipeline_editor/components/lint/ci_lint_warnings.vue'; diff --git a/spec/frontend/pipeline_editor/components/pipeline_editor_tabs_spec.js b/spec/frontend/pipeline_editor/components/pipeline_editor_tabs_spec.js index 5f4760054ec..24af17e9ce6 100644 --- a/spec/frontend/pipeline_editor/components/pipeline_editor_tabs_spec.js +++ b/spec/frontend/pipeline_editor/components/pipeline_editor_tabs_spec.js @@ -1,10 +1,10 @@ -import { nextTick } from 'vue'; -import { shallowMount, mount } from '@vue/test-utils'; import { GlAlert, GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount, mount } from '@vue/test-utils'; +import { nextTick } from 'vue'; +import CiConfigMergedPreview from '~/pipeline_editor/components/editor/ci_config_merged_preview.vue'; import CiLint from '~/pipeline_editor/components/lint/ci_lint.vue'; -import PipelineGraph from '~/pipelines/components/pipeline_graph/pipeline_graph.vue'; import PipelineEditorTabs from '~/pipeline_editor/components/pipeline_editor_tabs.vue'; -import CiConfigMergedPreview from '~/pipeline_editor/components/editor/ci_config_merged_preview.vue'; +import PipelineGraph from '~/pipelines/components/pipeline_graph/pipeline_graph.vue'; import { mockLintResponse, mockCiYml } from '../mock_data'; diff --git a/spec/frontend/pipeline_editor/components/ui/editor_tab_spec.js b/spec/frontend/pipeline_editor/components/ui/editor_tab_spec.js index d3d9bf08209..291468c5229 100644 --- a/spec/frontend/pipeline_editor/components/ui/editor_tab_spec.js +++ b/spec/frontend/pipeline_editor/components/ui/editor_tab_spec.js @@ -1,6 +1,6 @@ -import { nextTick } from 'vue'; -import { mount } from '@vue/test-utils'; import { GlTabs } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; +import { nextTick } from 'vue'; import EditorTab from '~/pipeline_editor/components/ui/editor_tab.vue'; diff --git a/spec/frontend/pipeline_editor/graphql/resolvers_spec.js b/spec/frontend/pipeline_editor/graphql/resolvers_spec.js index bee9f53814e..d39c0d80296 100644 --- a/spec/frontend/pipeline_editor/graphql/resolvers_spec.js +++ b/spec/frontend/pipeline_editor/graphql/resolvers_spec.js @@ -1,7 +1,7 @@ import MockAdapter from 'axios-mock-adapter'; import Api from '~/api'; -import httpStatus from '~/lib/utils/http_status'; import axios from '~/lib/utils/axios_utils'; +import httpStatus from '~/lib/utils/http_status'; import { resolvers } from '~/pipeline_editor/graphql/resolvers'; import { mockCiConfigPath, diff --git a/spec/frontend/pipeline_editor/pipeline_editor_app_spec.js b/spec/frontend/pipeline_editor/pipeline_editor_app_spec.js index 207d1ad9664..46d0452f437 100644 --- a/spec/frontend/pipeline_editor/pipeline_editor_app_spec.js +++ b/spec/frontend/pipeline_editor/pipeline_editor_app_spec.js @@ -1,14 +1,13 @@ -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { GlAlert, GlButton, GlLoadingIcon, GlTabs } from '@gitlab/ui'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; import VueApollo from 'vue-apollo'; -import waitForPromises from 'helpers/wait_for_promises'; import createMockApollo from 'helpers/mock_apollo_helper'; -import TextEditor from '~/pipeline_editor/components/editor/text_editor.vue'; - +import waitForPromises from 'helpers/wait_for_promises'; import httpStatusCodes from '~/lib/utils/http_status'; +import CommitForm from '~/pipeline_editor/components/commit/commit_form.vue'; +import TextEditor from '~/pipeline_editor/components/editor/text_editor.vue'; import { COMMIT_SUCCESS, COMMIT_FAILURE, LOAD_FAILURE_UNKNOWN } from '~/pipeline_editor/constants'; -import CommitForm from '~/pipeline_editor/components/commit/commit_form.vue'; import getCiConfigData from '~/pipeline_editor/graphql/queries/ci_config.graphql'; import PipelineEditorApp from '~/pipeline_editor/pipeline_editor_app.vue'; import PipelineEditorHome from '~/pipeline_editor/pipeline_editor_home.vue'; diff --git a/spec/frontend/pipeline_editor/pipeline_editor_home_spec.js b/spec/frontend/pipeline_editor/pipeline_editor_home_spec.js index b1c6198659a..9864f3c13f9 100644 --- a/spec/frontend/pipeline_editor/pipeline_editor_home_spec.js +++ b/spec/frontend/pipeline_editor/pipeline_editor_home_spec.js @@ -1,11 +1,11 @@ -import { nextTick } from 'vue'; import { shallowMount } from '@vue/test-utils'; +import { nextTick } from 'vue'; -import PipelineEditorHome from '~/pipeline_editor/pipeline_editor_home.vue'; -import PipelineEditorTabs from '~/pipeline_editor/components/pipeline_editor_tabs.vue'; import CommitSection from '~/pipeline_editor/components/commit/commit_section.vue'; import PipelineEditorHeader from '~/pipeline_editor/components/header/pipeline_editor_header.vue'; +import PipelineEditorTabs from '~/pipeline_editor/components/pipeline_editor_tabs.vue'; import { MERGED_TAB, VISUALIZE_TAB } from '~/pipeline_editor/constants'; +import PipelineEditorHome from '~/pipeline_editor/pipeline_editor_home.vue'; import { mockLintResponse, mockCiYml } from './mock_data'; diff --git a/spec/frontend/pipeline_new/components/pipeline_new_form_spec.js b/spec/frontend/pipeline_new/components/pipeline_new_form_spec.js index c1eb3ba3b17..51bb0ecee9c 100644 --- a/spec/frontend/pipeline_new/components/pipeline_new_form_spec.js +++ b/spec/frontend/pipeline_new/components/pipeline_new_form_spec.js @@ -1,11 +1,11 @@ -import { mount, shallowMount } from '@vue/test-utils'; import { GlDropdown, GlDropdownItem, GlForm, GlSprintf, GlLoadingIcon } from '@gitlab/ui'; +import { mount, shallowMount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import waitForPromises from 'helpers/wait_for_promises'; -import httpStatusCodes from '~/lib/utils/http_status'; import axios from '~/lib/utils/axios_utils'; -import PipelineNewForm from '~/pipeline_new/components/pipeline_new_form.vue'; +import httpStatusCodes from '~/lib/utils/http_status'; import { redirectTo } from '~/lib/utils/url_utility'; +import PipelineNewForm from '~/pipeline_new/components/pipeline_new_form.vue'; import { mockBranches, mockTags, diff --git a/spec/frontend/pipeline_new/utils/format_refs_spec.js b/spec/frontend/pipeline_new/utils/format_refs_spec.js index 1fda6a8af83..405a747c3ba 100644 --- a/spec/frontend/pipeline_new/utils/format_refs_spec.js +++ b/spec/frontend/pipeline_new/utils/format_refs_spec.js @@ -1,5 +1,5 @@ -import formatRefs from '~/pipeline_new/utils/format_refs'; import { BRANCH_REF_TYPE, TAG_REF_TYPE } from '~/pipeline_new/constants'; +import formatRefs from '~/pipeline_new/utils/format_refs'; import { mockBranchRefs, mockTagRefs } from '../mock_data'; describe('Format refs util', () => { diff --git a/spec/frontend/pipelines/blank_state_spec.js b/spec/frontend/pipelines/blank_state_spec.js index dae24efd041..5dcf3d267ed 100644 --- a/spec/frontend/pipelines/blank_state_spec.js +++ b/spec/frontend/pipelines/blank_state_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { getByText } from '@testing-library/dom'; +import { mount } from '@vue/test-utils'; import BlankState from '~/pipelines/components/pipelines_list/blank_state.vue'; describe('Pipelines Blank State', () => { diff --git a/spec/frontend/pipelines/components/dag/dag_annotations_spec.js b/spec/frontend/pipelines/components/dag/dag_annotations_spec.js index 80807c0b330..1941a7f2777 100644 --- a/spec/frontend/pipelines/components/dag/dag_annotations_spec.js +++ b/spec/frontend/pipelines/components/dag/dag_annotations_spec.js @@ -1,5 +1,5 @@ -import { shallowMount, mount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount, mount } from '@vue/test-utils'; import DagAnnotations from '~/pipelines/components/dag/dag_annotations.vue'; import { singleNote, multiNote } from './mock_data'; diff --git a/spec/frontend/pipelines/components/dag/dag_graph_spec.js b/spec/frontend/pipelines/components/dag/dag_graph_spec.js index ccfb2ae7cee..4619548d1bb 100644 --- a/spec/frontend/pipelines/components/dag/dag_graph_spec.js +++ b/spec/frontend/pipelines/components/dag/dag_graph_spec.js @@ -1,8 +1,8 @@ import { shallowMount } from '@vue/test-utils'; -import DagGraph from '~/pipelines/components/dag/dag_graph.vue'; import { IS_HIGHLIGHTED, LINK_SELECTOR, NODE_SELECTOR } from '~/pipelines/components/dag/constants'; -import { highlightIn, highlightOut } from '~/pipelines/components/dag/interactions'; +import DagGraph from '~/pipelines/components/dag/dag_graph.vue'; import { createSankey } from '~/pipelines/components/dag/drawing_utils'; +import { highlightIn, highlightOut } from '~/pipelines/components/dag/interactions'; import { removeOrphanNodes } from '~/pipelines/components/parsing_utils'; import { parsedData } from './mock_data'; diff --git a/spec/frontend/pipelines/components/dag/dag_spec.js b/spec/frontend/pipelines/components/dag/dag_spec.js index f6195e30e44..14030930657 100644 --- a/spec/frontend/pipelines/components/dag/dag_spec.js +++ b/spec/frontend/pipelines/components/dag/dag_spec.js @@ -1,10 +1,10 @@ -import { mount, shallowMount } from '@vue/test-utils'; import { GlAlert, GlEmptyState } from '@gitlab/ui'; +import { mount, shallowMount } from '@vue/test-utils'; +import { ADD_NOTE, REMOVE_NOTE, REPLACE_NOTES } from '~/pipelines/components/dag/constants'; import Dag from '~/pipelines/components/dag/dag.vue'; -import DagGraph from '~/pipelines/components/dag/dag_graph.vue'; import DagAnnotations from '~/pipelines/components/dag/dag_annotations.vue'; +import DagGraph from '~/pipelines/components/dag/dag_graph.vue'; -import { ADD_NOTE, REMOVE_NOTE, REPLACE_NOTES } from '~/pipelines/components/dag/constants'; import { PARSE_FAILURE, UNSUPPORTED_DATA } from '~/pipelines/constants'; import { mockParsedGraphQLNodes, diff --git a/spec/frontend/pipelines/components/dag/parsing_utils_spec.js b/spec/frontend/pipelines/components/dag/parsing_utils_spec.js index 5d3f680a57c..84ff83883b7 100644 --- a/spec/frontend/pipelines/components/dag/parsing_utils_spec.js +++ b/spec/frontend/pipelines/components/dag/parsing_utils_spec.js @@ -1,3 +1,4 @@ +import { createSankey } from '~/pipelines/components/dag/drawing_utils'; import { createNodeDict, makeLinksFromNodes, @@ -7,7 +8,6 @@ import { getMaxNodes, } from '~/pipelines/components/parsing_utils'; -import { createSankey } from '~/pipelines/components/dag/drawing_utils'; import { mockParsedGraphQLNodes } from './mock_data'; describe('DAG visualization parsing utilities', () => { diff --git a/spec/frontend/pipelines/components/pipelines_filtered_search_spec.js b/spec/frontend/pipelines/components/pipelines_filtered_search_spec.js index 00fe9e784b3..e43aa2a02f5 100644 --- a/spec/frontend/pipelines/components/pipelines_filtered_search_spec.js +++ b/spec/frontend/pipelines/components/pipelines_filtered_search_spec.js @@ -1,6 +1,6 @@ +import { GlFilteredSearch } from '@gitlab/ui'; import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; -import { GlFilteredSearch } from '@gitlab/ui'; import Api from '~/api'; import axios from '~/lib/utils/axios_utils'; import PipelinesFilteredSearch from '~/pipelines/components/pipelines_list/pipelines_filtered_search.vue'; diff --git a/spec/frontend/pipelines/graph/action_component_spec.js b/spec/frontend/pipelines/graph/action_component_spec.js index 95d96e127c6..6a7018fa1e5 100644 --- a/spec/frontend/pipelines/graph/action_component_spec.js +++ b/spec/frontend/pipelines/graph/action_component_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import waitForPromises from 'helpers/wait_for_promises'; import axios from '~/lib/utils/axios_utils'; diff --git a/spec/frontend/pipelines/graph/graph_component_legacy_spec.js b/spec/frontend/pipelines/graph/graph_component_legacy_spec.js index 1bde9cae7d2..a955572a481 100644 --- a/spec/frontend/pipelines/graph/graph_component_legacy_spec.js +++ b/spec/frontend/pipelines/graph/graph_component_legacy_spec.js @@ -1,14 +1,14 @@ -import { nextTick } from 'vue'; -import { mount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; +import { nextTick } from 'vue'; import { setHTMLFixture } from 'helpers/fixtures'; -import PipelineStore from '~/pipelines/stores/pipeline_store'; import GraphComponentLegacy from '~/pipelines/components/graph/graph_component_legacy.vue'; -import StageColumnComponentLegacy from '~/pipelines/components/graph/stage_column_component_legacy.vue'; import LinkedPipelinesColumnLegacy from '~/pipelines/components/graph/linked_pipelines_column_legacy.vue'; +import StageColumnComponentLegacy from '~/pipelines/components/graph/stage_column_component_legacy.vue'; import PipelinesMediator from '~/pipelines/pipeline_details_mediator'; -import graphJSON from './mock_data_legacy'; +import PipelineStore from '~/pipelines/stores/pipeline_store'; import linkedPipelineJSON from './linked_pipelines_mock_data'; +import graphJSON from './mock_data_legacy'; describe('graph component', () => { let store; diff --git a/spec/frontend/pipelines/graph/graph_component_spec.js b/spec/frontend/pipelines/graph/graph_component_spec.js index e629396e699..3e8d4ba314c 100644 --- a/spec/frontend/pipelines/graph/graph_component_spec.js +++ b/spec/frontend/pipelines/graph/graph_component_spec.js @@ -1,10 +1,10 @@ import { mount, shallowMount } from '@vue/test-utils'; +import { GRAPHQL } from '~/pipelines/components/graph/constants'; import PipelineGraph from '~/pipelines/components/graph/graph_component.vue'; -import StageColumnComponent from '~/pipelines/components/graph/stage_column_component.vue'; import JobItem from '~/pipelines/components/graph/job_item.vue'; import LinkedPipelinesColumn from '~/pipelines/components/graph/linked_pipelines_column.vue'; +import StageColumnComponent from '~/pipelines/components/graph/stage_column_component.vue'; import LinksLayer from '~/pipelines/components/graph_shared/links_layer.vue'; -import { GRAPHQL } from '~/pipelines/components/graph/constants'; import { generateResponse, mockPipelineResponse, diff --git a/spec/frontend/pipelines/graph/graph_component_wrapper_spec.js b/spec/frontend/pipelines/graph/graph_component_wrapper_spec.js index 54593c527cb..202365ecd35 100644 --- a/spec/frontend/pipelines/graph/graph_component_wrapper_spec.js +++ b/spec/frontend/pipelines/graph/graph_component_wrapper_spec.js @@ -1,11 +1,11 @@ +import { GlAlert, GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import Vue from 'vue'; import VueApollo from 'vue-apollo'; -import { shallowMount } from '@vue/test-utils'; -import { GlAlert, GlLoadingIcon } from '@gitlab/ui'; import createMockApollo from 'helpers/mock_apollo_helper'; import getPipelineDetails from 'shared_queries/pipelines/get_pipeline_details.query.graphql'; -import PipelineGraphWrapper from '~/pipelines/components/graph/graph_component_wrapper.vue'; import PipelineGraph from '~/pipelines/components/graph/graph_component.vue'; +import PipelineGraphWrapper from '~/pipelines/components/graph/graph_component_wrapper.vue'; import { mockPipelineResponse } from './mock_data'; const defaultProvide = { diff --git a/spec/frontend/pipelines/graph/job_name_component_spec.js b/spec/frontend/pipelines/graph/job_name_component_spec.js index f0aa646b8d7..658b5be87d4 100644 --- a/spec/frontend/pipelines/graph/job_name_component_spec.js +++ b/spec/frontend/pipelines/graph/job_name_component_spec.js @@ -1,7 +1,6 @@ import { mount } from '@vue/test-utils'; -import ciIcon from '~/vue_shared/components/ci_icon.vue'; - import jobNameComponent from '~/pipelines/components/graph/job_name_component.vue'; +import ciIcon from '~/vue_shared/components/ci_icon.vue'; describe('job name component', () => { let wrapper; diff --git a/spec/frontend/pipelines/graph/linked_pipeline_spec.js b/spec/frontend/pipelines/graph/linked_pipeline_spec.js index fcae4406950..96f2cd1e371 100644 --- a/spec/frontend/pipelines/graph/linked_pipeline_spec.js +++ b/spec/frontend/pipelines/graph/linked_pipeline_spec.js @@ -1,9 +1,9 @@ -import { mount } from '@vue/test-utils'; import { GlButton, GlLoadingIcon } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; +import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; +import { UPSTREAM, DOWNSTREAM } from '~/pipelines/components/graph/constants'; import LinkedPipelineComponent from '~/pipelines/components/graph/linked_pipeline.vue'; import CiStatus from '~/vue_shared/components/ci_icon.vue'; -import { UPSTREAM, DOWNSTREAM } from '~/pipelines/components/graph/constants'; -import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; import mockData from './linked_pipelines_mock_data'; const mockPipeline = mockData.triggered[0]; diff --git a/spec/frontend/pipelines/graph/linked_pipelines_column_legacy_spec.js b/spec/frontend/pipelines/graph/linked_pipelines_column_legacy_spec.js index b6c700c65d2..200e3f48401 100644 --- a/spec/frontend/pipelines/graph/linked_pipelines_column_legacy_spec.js +++ b/spec/frontend/pipelines/graph/linked_pipelines_column_legacy_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; -import LinkedPipelinesColumnLegacy from '~/pipelines/components/graph/linked_pipelines_column_legacy.vue'; -import LinkedPipeline from '~/pipelines/components/graph/linked_pipeline.vue'; import { UPSTREAM } from '~/pipelines/components/graph/constants'; +import LinkedPipeline from '~/pipelines/components/graph/linked_pipeline.vue'; +import LinkedPipelinesColumnLegacy from '~/pipelines/components/graph/linked_pipelines_column_legacy.vue'; import mockData from './linked_pipelines_mock_data'; describe('Linked Pipelines Column', () => { diff --git a/spec/frontend/pipelines/graph/linked_pipelines_column_spec.js b/spec/frontend/pipelines/graph/linked_pipelines_column_spec.js index 6db152f2607..504d1953c0c 100644 --- a/spec/frontend/pipelines/graph/linked_pipelines_column_spec.js +++ b/spec/frontend/pipelines/graph/linked_pipelines_column_spec.js @@ -1,11 +1,11 @@ -import VueApollo from 'vue-apollo'; import { mount, shallowMount, createLocalVue } from '@vue/test-utils'; +import VueApollo from 'vue-apollo'; import createMockApollo from 'helpers/mock_apollo_helper'; import getPipelineDetails from 'shared_queries/pipelines/get_pipeline_details.query.graphql'; +import { DOWNSTREAM, GRAPHQL } from '~/pipelines/components/graph/constants'; import PipelineGraph from '~/pipelines/components/graph/graph_component.vue'; -import LinkedPipelinesColumn from '~/pipelines/components/graph/linked_pipelines_column.vue'; import LinkedPipeline from '~/pipelines/components/graph/linked_pipeline.vue'; -import { DOWNSTREAM, GRAPHQL } from '~/pipelines/components/graph/constants'; +import LinkedPipelinesColumn from '~/pipelines/components/graph/linked_pipelines_column.vue'; import { LOAD_FAILURE } from '~/pipelines/constants'; import { mockPipelineResponse, diff --git a/spec/frontend/pipelines/graph_shared/links_layer_spec.js b/spec/frontend/pipelines/graph_shared/links_layer_spec.js index 9ef5233dbce..0ff8583fbff 100644 --- a/spec/frontend/pipelines/graph_shared/links_layer_spec.js +++ b/spec/frontend/pipelines/graph_shared/links_layer_spec.js @@ -1,7 +1,7 @@ -import { mount, shallowMount } from '@vue/test-utils'; import { GlAlert, GlButton } from '@gitlab/ui'; -import LinksLayer from '~/pipelines/components/graph_shared/links_layer.vue'; +import { mount, shallowMount } from '@vue/test-utils'; import LinksInner from '~/pipelines/components/graph_shared/links_inner.vue'; +import LinksLayer from '~/pipelines/components/graph_shared/links_layer.vue'; import { generateResponse, mockPipelineResponse } from '../graph/mock_data'; describe('links layer component', () => { diff --git a/spec/frontend/pipelines/header_component_spec.js b/spec/frontend/pipelines/header_component_spec.js index 5b4cd7b71fe..57d846c53c8 100644 --- a/spec/frontend/pipelines/header_component_spec.js +++ b/spec/frontend/pipelines/header_component_spec.js @@ -1,9 +1,9 @@ -import { shallowMount } from '@vue/test-utils'; import { GlModal, GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import HeaderComponent from '~/pipelines/components/header_component.vue'; +import cancelPipelineMutation from '~/pipelines/graphql/mutations/cancel_pipeline.mutation.graphql'; import deletePipelineMutation from '~/pipelines/graphql/mutations/delete_pipeline.mutation.graphql'; import retryPipelineMutation from '~/pipelines/graphql/mutations/retry_pipeline.mutation.graphql'; -import cancelPipelineMutation from '~/pipelines/graphql/mutations/cancel_pipeline.mutation.graphql'; import { mockCancelledPipelineHeader, mockFailedPipelineHeader, diff --git a/spec/frontend/pipelines/pipeline_graph/pipeline_graph_spec.js b/spec/frontend/pipelines/pipeline_graph/pipeline_graph_spec.js index 5462045c5c4..718667fcc73 100644 --- a/spec/frontend/pipelines/pipeline_graph/pipeline_graph_spec.js +++ b/spec/frontend/pipelines/pipeline_graph/pipeline_graph_spec.js @@ -1,10 +1,10 @@ -import { shallowMount } from '@vue/test-utils'; import { GlAlert } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { CI_CONFIG_STATUS_INVALID, CI_CONFIG_STATUS_VALID } from '~/pipeline_editor/constants'; -import { DRAW_FAILURE, EMPTY_PIPELINE_DATA, INVALID_CI_CONFIG } from '~/pipelines/constants'; +import JobPill from '~/pipelines/components/pipeline_graph/job_pill.vue'; import PipelineGraph from '~/pipelines/components/pipeline_graph/pipeline_graph.vue'; import StagePill from '~/pipelines/components/pipeline_graph/stage_pill.vue'; -import JobPill from '~/pipelines/components/pipeline_graph/job_pill.vue'; +import { DRAW_FAILURE, EMPTY_PIPELINE_DATA, INVALID_CI_CONFIG } from '~/pipelines/constants'; import { pipelineData, singleStageData } from './mock_data'; describe('pipeline graph component', () => { diff --git a/spec/frontend/pipelines/pipeline_triggerer_spec.js b/spec/frontend/pipelines/pipeline_triggerer_spec.js index ad8136890e6..467a97d95c7 100644 --- a/spec/frontend/pipelines/pipeline_triggerer_spec.js +++ b/spec/frontend/pipelines/pipeline_triggerer_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; -import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; import pipelineTriggerer from '~/pipelines/components/pipelines_list/pipeline_triggerer.vue'; +import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; describe('Pipelines Triggerer', () => { let wrapper; diff --git a/spec/frontend/pipelines/pipeline_url_spec.js b/spec/frontend/pipelines/pipeline_url_spec.js index 5266127ca60..44c9def99cc 100644 --- a/spec/frontend/pipelines/pipeline_url_spec.js +++ b/spec/frontend/pipelines/pipeline_url_spec.js @@ -1,5 +1,5 @@ -import $ from 'jquery'; import { shallowMount } from '@vue/test-utils'; +import $ from 'jquery'; import { trimText } from 'helpers/text_helper'; import PipelineUrlComponent from '~/pipelines/components/pipelines_list/pipeline_url.vue'; diff --git a/spec/frontend/pipelines/pipelines_actions_spec.js b/spec/frontend/pipelines/pipelines_actions_spec.js index ec01fe7c324..1e6c9e50a7e 100644 --- a/spec/frontend/pipelines/pipelines_actions_spec.js +++ b/spec/frontend/pipelines/pipelines_actions_spec.js @@ -1,8 +1,8 @@ +import { GlDropdown, GlDropdownItem } from '@gitlab/ui'; import { shallowMount, mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; -import { GlDropdown, GlDropdownItem } from '@gitlab/ui'; -import { TEST_HOST } from 'spec/test_constants'; import waitForPromises from 'helpers/wait_for_promises'; +import { TEST_HOST } from 'spec/test_constants'; import createFlash from '~/flash'; import axios from '~/lib/utils/axios_utils'; import PipelinesActions from '~/pipelines/components/pipelines_list/pipelines_actions.vue'; diff --git a/spec/frontend/pipelines/pipelines_artifacts_spec.js b/spec/frontend/pipelines/pipelines_artifacts_spec.js index 4f4c15fd4cc..f077833ae16 100644 --- a/spec/frontend/pipelines/pipelines_artifacts_spec.js +++ b/spec/frontend/pipelines/pipelines_artifacts_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlDropdown, GlDropdownItem } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import PipelineArtifacts from '~/pipelines/components/pipelines_list/pipelines_artifacts.vue'; describe('Pipelines Artifacts dropdown', () => { diff --git a/spec/frontend/pipelines/pipelines_spec.js b/spec/frontend/pipelines/pipelines_spec.js index cbad5b4c1e6..77faceaaec7 100644 --- a/spec/frontend/pipelines/pipelines_spec.js +++ b/spec/frontend/pipelines/pipelines_spec.js @@ -1,22 +1,21 @@ -import { nextTick } from 'vue'; +import { GlFilteredSearch, GlButton, GlLoadingIcon } from '@gitlab/ui'; import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; -import { GlFilteredSearch, GlButton, GlLoadingIcon } from '@gitlab/ui'; +import { nextTick } from 'vue'; import waitForPromises from 'helpers/wait_for_promises'; import Api from '~/api'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; -import NavigationTabs from '~/vue_shared/components/navigation_tabs.vue'; -import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; - -import NavigationControls from '~/pipelines/components/pipelines_list/nav_controls.vue'; -import EmptyState from '~/pipelines/components/pipelines_list/empty_state.vue'; import BlankState from '~/pipelines/components/pipelines_list/blank_state.vue'; -import PipelinesTableComponent from '~/pipelines/components/pipelines_list/pipelines_table.vue'; - +import EmptyState from '~/pipelines/components/pipelines_list/empty_state.vue'; +import NavigationControls from '~/pipelines/components/pipelines_list/nav_controls.vue'; import PipelinesComponent from '~/pipelines/components/pipelines_list/pipelines.vue'; -import Store from '~/pipelines/stores/pipelines_store'; +import PipelinesTableComponent from '~/pipelines/components/pipelines_list/pipelines_table.vue'; import { RAW_TEXT_WARNING } from '~/pipelines/constants'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; +import Store from '~/pipelines/stores/pipelines_store'; +import NavigationTabs from '~/vue_shared/components/navigation_tabs.vue'; +import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; + import { pipelineWithStages, stageReply, users, mockSearch, branches } from './mock_data'; jest.mock('~/flash'); diff --git a/spec/frontend/pipelines/stage_spec.js b/spec/frontend/pipelines/stage_spec.js index 8c914705d97..87b43558252 100644 --- a/spec/frontend/pipelines/stage_spec.js +++ b/spec/frontend/pipelines/stage_spec.js @@ -1,8 +1,8 @@ import 'bootstrap/js/dist/dropdown'; -import $ from 'jquery'; import { GlDropdown } from '@gitlab/ui'; import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; +import $ from 'jquery'; import axios from '~/lib/utils/axios_utils'; import StageComponent from '~/pipelines/components/pipelines_list/stage.vue'; import eventHub from '~/pipelines/event_hub'; diff --git a/spec/frontend/pipelines/test_reports/stores/actions_spec.js b/spec/frontend/pipelines/test_reports/stores/actions_spec.js index 970430b3adf..6258b08dfbb 100644 --- a/spec/frontend/pipelines/test_reports/stores/actions_spec.js +++ b/spec/frontend/pipelines/test_reports/stores/actions_spec.js @@ -2,10 +2,10 @@ import MockAdapter from 'axios-mock-adapter'; import { getJSONFixture } from 'helpers/fixtures'; import { TEST_HOST } from 'helpers/test_constants'; import testAction from 'helpers/vuex_action_helper'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import * as actions from '~/pipelines/stores/test_reports/actions'; import * as types from '~/pipelines/stores/test_reports/mutation_types'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; jest.mock('~/flash.js'); diff --git a/spec/frontend/pipelines/test_reports/test_case_details_spec.js b/spec/frontend/pipelines/test_reports/test_case_details_spec.js index 42765ca6a32..e866586a2c3 100644 --- a/spec/frontend/pipelines/test_reports/test_case_details_spec.js +++ b/spec/frontend/pipelines/test_reports/test_case_details_spec.js @@ -1,5 +1,5 @@ -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { GlModal } from '@gitlab/ui'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; import TestCaseDetails from '~/pipelines/components/test_reports/test_case_details.vue'; import CodeBlock from '~/vue_shared/components/code_block.vue'; diff --git a/spec/frontend/pipelines/test_reports/test_reports_spec.js b/spec/frontend/pipelines/test_reports/test_reports_spec.js index c8ab18b9086..da5763ddf8e 100644 --- a/spec/frontend/pipelines/test_reports/test_reports_spec.js +++ b/spec/frontend/pipelines/test_reports/test_reports_spec.js @@ -1,6 +1,6 @@ -import Vuex from 'vuex'; import { GlLoadingIcon } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import { getJSONFixture } from 'helpers/fixtures'; import TestReports from '~/pipelines/components/test_reports/test_reports.vue'; import TestSummary from '~/pipelines/components/test_reports/test_summary.vue'; diff --git a/spec/frontend/pipelines/test_reports/test_suite_table_spec.js b/spec/frontend/pipelines/test_reports/test_suite_table_spec.js index 6aab4f28774..83a5a113d13 100644 --- a/spec/frontend/pipelines/test_reports/test_suite_table_spec.js +++ b/spec/frontend/pipelines/test_reports/test_suite_table_spec.js @@ -1,11 +1,11 @@ -import Vuex from 'vuex'; -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { GlButton, GlFriendlyWrap, GlLink, GlPagination } from '@gitlab/ui'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import { getJSONFixture } from 'helpers/fixtures'; import SuiteTable from '~/pipelines/components/test_reports/test_suite_table.vue'; +import { TestStatus } from '~/pipelines/constants'; import * as getters from '~/pipelines/stores/test_reports/getters'; import { formatFilePath } from '~/pipelines/stores/test_reports/utils'; -import { TestStatus } from '~/pipelines/constants'; import skippedTestCases from './mock_data'; const localVue = createLocalVue(); diff --git a/spec/frontend/pipelines/test_reports/test_summary_table_spec.js b/spec/frontend/pipelines/test_reports/test_summary_table_spec.js index b585536ae09..892a3742fea 100644 --- a/spec/frontend/pipelines/test_reports/test_summary_table_spec.js +++ b/spec/frontend/pipelines/test_reports/test_summary_table_spec.js @@ -1,5 +1,5 @@ -import Vuex from 'vuex'; import { mount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import { getJSONFixture } from 'helpers/fixtures'; import SummaryTable from '~/pipelines/components/test_reports/test_summary_table.vue'; import * as getters from '~/pipelines/stores/test_reports/getters'; diff --git a/spec/frontend/pipelines/time_ago_spec.js b/spec/frontend/pipelines/time_ago_spec.js index b7bc8d08a0f..55a19ef5165 100644 --- a/spec/frontend/pipelines/time_ago_spec.js +++ b/spec/frontend/pipelines/time_ago_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import TimeAgo from '~/pipelines/components/pipelines_list/time_ago.vue'; describe('Timeago component', () => { diff --git a/spec/frontend/popovers/components/popovers_spec.js b/spec/frontend/popovers/components/popovers_spec.js index 63e0b3d9c49..0c164d97564 100644 --- a/spec/frontend/popovers/components/popovers_spec.js +++ b/spec/frontend/popovers/components/popovers_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlPopover } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { useMockMutationObserver } from 'helpers/mock_dom_observer'; import Popovers from '~/popovers/components/popovers.vue'; diff --git a/spec/frontend/profile/account/components/delete_account_modal_spec.js b/spec/frontend/profile/account/components/delete_account_modal_spec.js index 82d2ab2d18a..f1784500baf 100644 --- a/spec/frontend/profile/account/components/delete_account_modal_spec.js +++ b/spec/frontend/profile/account/components/delete_account_modal_spec.js @@ -1,7 +1,7 @@ +import { mount } from '@vue/test-utils'; +import { merge } from 'lodash'; import Vue from 'vue'; -import { merge } from 'lodash'; -import { mount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; import deleteAccountModal from '~/profile/account/components/delete_account_modal.vue'; diff --git a/spec/frontend/profile/account/components/update_username_spec.js b/spec/frontend/profile/account/components/update_username_spec.js index 91c3c81ab30..8295d1d43cf 100644 --- a/spec/frontend/profile/account/components/update_username_spec.js +++ b/spec/frontend/profile/account/components/update_username_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlModal } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import { TEST_HOST } from 'helpers/test_constants'; import axios from '~/lib/utils/axios_utils'; diff --git a/spec/frontend/profile/preferences/components/integration_view_spec.js b/spec/frontend/profile/preferences/components/integration_view_spec.js index 5d55a089119..7a303ae5d3a 100644 --- a/spec/frontend/profile/preferences/components/integration_view_spec.js +++ b/spec/frontend/profile/preferences/components/integration_view_spec.js @@ -1,9 +1,9 @@ +import { GlFormText } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; -import { GlFormText } from '@gitlab/ui'; +import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import IntegrationView from '~/profile/preferences/components/integration_view.vue'; import IntegrationHelpText from '~/vue_shared/components/integrations_help_text.vue'; -import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { integrationViews, userFields } from '../mock_data'; const viewProps = convertObjectPropsToCamelCase(integrationViews[0]); diff --git a/spec/frontend/profile/preferences/components/profile_preferences_spec.js b/spec/frontend/profile/preferences/components/profile_preferences_spec.js index fcc27d8faaf..00ed51694ed 100644 --- a/spec/frontend/profile/preferences/components/profile_preferences_spec.js +++ b/spec/frontend/profile/preferences/components/profile_preferences_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; -import ProfilePreferences from '~/profile/preferences/components/profile_preferences.vue'; import IntegrationView from '~/profile/preferences/components/integration_view.vue'; +import ProfilePreferences from '~/profile/preferences/components/profile_preferences.vue'; import { integrationViews, userFields } from '../mock_data'; describe('ProfilePreferences component', () => { diff --git a/spec/frontend/project_find_file_spec.js b/spec/frontend/project_find_file_spec.js index 1af97dbca0a..5919910d791 100644 --- a/spec/frontend/project_find_file_spec.js +++ b/spec/frontend/project_find_file_spec.js @@ -2,8 +2,8 @@ import MockAdapter from 'axios-mock-adapter'; import $ from 'jquery'; import { TEST_HOST } from 'helpers/test_constants'; import { sanitize } from '~/lib/dompurify'; -import ProjectFindFile from '~/project_find_file'; import axios from '~/lib/utils/axios_utils'; +import ProjectFindFile from '~/project_find_file'; jest.mock('~/lib/dompurify', () => ({ addHook: jest.fn(), diff --git a/spec/frontend/projects/commit/components/branches_dropdown_spec.js b/spec/frontend/projects/commit/components/branches_dropdown_spec.js index 6f816006ae3..7686c28c7fc 100644 --- a/spec/frontend/projects/commit/components/branches_dropdown_spec.js +++ b/spec/frontend/projects/commit/components/branches_dropdown_spec.js @@ -1,7 +1,7 @@ +import { GlDropdownItem, GlSearchBoxByType } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import Vue from 'vue'; import Vuex from 'vuex'; -import { shallowMount } from '@vue/test-utils'; -import { GlDropdownItem, GlSearchBoxByType } from '@gitlab/ui'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import BranchesDropdown from '~/projects/commit/components/branches_dropdown.vue'; diff --git a/spec/frontend/projects/commit/components/form_modal_spec.js b/spec/frontend/projects/commit/components/form_modal_spec.js index e197ca8eace..1569f5b4bbe 100644 --- a/spec/frontend/projects/commit/components/form_modal_spec.js +++ b/spec/frontend/projects/commit/components/form_modal_spec.js @@ -1,14 +1,14 @@ -import MockAdapter from 'axios-mock-adapter'; -import { shallowMount, mount, createWrapper } from '@vue/test-utils'; import { GlModal, GlForm, GlFormCheckbox, GlSprintf } from '@gitlab/ui'; import { within } from '@testing-library/dom'; +import { shallowMount, mount, createWrapper } from '@vue/test-utils'; +import MockAdapter from 'axios-mock-adapter'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import axios from '~/lib/utils/axios_utils'; -import eventHub from '~/projects/commit/event_hub'; -import CommitFormModal from '~/projects/commit/components/form_modal.vue'; +import { BV_SHOW_MODAL } from '~/lib/utils/constants'; import BranchesDropdown from '~/projects/commit/components/branches_dropdown.vue'; +import CommitFormModal from '~/projects/commit/components/form_modal.vue'; +import eventHub from '~/projects/commit/event_hub'; import createStore from '~/projects/commit/store'; -import { BV_SHOW_MODAL } from '~/lib/utils/constants'; import mockData from '../mock_data'; describe('CommitFormModal', () => { diff --git a/spec/frontend/projects/commit/components/form_trigger_spec.js b/spec/frontend/projects/commit/components/form_trigger_spec.js index ca51419d6a5..4503493c0a6 100644 --- a/spec/frontend/projects/commit/components/form_trigger_spec.js +++ b/spec/frontend/projects/commit/components/form_trigger_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLink } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import FormTrigger from '~/projects/commit/components/form_trigger.vue'; import eventHub from '~/projects/commit/event_hub'; diff --git a/spec/frontend/projects/commit/store/actions_spec.js b/spec/frontend/projects/commit/store/actions_spec.js index e10e8fab440..458372229cf 100644 --- a/spec/frontend/projects/commit/store/actions_spec.js +++ b/spec/frontend/projects/commit/store/actions_spec.js @@ -1,11 +1,11 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; -import axios from '~/lib/utils/axios_utils'; import createFlash from '~/flash'; -import getInitialState from '~/projects/commit/store/state'; +import axios from '~/lib/utils/axios_utils'; +import { PROJECT_BRANCHES_ERROR } from '~/projects/commit/constants'; import * as actions from '~/projects/commit/store/actions'; import * as types from '~/projects/commit/store/mutation_types'; -import { PROJECT_BRANCHES_ERROR } from '~/projects/commit/constants'; +import getInitialState from '~/projects/commit/store/state'; import mockData from '../mock_data'; jest.mock('~/flash.js'); diff --git a/spec/frontend/projects/commit/store/mutations_spec.js b/spec/frontend/projects/commit/store/mutations_spec.js index 59ab3d9a74a..2ea50e71772 100644 --- a/spec/frontend/projects/commit/store/mutations_spec.js +++ b/spec/frontend/projects/commit/store/mutations_spec.js @@ -1,5 +1,5 @@ -import mutations from '~/projects/commit/store/mutations'; import * as types from '~/projects/commit/store/mutation_types'; +import mutations from '~/projects/commit/store/mutations'; describe('Commit form modal mutations', () => { let stateCopy; diff --git a/spec/frontend/projects/commits/components/author_select_spec.js b/spec/frontend/projects/commits/components/author_select_spec.js index 63920ddfd72..9a8f7ff7582 100644 --- a/spec/frontend/projects/commits/components/author_select_spec.js +++ b/spec/frontend/projects/commits/components/author_select_spec.js @@ -1,6 +1,6 @@ +import { GlDropdown, GlDropdownSectionHeader, GlSearchBoxByType, GlDropdownItem } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlDropdown, GlDropdownSectionHeader, GlSearchBoxByType, GlDropdownItem } from '@gitlab/ui'; import * as urlUtility from '~/lib/utils/url_utility'; import AuthorSelect from '~/projects/commits/components/author_select.vue'; import { createStore } from '~/projects/commits/store'; diff --git a/spec/frontend/projects/commits/store/actions_spec.js b/spec/frontend/projects/commits/store/actions_spec.js index a842aaa2a76..e2c993b8395 100644 --- a/spec/frontend/projects/commits/store/actions_spec.js +++ b/spec/frontend/projects/commits/store/actions_spec.js @@ -1,10 +1,10 @@ import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; -import * as types from '~/projects/commits/store/mutation_types'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import actions from '~/projects/commits/store/actions'; +import * as types from '~/projects/commits/store/mutation_types'; import createState from '~/projects/commits/store/state'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; jest.mock('~/flash'); diff --git a/spec/frontend/projects/compare/components/app_spec.js b/spec/frontend/projects/compare/components/app_spec.js index e265055ef1b..d28a30e93b1 100644 --- a/spec/frontend/projects/compare/components/app_spec.js +++ b/spec/frontend/projects/compare/components/app_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import CompareApp from '~/projects/compare/components/app.vue'; import RevisionDropdown from '~/projects/compare/components/revision_dropdown.vue'; diff --git a/spec/frontend/projects/compare/components/revision_dropdown_spec.js b/spec/frontend/projects/compare/components/revision_dropdown_spec.js index c9e87fb904d..f3ff5e26d2b 100644 --- a/spec/frontend/projects/compare/components/revision_dropdown_spec.js +++ b/spec/frontend/projects/compare/components/revision_dropdown_spec.js @@ -1,9 +1,9 @@ +import { GlDropdown } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import AxiosMockAdapter from 'axios-mock-adapter'; -import { GlDropdown } from '@gitlab/ui'; +import createFlash from '~/flash'; import axios from '~/lib/utils/axios_utils'; import RevisionDropdown from '~/projects/compare/components/revision_dropdown.vue'; -import createFlash from '~/flash'; const defaultProps = { refsProjectPath: 'some/refs/path', diff --git a/spec/frontend/projects/components/shared/delete_button_spec.js b/spec/frontend/projects/components/shared/delete_button_spec.js index cf7e41a2df2..3e491584670 100644 --- a/spec/frontend/projects/components/shared/delete_button_spec.js +++ b/spec/frontend/projects/components/shared/delete_button_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlModal } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { stubComponent } from 'helpers/stub_component'; import SharedDeleteButton from '~/projects/components/shared/delete_button.vue'; diff --git a/spec/frontend/projects/experiment_new_project_creation/components/app_spec.js b/spec/frontend/projects/experiment_new_project_creation/components/app_spec.js index 9a5f200f5a9..b4ae50341d4 100644 --- a/spec/frontend/projects/experiment_new_project_creation/components/app_spec.js +++ b/spec/frontend/projects/experiment_new_project_creation/components/app_spec.js @@ -1,8 +1,8 @@ -import { shallowMount } from '@vue/test-utils'; import { GlBreadcrumb } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import App from '~/projects/experiment_new_project_creation/components/app.vue'; -import WelcomePage from '~/projects/experiment_new_project_creation/components/welcome.vue'; import LegacyContainer from '~/projects/experiment_new_project_creation/components/legacy_container.vue'; +import WelcomePage from '~/projects/experiment_new_project_creation/components/welcome.vue'; describe('Experimental new project creation app', () => { let wrapper; diff --git a/spec/frontend/projects/pipelines/charts/components/app_spec.js b/spec/frontend/projects/pipelines/charts/components/app_spec.js index 6a7595fea06..e8aace14db4 100644 --- a/spec/frontend/projects/pipelines/charts/components/app_spec.js +++ b/spec/frontend/projects/pipelines/charts/components/app_spec.js @@ -1,6 +1,6 @@ -import { merge } from 'lodash'; -import { shallowMount } from '@vue/test-utils'; import { GlTabs, GlTab } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; +import { merge } from 'lodash'; import setWindowLocation from 'helpers/set_window_location_helper'; import { TEST_HOST } from 'helpers/test_constants'; import { mergeUrlParams, updateHistory, getParameterValues } from '~/lib/utils/url_utility'; diff --git a/spec/frontend/projects/pipelines/charts/components/ci_cd_analytics_charts_spec.js b/spec/frontend/projects/pipelines/charts/components/ci_cd_analytics_charts_spec.js index 773d7526f12..037530ddd48 100644 --- a/spec/frontend/projects/pipelines/charts/components/ci_cd_analytics_charts_spec.js +++ b/spec/frontend/projects/pipelines/charts/components/ci_cd_analytics_charts_spec.js @@ -1,8 +1,8 @@ -import { nextTick } from 'vue'; -import { shallowMount } from '@vue/test-utils'; import { GlSegmentedControl } from '@gitlab/ui'; -import CiCdAnalyticsCharts from '~/projects/pipelines/charts/components/ci_cd_analytics_charts.vue'; +import { shallowMount } from '@vue/test-utils'; +import { nextTick } from 'vue'; import CiCdAnalyticsAreaChart from '~/projects/pipelines/charts/components/ci_cd_analytics_area_chart.vue'; +import CiCdAnalyticsCharts from '~/projects/pipelines/charts/components/ci_cd_analytics_charts.vue'; import { transformedAreaChartData, chartOptions } from '../mock_data'; const DEFAULT_PROPS = { diff --git a/spec/frontend/projects/pipelines/charts/components/pipeline_charts_spec.js b/spec/frontend/projects/pipelines/charts/components/pipeline_charts_spec.js index 9e051550fae..c5cfe783569 100644 --- a/spec/frontend/projects/pipelines/charts/components/pipeline_charts_spec.js +++ b/spec/frontend/projects/pipelines/charts/components/pipeline_charts_spec.js @@ -1,10 +1,10 @@ +import { GlColumnChart } from '@gitlab/ui/dist/charts'; import { createLocalVue, shallowMount } from '@vue/test-utils'; import VueApollo from 'vue-apollo'; -import { GlColumnChart } from '@gitlab/ui/dist/charts'; import createMockApollo from 'helpers/mock_apollo_helper'; -import StatisticsList from '~/projects/pipelines/charts/components/statistics_list.vue'; import CiCdAnalyticsCharts from '~/projects/pipelines/charts/components/ci_cd_analytics_charts.vue'; import PipelineCharts from '~/projects/pipelines/charts/components/pipeline_charts.vue'; +import StatisticsList from '~/projects/pipelines/charts/components/statistics_list.vue'; import getPipelineCountByStatus from '~/projects/pipelines/charts/graphql/queries/get_pipeline_count_by_status.query.graphql'; import getProjectPipelineStatistics from '~/projects/pipelines/charts/graphql/queries/get_project_pipeline_statistics.query.graphql'; import { mockPipelineCount, mockPipelineStatistics } from '../mock_data'; diff --git a/spec/frontend/projects/settings/components/shared_runners_toggle_spec.js b/spec/frontend/projects/settings/components/shared_runners_toggle_spec.js index 1fac3d07b16..2d6efe7ae83 100644 --- a/spec/frontend/projects/settings/components/shared_runners_toggle_spec.js +++ b/spec/frontend/projects/settings/components/shared_runners_toggle_spec.js @@ -2,8 +2,8 @@ import { GlAlert, GlToggle, GlTooltip } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import MockAxiosAdapter from 'axios-mock-adapter'; import waitForPromises from 'helpers/wait_for_promises'; -import SharedRunnersToggleComponent from '~/projects/settings/components/shared_runners_toggle.vue'; import axios from '~/lib/utils/axios_utils'; +import SharedRunnersToggleComponent from '~/projects/settings/components/shared_runners_toggle.vue'; const TEST_UPDATE_PATH = '/test/update_shared_runners'; diff --git a/spec/frontend/projects/settings_service_desk/components/service_desk_setting_spec.js b/spec/frontend/projects/settings_service_desk/components/service_desk_setting_spec.js index 51d656e0ea4..f6744f4971e 100644 --- a/spec/frontend/projects/settings_service_desk/components/service_desk_setting_spec.js +++ b/spec/frontend/projects/settings_service_desk/components/service_desk_setting_spec.js @@ -1,5 +1,5 @@ -import { shallowMount, mount } from '@vue/test-utils'; import { GlButton, GlFormSelect, GlLoadingIcon, GlToggle } from '@gitlab/ui'; +import { shallowMount, mount } from '@vue/test-utils'; import { nextTick } from 'vue'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import ServiceDeskSetting from '~/projects/settings_service_desk/components/service_desk_setting.vue'; diff --git a/spec/frontend/prometheus_alerts/components/reset_key_spec.js b/spec/frontend/prometheus_alerts/components/reset_key_spec.js index 489586a60fe..edf5297cc6a 100644 --- a/spec/frontend/prometheus_alerts/components/reset_key_spec.js +++ b/spec/frontend/prometheus_alerts/components/reset_key_spec.js @@ -1,10 +1,10 @@ +import { GlModal } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; -import { GlModal } from '@gitlab/ui'; import waitForPromises from 'helpers/wait_for_promises'; +import axios from '~/lib/utils/axios_utils'; import ResetKey from '~/prometheus_alerts/components/reset_key.vue'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; -import axios from '~/lib/utils/axios_utils'; describe('ResetKey', () => { let mock; diff --git a/spec/frontend/prometheus_metrics/custom_metrics_spec.js b/spec/frontend/prometheus_metrics/custom_metrics_spec.js index 1244d7342ad..3e3d4ee361a 100644 --- a/spec/frontend/prometheus_metrics/custom_metrics_spec.js +++ b/spec/frontend/prometheus_metrics/custom_metrics_spec.js @@ -1,7 +1,7 @@ import MockAdapter from 'axios-mock-adapter'; -import CustomMetrics from '~/prometheus_metrics/custom_metrics'; import axios from '~/lib/utils/axios_utils'; import PANEL_STATE from '~/prometheus_metrics/constants'; +import CustomMetrics from '~/prometheus_metrics/custom_metrics'; import { metrics1 as metrics } from './mock_data'; describe('PrometheusMetrics', () => { diff --git a/spec/frontend/prometheus_metrics/prometheus_metrics_spec.js b/spec/frontend/prometheus_metrics/prometheus_metrics_spec.js index f6b2780e167..722a5274ad4 100644 --- a/spec/frontend/prometheus_metrics/prometheus_metrics_spec.js +++ b/spec/frontend/prometheus_metrics/prometheus_metrics_spec.js @@ -1,7 +1,7 @@ import MockAdapter from 'axios-mock-adapter'; import axios from '~/lib/utils/axios_utils'; -import PrometheusMetrics from '~/prometheus_metrics/prometheus_metrics'; import PANEL_STATE from '~/prometheus_metrics/constants'; +import PrometheusMetrics from '~/prometheus_metrics/prometheus_metrics'; import { metrics2 as metrics, missingVarMetrics } from './mock_data'; describe('PrometheusMetrics', () => { diff --git a/spec/frontend/ref/components/ref_selector_spec.js b/spec/frontend/ref/components/ref_selector_spec.js index 7efb6e9ba4a..27ada131ed6 100644 --- a/spec/frontend/ref/components/ref_selector_spec.js +++ b/spec/frontend/ref/components/ref_selector_spec.js @@ -1,11 +1,11 @@ -import Vuex from 'vuex'; +import { GlLoadingIcon, GlSearchBoxByType, GlDropdownItem, GlIcon } from '@gitlab/ui'; import { mount, createLocalVue } from '@vue/test-utils'; import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; -import { GlLoadingIcon, GlSearchBoxByType, GlDropdownItem, GlIcon } from '@gitlab/ui'; +import Vuex from 'vuex'; import { trimText } from 'helpers/text_helper'; -import { sprintf } from '~/locale'; import { ENTER_KEY } from '~/lib/utils/keys'; +import { sprintf } from '~/locale'; import RefSelector from '~/ref/components/ref_selector.vue'; import { X_TOTAL_HEADER, DEFAULT_I18N } from '~/ref/constants'; import createStore from '~/ref/stores/'; diff --git a/spec/frontend/ref/stores/actions_spec.js b/spec/frontend/ref/stores/actions_spec.js index 32966354c95..11acec27165 100644 --- a/spec/frontend/ref/stores/actions_spec.js +++ b/spec/frontend/ref/stores/actions_spec.js @@ -1,7 +1,7 @@ import testAction from 'helpers/vuex_action_helper'; -import createState from '~/ref/stores/state'; import * as actions from '~/ref/stores/actions'; import * as types from '~/ref/stores/mutation_types'; +import createState from '~/ref/stores/state'; let mockBranchesReturnValue; let mockTagsReturnValue; diff --git a/spec/frontend/ref/stores/mutations_spec.js b/spec/frontend/ref/stores/mutations_spec.js index 78117436c33..cda13089766 100644 --- a/spec/frontend/ref/stores/mutations_spec.js +++ b/spec/frontend/ref/stores/mutations_spec.js @@ -1,7 +1,7 @@ -import createState from '~/ref/stores/state'; -import mutations from '~/ref/stores/mutations'; -import * as types from '~/ref/stores/mutation_types'; import { X_TOTAL_HEADER } from '~/ref/constants'; +import * as types from '~/ref/stores/mutation_types'; +import mutations from '~/ref/stores/mutations'; +import createState from '~/ref/stores/state'; describe('Ref selector Vuex store mutations', () => { let state; diff --git a/spec/frontend/registry/explorer/components/delete_button_spec.js b/spec/frontend/registry/explorer/components/delete_button_spec.js index cd43e97009b..a557d9afacc 100644 --- a/spec/frontend/registry/explorer/components/delete_button_spec.js +++ b/spec/frontend/registry/explorer/components/delete_button_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import component from '~/registry/explorer/components/delete_button.vue'; diff --git a/spec/frontend/registry/explorer/components/delete_image_spec.js b/spec/frontend/registry/explorer/components/delete_image_spec.js index 5c9ecf57a9f..9a0d070e42b 100644 --- a/spec/frontend/registry/explorer/components/delete_image_spec.js +++ b/spec/frontend/registry/explorer/components/delete_image_spec.js @@ -1,11 +1,10 @@ import { shallowMount } from '@vue/test-utils'; import waitForPromises from 'helpers/wait_for_promises'; import component from '~/registry/explorer/components/delete_image.vue'; +import { GRAPHQL_PAGE_SIZE } from '~/registry/explorer/constants/index'; import deleteContainerRepositoryMutation from '~/registry/explorer/graphql/mutations/delete_container_repository.mutation.graphql'; import getContainerRepositoryDetailsQuery from '~/registry/explorer/graphql/queries/get_container_repository_details.query.graphql'; -import { GRAPHQL_PAGE_SIZE } from '~/registry/explorer/constants/index'; - describe('Delete Image', () => { let wrapper; const id = '1'; diff --git a/spec/frontend/registry/explorer/components/details_page/delete_alert_spec.js b/spec/frontend/registry/explorer/components/details_page/delete_alert_spec.js index 6a7fbbe367a..c2a2a4e06ea 100644 --- a/spec/frontend/registry/explorer/components/details_page/delete_alert_spec.js +++ b/spec/frontend/registry/explorer/components/details_page/delete_alert_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlAlert, GlSprintf, GlLink } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import component from '~/registry/explorer/components/details_page/delete_alert.vue'; import { DELETE_TAG_SUCCESS_MESSAGE, diff --git a/spec/frontend/registry/explorer/components/details_page/delete_modal_spec.js b/spec/frontend/registry/explorer/components/details_page/delete_modal_spec.js index 85d7e87b8eb..8fe659694ba 100644 --- a/spec/frontend/registry/explorer/components/details_page/delete_modal_spec.js +++ b/spec/frontend/registry/explorer/components/details_page/delete_modal_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlSprintf } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import component from '~/registry/explorer/components/details_page/delete_modal.vue'; import { REMOVE_TAG_CONFIRMATION_TEXT, diff --git a/spec/frontend/registry/explorer/components/details_page/details_header_spec.js b/spec/frontend/registry/explorer/components/details_page/details_header_spec.js index 5885537542c..3fa3a2ae1de 100644 --- a/spec/frontend/registry/explorer/components/details_page/details_header_spec.js +++ b/spec/frontend/registry/explorer/components/details_page/details_header_spec.js @@ -1,7 +1,6 @@ -import { shallowMount } from '@vue/test-utils'; import { GlSprintf, GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { useFakeDate } from 'helpers/fake_date'; -import TitleArea from '~/vue_shared/components/registry/title_area.vue'; import component from '~/registry/explorer/components/details_page/details_header.vue'; import { DETAILS_PAGE_TITLE, @@ -15,6 +14,7 @@ import { CLEANUP_ONGOING_TOOLTIP, CLEANUP_UNFINISHED_TOOLTIP, } from '~/registry/explorer/constants'; +import TitleArea from '~/vue_shared/components/registry/title_area.vue'; describe('Details Header', () => { let wrapper; diff --git a/spec/frontend/registry/explorer/components/details_page/empty_state_spec.js b/spec/frontend/registry/explorer/components/details_page/empty_state_spec.js index 7739f111906..14b15945631 100644 --- a/spec/frontend/registry/explorer/components/details_page/empty_state_spec.js +++ b/spec/frontend/registry/explorer/components/details_page/empty_state_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlEmptyState } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import component from '~/registry/explorer/components/details_page/empty_state.vue'; import { NO_TAGS_TITLE, diff --git a/spec/frontend/registry/explorer/components/details_page/partial_cleanup_alert_spec.js b/spec/frontend/registry/explorer/components/details_page/partial_cleanup_alert_spec.js index 17821d8be31..af8a23e412c 100644 --- a/spec/frontend/registry/explorer/components/details_page/partial_cleanup_alert_spec.js +++ b/spec/frontend/registry/explorer/components/details_page/partial_cleanup_alert_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlAlert, GlSprintf } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import component from '~/registry/explorer/components/details_page/partial_cleanup_alert.vue'; import { DELETE_ALERT_TITLE, DELETE_ALERT_LINK_TEXT } from '~/registry/explorer/constants'; diff --git a/spec/frontend/registry/explorer/components/details_page/status_alert_spec.js b/spec/frontend/registry/explorer/components/details_page/status_alert_spec.js index 9bace6d2376..b079883cefd 100644 --- a/spec/frontend/registry/explorer/components/details_page/status_alert_spec.js +++ b/spec/frontend/registry/explorer/components/details_page/status_alert_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLink, GlSprintf, GlAlert } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import component from '~/registry/explorer/components/details_page/status_alert.vue'; import { DELETE_SCHEDULED, diff --git a/spec/frontend/registry/explorer/components/details_page/tags_list_row_spec.js b/spec/frontend/registry/explorer/components/details_page/tags_list_row_spec.js index c2efc71c159..8b70f84c1bd 100644 --- a/spec/frontend/registry/explorer/components/details_page/tags_list_row_spec.js +++ b/spec/frontend/registry/explorer/components/details_page/tags_list_row_spec.js @@ -1,12 +1,9 @@ -import { shallowMount } from '@vue/test-utils'; import { GlFormCheckbox, GlSprintf, GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; -import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; -import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; -import component from '~/registry/explorer/components/details_page/tags_list_row.vue'; import DeleteButton from '~/registry/explorer/components/delete_button.vue'; -import DetailsRow from '~/vue_shared/components/registry/details_row.vue'; +import component from '~/registry/explorer/components/details_page/tags_list_row.vue'; import { REMOVE_TAG_BUTTON_TITLE, REMOVE_TAG_BUTTON_DISABLE_TOOLTIP, @@ -14,6 +11,9 @@ import { NOT_AVAILABLE_TEXT, NOT_AVAILABLE_SIZE, } from '~/registry/explorer/constants/index'; +import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; +import DetailsRow from '~/vue_shared/components/registry/details_row.vue'; +import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import { tagsMock } from '../../mock_data'; import { ListItem } from '../../stubs'; diff --git a/spec/frontend/registry/explorer/components/details_page/tags_list_spec.js b/spec/frontend/registry/explorer/components/details_page/tags_list_spec.js index 6284eed39eb..dc6760a17bd 100644 --- a/spec/frontend/registry/explorer/components/details_page/tags_list_spec.js +++ b/spec/frontend/registry/explorer/components/details_page/tags_list_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import component from '~/registry/explorer/components/details_page/tags_list.vue'; import TagsListRow from '~/registry/explorer/components/details_page/tags_list_row.vue'; import { TAGS_LIST_TITLE, REMOVE_TAGS_BUTTON_TITLE } from '~/registry/explorer/constants/index'; diff --git a/spec/frontend/registry/explorer/components/list_page/cli_commands_spec.js b/spec/frontend/registry/explorer/components/list_page/cli_commands_spec.js index 74b9ea5fd96..8ca8fca65ed 100644 --- a/spec/frontend/registry/explorer/components/list_page/cli_commands_spec.js +++ b/spec/frontend/registry/explorer/components/list_page/cli_commands_spec.js @@ -1,9 +1,7 @@ -import Vuex from 'vuex'; -import { mount, createLocalVue } from '@vue/test-utils'; import { GlDropdown } from '@gitlab/ui'; -import Tracking from '~/tracking'; +import { mount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import QuickstartDropdown from '~/registry/explorer/components/list_page/cli_commands.vue'; -import CodeInstruction from '~/vue_shared/components/registry/code_instruction.vue'; import { QUICK_START, LOGIN_COMMAND_LABEL, @@ -13,6 +11,8 @@ import { PUSH_COMMAND_LABEL, COPY_PUSH_TITLE, } from '~/registry/explorer/constants'; +import Tracking from '~/tracking'; +import CodeInstruction from '~/vue_shared/components/registry/code_instruction.vue'; import { dockerCommands } from '../../mock_data'; diff --git a/spec/frontend/registry/explorer/components/list_page/group_empty_state_spec.js b/spec/frontend/registry/explorer/components/list_page/group_empty_state_spec.js index ffdc6b787cb..989a60625e2 100644 --- a/spec/frontend/registry/explorer/components/list_page/group_empty_state_spec.js +++ b/spec/frontend/registry/explorer/components/list_page/group_empty_state_spec.js @@ -1,6 +1,6 @@ -import Vuex from 'vuex'; -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { GlSprintf } from '@gitlab/ui'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import groupEmptyState from '~/registry/explorer/components/list_page/group_empty_state.vue'; import { GlEmptyState } from '../../stubs'; diff --git a/spec/frontend/registry/explorer/components/list_page/image_list_row_spec.js b/spec/frontend/registry/explorer/components/list_page/image_list_row_spec.js index a06c4795b2e..d6ee871341b 100644 --- a/spec/frontend/registry/explorer/components/list_page/image_list_row_spec.js +++ b/spec/frontend/registry/explorer/components/list_page/image_list_row_spec.js @@ -1,11 +1,9 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon, GlSprintf, GlSkeletonLoader } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; -import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; -import Component from '~/registry/explorer/components/list_page/image_list_row.vue'; -import ListItem from '~/vue_shared/components/registry/list_item.vue'; import DeleteButton from '~/registry/explorer/components/delete_button.vue'; +import Component from '~/registry/explorer/components/list_page/image_list_row.vue'; import { ROW_SCHEDULED_FOR_DELETION, LIST_DELETE_BUTTON_DISABLED, @@ -15,8 +13,10 @@ import { IMAGE_DELETE_SCHEDULED_STATUS, IMAGE_FAILED_DELETED_STATUS, } from '~/registry/explorer/constants'; -import { RouterLink } from '../../stubs'; +import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; +import ListItem from '~/vue_shared/components/registry/list_item.vue'; import { imagesListResponse } from '../../mock_data'; +import { RouterLink } from '../../stubs'; describe('Image List Row', () => { let wrapper; diff --git a/spec/frontend/registry/explorer/components/list_page/image_list_spec.js b/spec/frontend/registry/explorer/components/list_page/image_list_spec.js index 61c362f4d78..d7dd825ca3e 100644 --- a/spec/frontend/registry/explorer/components/list_page/image_list_spec.js +++ b/spec/frontend/registry/explorer/components/list_page/image_list_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlKeysetPagination } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import Component from '~/registry/explorer/components/list_page/image_list.vue'; import ImageListRow from '~/registry/explorer/components/list_page/image_list_row.vue'; diff --git a/spec/frontend/registry/explorer/components/list_page/project_empty_state_spec.js b/spec/frontend/registry/explorer/components/list_page/project_empty_state_spec.js index cbd1f1a99db..111aa45f231 100644 --- a/spec/frontend/registry/explorer/components/list_page/project_empty_state_spec.js +++ b/spec/frontend/registry/explorer/components/list_page/project_empty_state_spec.js @@ -1,9 +1,9 @@ -import Vuex from 'vuex'; -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { GlSprintf } from '@gitlab/ui'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import projectEmptyState from '~/registry/explorer/components/list_page/project_empty_state.vue'; -import { GlEmptyState } from '../../stubs'; import { dockerCommands } from '../../mock_data'; +import { GlEmptyState } from '../../stubs'; const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/spec/frontend/registry/explorer/components/list_page/registry_header_spec.js b/spec/frontend/registry/explorer/components/list_page/registry_header_spec.js index 58439c185e3..07256d2bbf5 100644 --- a/spec/frontend/registry/explorer/components/list_page/registry_header_spec.js +++ b/spec/frontend/registry/explorer/components/list_page/registry_header_spec.js @@ -1,13 +1,13 @@ -import { shallowMount } from '@vue/test-utils'; import { GlSprintf } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import Component from '~/registry/explorer/components/list_page/registry_header.vue'; -import TitleArea from '~/vue_shared/components/registry/title_area.vue'; import { CONTAINER_REGISTRY_TITLE, LIST_INTRO_TEXT, EXPIRATION_POLICY_DISABLED_MESSAGE, EXPIRATION_POLICY_DISABLED_TEXT, } from '~/registry/explorer/constants'; +import TitleArea from '~/vue_shared/components/registry/title_area.vue'; jest.mock('~/lib/utils/datetime_utility', () => ({ approximateDuration: jest.fn(), diff --git a/spec/frontend/registry/explorer/pages/details_spec.js b/spec/frontend/registry/explorer/pages/details_spec.js index 541db5f21c4..65c58bf9874 100644 --- a/spec/frontend/registry/explorer/pages/details_spec.js +++ b/spec/frontend/registry/explorer/pages/details_spec.js @@ -1,28 +1,28 @@ -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { GlKeysetPagination } from '@gitlab/ui'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; import VueApollo from 'vue-apollo'; import createMockApollo from 'helpers/mock_apollo_helper'; import waitForPromises from 'helpers/wait_for_promises'; -import Tracking from '~/tracking'; import axios from '~/lib/utils/axios_utils'; -import component from '~/registry/explorer/pages/details.vue'; +import DeleteImage from '~/registry/explorer/components/delete_image.vue'; import DeleteAlert from '~/registry/explorer/components/details_page/delete_alert.vue'; -import PartialCleanupAlert from '~/registry/explorer/components/details_page/partial_cleanup_alert.vue'; import DetailsHeader from '~/registry/explorer/components/details_page/details_header.vue'; -import TagsLoader from '~/registry/explorer/components/details_page/tags_loader.vue'; -import TagsList from '~/registry/explorer/components/details_page/tags_list.vue'; import EmptyTagsState from '~/registry/explorer/components/details_page/empty_state.vue'; +import PartialCleanupAlert from '~/registry/explorer/components/details_page/partial_cleanup_alert.vue'; import StatusAlert from '~/registry/explorer/components/details_page/status_alert.vue'; -import DeleteImage from '~/registry/explorer/components/delete_image.vue'; - -import getContainerRepositoryDetailsQuery from '~/registry/explorer/graphql/queries/get_container_repository_details.query.graphql'; -import deleteContainerRepositoryTagsMutation from '~/registry/explorer/graphql/mutations/delete_container_repository_tags.mutation.graphql'; +import TagsList from '~/registry/explorer/components/details_page/tags_list.vue'; +import TagsLoader from '~/registry/explorer/components/details_page/tags_loader.vue'; import { UNFINISHED_STATUS, DELETE_SCHEDULED, ALERT_DANGER_IMAGE, } from '~/registry/explorer/constants'; +import deleteContainerRepositoryTagsMutation from '~/registry/explorer/graphql/mutations/delete_container_repository_tags.mutation.graphql'; +import getContainerRepositoryDetailsQuery from '~/registry/explorer/graphql/queries/get_container_repository_details.query.graphql'; + +import component from '~/registry/explorer/pages/details.vue'; +import Tracking from '~/tracking'; import { graphQLImageDetailsMock, diff --git a/spec/frontend/registry/explorer/pages/list_spec.js b/spec/frontend/registry/explorer/pages/list_spec.js index 5fbe58e35e2..f7f207cc183 100644 --- a/spec/frontend/registry/explorer/pages/list_spec.js +++ b/spec/frontend/registry/explorer/pages/list_spec.js @@ -1,29 +1,28 @@ +import { GlSkeletonLoader, GlSprintf, GlAlert } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import VueApollo from 'vue-apollo'; -import { GlSkeletonLoader, GlSprintf, GlAlert } from '@gitlab/ui'; import createMockApollo from 'helpers/mock_apollo_helper'; import waitForPromises from 'helpers/wait_for_promises'; import getContainerRepositoriesQuery from 'shared_queries/container_registry/get_container_repositories.query.graphql'; -import Tracking from '~/tracking'; -import component from '~/registry/explorer/pages/list.vue'; +import DeleteImage from '~/registry/explorer/components/delete_image.vue'; import CliCommands from '~/registry/explorer/components/list_page/cli_commands.vue'; import GroupEmptyState from '~/registry/explorer/components/list_page/group_empty_state.vue'; +import ImageList from '~/registry/explorer/components/list_page/image_list.vue'; import ProjectEmptyState from '~/registry/explorer/components/list_page/project_empty_state.vue'; import RegistryHeader from '~/registry/explorer/components/list_page/registry_header.vue'; -import ImageList from '~/registry/explorer/components/list_page/image_list.vue'; -import DeleteImage from '~/registry/explorer/components/delete_image.vue'; -import TitleArea from '~/vue_shared/components/registry/title_area.vue'; -import RegistrySearch from '~/vue_shared/components/registry/registry_search.vue'; - import { DELETE_IMAGE_SUCCESS_MESSAGE, DELETE_IMAGE_ERROR_MESSAGE, SORT_FIELDS, } from '~/registry/explorer/constants'; - -import getContainerRepositoriesDetails from '~/registry/explorer/graphql/queries/get_container_repositories_details.query.graphql'; import deleteContainerRepositoryMutation from '~/registry/explorer/graphql/mutations/delete_container_repository.mutation.graphql'; +import getContainerRepositoriesDetails from '~/registry/explorer/graphql/queries/get_container_repositories_details.query.graphql'; +import component from '~/registry/explorer/pages/list.vue'; +import Tracking from '~/tracking'; +import RegistrySearch from '~/vue_shared/components/registry/registry_search.vue'; +import TitleArea from '~/vue_shared/components/registry/title_area.vue'; +import { $toast } from '../../shared/mocks'; import { graphQLImageListMock, graphQLImageDeleteMock, @@ -35,7 +34,6 @@ import { dockerCommands, } from '../mock_data'; import { GlModal, GlEmptyState } from '../stubs'; -import { $toast } from '../../shared/mocks'; const localVue = createLocalVue(); diff --git a/spec/frontend/registry/settings/components/expiration_input_spec.js b/spec/frontend/registry/settings/components/expiration_input_spec.js index 383158067dc..b91599a2789 100644 --- a/spec/frontend/registry/settings/components/expiration_input_spec.js +++ b/spec/frontend/registry/settings/components/expiration_input_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlSprintf, GlFormInput, GlLink } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { GlFormGroup } from 'jest/registry/shared/stubs'; import component from '~/registry/settings/components/expiration_input.vue'; import { NAME_REGEX_LENGTH } from '~/registry/settings/constants'; diff --git a/spec/frontend/registry/settings/components/expiration_run_text_spec.js b/spec/frontend/registry/settings/components/expiration_run_text_spec.js index d74ee2d1c18..753bb10ad08 100644 --- a/spec/frontend/registry/settings/components/expiration_run_text_spec.js +++ b/spec/frontend/registry/settings/components/expiration_run_text_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlFormInput } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { GlFormGroup } from 'jest/registry/shared/stubs'; import component from '~/registry/settings/components/expiration_run_text.vue'; import { NEXT_CLEANUP_LABEL, NOT_SCHEDULED_POLICY_TEXT } from '~/registry/settings/constants'; diff --git a/spec/frontend/registry/settings/components/expiration_toggle_spec.js b/spec/frontend/registry/settings/components/expiration_toggle_spec.js index ce016e852ee..961bdfdf2c5 100644 --- a/spec/frontend/registry/settings/components/expiration_toggle_spec.js +++ b/spec/frontend/registry/settings/components/expiration_toggle_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlToggle, GlSprintf } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { GlFormGroup } from 'jest/registry/shared/stubs'; import component from '~/registry/settings/components/expiration_toggle.vue'; import { diff --git a/spec/frontend/registry/settings/components/registry_settings_app_spec.js b/spec/frontend/registry/settings/components/registry_settings_app_spec.js index 32d4f16221d..fd53efa884f 100644 --- a/spec/frontend/registry/settings/components/registry_settings_app_spec.js +++ b/spec/frontend/registry/settings/components/registry_settings_app_spec.js @@ -1,15 +1,15 @@ +import { GlAlert, GlSprintf, GlLink } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import VueApollo from 'vue-apollo'; -import { GlAlert, GlSprintf, GlLink } from '@gitlab/ui'; import createMockApollo from 'helpers/mock_apollo_helper'; import component from '~/registry/settings/components/registry_settings_app.vue'; -import expirationPolicyQuery from '~/registry/settings/graphql/queries/get_expiration_policy.query.graphql'; import SettingsForm from '~/registry/settings/components/settings_form.vue'; import { FETCH_SETTINGS_ERROR_MESSAGE, UNAVAILABLE_FEATURE_INTRO_TEXT, UNAVAILABLE_USER_FEATURE_TEXT, } from '~/registry/settings/constants'; +import expirationPolicyQuery from '~/registry/settings/graphql/queries/get_expiration_policy.query.graphql'; import { expirationPolicyPayload, diff --git a/spec/frontend/registry/settings/components/settings_form_spec.js b/spec/frontend/registry/settings/components/settings_form_spec.js index 626f4fcc9f5..7527910ad59 100644 --- a/spec/frontend/registry/settings/components/settings_form_spec.js +++ b/spec/frontend/registry/settings/components/settings_form_spec.js @@ -2,14 +2,14 @@ import { shallowMount, createLocalVue } from '@vue/test-utils'; import VueApollo from 'vue-apollo'; import createMockApollo from 'helpers/mock_apollo_helper'; import waitForPromises from 'helpers/wait_for_promises'; -import Tracking from '~/tracking'; import component from '~/registry/settings/components/settings_form.vue'; -import updateContainerExpirationPolicyMutation from '~/registry/settings/graphql/mutations/update_container_expiration_policy.mutation.graphql'; -import expirationPolicyQuery from '~/registry/settings/graphql/queries/get_expiration_policy.query.graphql'; import { UPDATE_SETTINGS_ERROR_MESSAGE, UPDATE_SETTINGS_SUCCESS_MESSAGE, } from '~/registry/settings/constants'; +import updateContainerExpirationPolicyMutation from '~/registry/settings/graphql/mutations/update_container_expiration_policy.mutation.graphql'; +import expirationPolicyQuery from '~/registry/settings/graphql/queries/get_expiration_policy.query.graphql'; +import Tracking from '~/tracking'; import { GlCard, GlLoadingIcon } from '../../shared/stubs'; import { expirationPolicyPayload, expirationPolicyMutationPayload } from '../mock_data'; diff --git a/spec/frontend/registry/settings/graphql/cache_updated_spec.js b/spec/frontend/registry/settings/graphql/cache_updated_spec.js index d88a5576f26..73655b6917b 100644 --- a/spec/frontend/registry/settings/graphql/cache_updated_spec.js +++ b/spec/frontend/registry/settings/graphql/cache_updated_spec.js @@ -1,5 +1,5 @@ -import { updateContainerExpirationPolicy } from '~/registry/settings/graphql/utils/cache_update'; import expirationPolicyQuery from '~/registry/settings/graphql/queries/get_expiration_policy.query.graphql'; +import { updateContainerExpirationPolicy } from '~/registry/settings/graphql/utils/cache_update'; describe('Registry settings cache update', () => { let client; diff --git a/spec/frontend/related_merge_requests/components/related_merge_requests_spec.js b/spec/frontend/related_merge_requests/components/related_merge_requests_spec.js index c084410c65b..f306fdef624 100644 --- a/spec/frontend/related_merge_requests/components/related_merge_requests_spec.js +++ b/spec/frontend/related_merge_requests/components/related_merge_requests_spec.js @@ -1,9 +1,9 @@ import { mount, createLocalVue } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import axios from '~/lib/utils/axios_utils'; -import RelatedIssuableItem from '~/vue_shared/components/issue/related_issuable_item.vue'; import RelatedMergeRequests from '~/related_merge_requests/components/related_merge_requests.vue'; import createStore from '~/related_merge_requests/store/index'; +import RelatedIssuableItem from '~/vue_shared/components/issue/related_issuable_item.vue'; const FIXTURE_PATH = 'issues/related_merge_requests.json'; const API_ENDPOINT = '/api/v4/projects/2/issues/33/related_merge_requests'; diff --git a/spec/frontend/related_merge_requests/store/actions_spec.js b/spec/frontend/related_merge_requests/store/actions_spec.js index a4257d67176..a14096388e6 100644 --- a/spec/frontend/related_merge_requests/store/actions_spec.js +++ b/spec/frontend/related_merge_requests/store/actions_spec.js @@ -2,8 +2,8 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; -import * as types from '~/related_merge_requests/store/mutation_types'; import * as actions from '~/related_merge_requests/store/actions'; +import * as types from '~/related_merge_requests/store/mutation_types'; jest.mock('~/flash'); diff --git a/spec/frontend/related_merge_requests/store/mutations_spec.js b/spec/frontend/related_merge_requests/store/mutations_spec.js index 21b6e26376b..436c7dca6ce 100644 --- a/spec/frontend/related_merge_requests/store/mutations_spec.js +++ b/spec/frontend/related_merge_requests/store/mutations_spec.js @@ -1,5 +1,5 @@ -import mutations from '~/related_merge_requests/store/mutations'; import * as types from '~/related_merge_requests/store/mutation_types'; +import mutations from '~/related_merge_requests/store/mutations'; describe('RelatedMergeRequests Store Mutations', () => { describe('SET_INITIAL_STATE', () => { diff --git a/spec/frontend/releases/components/app_edit_new_spec.js b/spec/frontend/releases/components/app_edit_new_spec.js index 828d1b46a80..1e55ab8f9e4 100644 --- a/spec/frontend/releases/components/app_edit_new_spec.js +++ b/spec/frontend/releases/components/app_edit_new_spec.js @@ -1,13 +1,13 @@ -import Vuex from 'vuex'; import { mount } from '@vue/test-utils'; -import { merge } from 'lodash'; import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; +import { merge } from 'lodash'; +import Vuex from 'vuex'; import { getJSONFixture } from 'helpers/fixtures'; -import ReleaseEditNewApp from '~/releases/components/app_edit_new.vue'; import * as commonUtils from '~/lib/utils/common_utils'; -import { BACK_URL_PARAM } from '~/releases/constants'; +import ReleaseEditNewApp from '~/releases/components/app_edit_new.vue'; import AssetLinksForm from '~/releases/components/asset_links_form.vue'; +import { BACK_URL_PARAM } from '~/releases/constants'; const originalRelease = getJSONFixture('api/releases/release.json'); const originalMilestones = originalRelease.milestones; diff --git a/spec/frontend/releases/components/app_index_spec.js b/spec/frontend/releases/components/app_index_spec.js index 3c5ee212225..2b5270e29d6 100644 --- a/spec/frontend/releases/components/app_index_spec.js +++ b/spec/frontend/releases/components/app_index_spec.js @@ -1,14 +1,14 @@ +import { shallowMount, createLocalVue } from '@vue/test-utils'; import { range as rge } from 'lodash'; import Vuex from 'vuex'; -import { shallowMount, createLocalVue } from '@vue/test-utils'; -import waitForPromises from 'helpers/wait_for_promises'; import { getJSONFixture } from 'helpers/fixtures'; -import ReleasesApp from '~/releases/components/app_index.vue'; -import createStore from '~/releases/stores'; -import createListModule from '~/releases/stores/modules/list'; +import waitForPromises from 'helpers/wait_for_promises'; import api from '~/api'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; +import ReleasesApp from '~/releases/components/app_index.vue'; import ReleasesPagination from '~/releases/components/releases_pagination.vue'; +import createStore from '~/releases/stores'; +import createListModule from '~/releases/stores/modules/list'; import { pageInfoHeadersWithoutPagination, pageInfoHeadersWithPagination } from '../mock_data'; jest.mock('~/lib/utils/common_utils', () => ({ diff --git a/spec/frontend/releases/components/app_show_spec.js b/spec/frontend/releases/components/app_show_spec.js index b1f94ca9859..5caea395f0a 100644 --- a/spec/frontend/releases/components/app_show_spec.js +++ b/spec/frontend/releases/components/app_show_spec.js @@ -1,10 +1,10 @@ -import Vuex from 'vuex'; import { shallowMount } from '@vue/test-utils'; +import Vuex from 'vuex'; import { getJSONFixture } from 'helpers/fixtures'; +import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import ReleaseShowApp from '~/releases/components/app_show.vue'; -import ReleaseSkeletonLoader from '~/releases/components/release_skeleton_loader.vue'; import ReleaseBlock from '~/releases/components/release_block.vue'; -import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; +import ReleaseSkeletonLoader from '~/releases/components/release_skeleton_loader.vue'; const originalRelease = getJSONFixture('api/releases/release.json'); diff --git a/spec/frontend/releases/components/asset_links_form_spec.js b/spec/frontend/releases/components/asset_links_form_spec.js index 2b2ad0150ab..bbaa4e9dc94 100644 --- a/spec/frontend/releases/components/asset_links_form_spec.js +++ b/spec/frontend/releases/components/asset_links_form_spec.js @@ -1,9 +1,9 @@ -import Vuex from 'vuex'; import { mount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import { getJSONFixture } from 'helpers/fixtures'; -import AssetLinksForm from '~/releases/components/asset_links_form.vue'; import * as commonUtils from '~/lib/utils/common_utils'; import { ENTER_KEY } from '~/lib/utils/keys'; +import AssetLinksForm from '~/releases/components/asset_links_form.vue'; import { ASSET_LINK_TYPE, DEFAULT_ASSET_LINK_TYPE } from '~/releases/constants'; const localVue = createLocalVue(); diff --git a/spec/frontend/releases/components/evidence_block_spec.js b/spec/frontend/releases/components/evidence_block_spec.js index b8c78f90fc2..50b6d1c4707 100644 --- a/spec/frontend/releases/components/evidence_block_spec.js +++ b/spec/frontend/releases/components/evidence_block_spec.js @@ -1,10 +1,10 @@ -import { mount } from '@vue/test-utils'; import { GlLink, GlIcon } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import { getJSONFixture } from 'helpers/fixtures'; +import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { truncateSha } from '~/lib/utils/text_utility'; import EvidenceBlock from '~/releases/components/evidence_block.vue'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; -import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; const originalRelease = getJSONFixture('api/releases/release.json'); diff --git a/spec/frontend/releases/components/release_block_assets_spec.js b/spec/frontend/releases/components/release_block_assets_spec.js index 77bd35f94aa..3b9b16fa890 100644 --- a/spec/frontend/releases/components/release_block_assets_spec.js +++ b/spec/frontend/releases/components/release_block_assets_spec.js @@ -1,7 +1,7 @@ -import { mount } from '@vue/test-utils'; import { GlCollapse } from '@gitlab/ui'; -import { trimText } from 'helpers/text_helper'; +import { mount } from '@vue/test-utils'; import { getJSONFixture } from 'helpers/fixtures'; +import { trimText } from 'helpers/text_helper'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import ReleaseBlockAssets from '~/releases/components/release_block_assets.vue'; import { ASSET_LINK_TYPE } from '~/releases/constants'; diff --git a/spec/frontend/releases/components/release_block_footer_spec.js b/spec/frontend/releases/components/release_block_footer_spec.js index cf2f71a78f9..e9fa22b4ec7 100644 --- a/spec/frontend/releases/components/release_block_footer_spec.js +++ b/spec/frontend/releases/components/release_block_footer_spec.js @@ -1,10 +1,10 @@ -import { mount } from '@vue/test-utils'; import { GlLink, GlIcon } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import { cloneDeep } from 'lodash'; -import { trimText } from 'helpers/text_helper'; import { getJSONFixture } from 'helpers/fixtures'; -import ReleaseBlockFooter from '~/releases/components/release_block_footer.vue'; +import { trimText } from 'helpers/text_helper'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; +import ReleaseBlockFooter from '~/releases/components/release_block_footer.vue'; const originalRelease = getJSONFixture('api/releases/release.json'); diff --git a/spec/frontend/releases/components/release_block_header_spec.js b/spec/frontend/releases/components/release_block_header_spec.js index f2159871395..0f6657090e6 100644 --- a/spec/frontend/releases/components/release_block_header_spec.js +++ b/spec/frontend/releases/components/release_block_header_spec.js @@ -1,9 +1,9 @@ +import { GlLink } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import { merge } from 'lodash'; -import { GlLink } from '@gitlab/ui'; import { getJSONFixture } from 'helpers/fixtures'; -import ReleaseBlockHeader from '~/releases/components/release_block_header.vue'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; +import ReleaseBlockHeader from '~/releases/components/release_block_header.vue'; import { BACK_URL_PARAM } from '~/releases/constants'; const originalRelease = getJSONFixture('api/releases/release.json'); diff --git a/spec/frontend/releases/components/release_block_milestone_info_spec.js b/spec/frontend/releases/components/release_block_milestone_info_spec.js index 4eb15e9da12..47fe10af946 100644 --- a/spec/frontend/releases/components/release_block_milestone_info_spec.js +++ b/spec/frontend/releases/components/release_block_milestone_info_spec.js @@ -1,10 +1,10 @@ -import { mount } from '@vue/test-utils'; import { GlProgressBar, GlLink, GlBadge, GlButton } from '@gitlab/ui'; -import { trimText } from 'helpers/text_helper'; +import { mount } from '@vue/test-utils'; import { getJSONFixture } from 'helpers/fixtures'; +import { trimText } from 'helpers/text_helper'; +import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import ReleaseBlockMilestoneInfo from '~/releases/components/release_block_milestone_info.vue'; import { MAX_MILESTONES_TO_DISPLAY } from '~/releases/constants'; -import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; const { milestones: originalMilestones } = getJSONFixture('api/releases/release.json'); diff --git a/spec/frontend/releases/components/release_block_spec.js b/spec/frontend/releases/components/release_block_spec.js index 633c6690529..1ca441f7a5a 100644 --- a/spec/frontend/releases/components/release_block_spec.js +++ b/spec/frontend/releases/components/release_block_spec.js @@ -1,13 +1,13 @@ -import $ from 'jquery'; import { mount } from '@vue/test-utils'; +import $ from 'jquery'; import { getJSONFixture } from 'helpers/fixtures'; +import * as commonUtils from '~/lib/utils/common_utils'; +import * as urlUtility from '~/lib/utils/url_utility'; import EvidenceBlock from '~/releases/components/evidence_block.vue'; import ReleaseBlock from '~/releases/components/release_block.vue'; import ReleaseBlockFooter from '~/releases/components/release_block_footer.vue'; -import timeagoMixin from '~/vue_shared/mixins/timeago'; -import * as commonUtils from '~/lib/utils/common_utils'; import { BACK_URL_PARAM } from '~/releases/constants'; -import * as urlUtility from '~/lib/utils/url_utility'; +import timeagoMixin from '~/vue_shared/mixins/timeago'; const originalRelease = getJSONFixture('api/releases/release.json'); diff --git a/spec/frontend/releases/components/release_skeleton_loader_spec.js b/spec/frontend/releases/components/release_skeleton_loader_spec.js index 7fbf864568a..7f81081ff6c 100644 --- a/spec/frontend/releases/components/release_skeleton_loader_spec.js +++ b/spec/frontend/releases/components/release_skeleton_loader_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlSkeletonLoader } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import ReleaseSkeletonLoader from '~/releases/components/release_skeleton_loader.vue'; describe('release_skeleton_loader.vue', () => { diff --git a/spec/frontend/releases/components/releases_pagination_graphql_spec.js b/spec/frontend/releases/components/releases_pagination_graphql_spec.js index cee5e72e1c0..de80d82e93c 100644 --- a/spec/frontend/releases/components/releases_pagination_graphql_spec.js +++ b/spec/frontend/releases/components/releases_pagination_graphql_spec.js @@ -1,9 +1,9 @@ -import Vuex from 'vuex'; import { mount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; +import { historyPushState } from '~/lib/utils/common_utils'; +import ReleasesPaginationGraphql from '~/releases/components/releases_pagination_graphql.vue'; import createStore from '~/releases/stores'; import createListModule from '~/releases/stores/modules/list'; -import ReleasesPaginationGraphql from '~/releases/components/releases_pagination_graphql.vue'; -import { historyPushState } from '~/lib/utils/common_utils'; jest.mock('~/lib/utils/common_utils', () => ({ ...jest.requireActual('~/lib/utils/common_utils'), diff --git a/spec/frontend/releases/components/releases_pagination_rest_spec.js b/spec/frontend/releases/components/releases_pagination_rest_spec.js index b015792c96b..6f2690f5322 100644 --- a/spec/frontend/releases/components/releases_pagination_rest_spec.js +++ b/spec/frontend/releases/components/releases_pagination_rest_spec.js @@ -1,10 +1,10 @@ -import Vuex from 'vuex'; -import { mount, createLocalVue } from '@vue/test-utils'; import { GlPagination } from '@gitlab/ui'; +import { mount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; +import * as commonUtils from '~/lib/utils/common_utils'; import ReleasesPaginationRest from '~/releases/components/releases_pagination_rest.vue'; import createStore from '~/releases/stores'; import createListModule from '~/releases/stores/modules/list'; -import * as commonUtils from '~/lib/utils/common_utils'; commonUtils.historyPushState = jest.fn(); diff --git a/spec/frontend/releases/components/releases_sort_spec.js b/spec/frontend/releases/components/releases_sort_spec.js index c089ee3cc38..f17c6678592 100644 --- a/spec/frontend/releases/components/releases_sort_spec.js +++ b/spec/frontend/releases/components/releases_sort_spec.js @@ -1,6 +1,6 @@ -import Vuex from 'vuex'; import { GlSorting, GlSortingItem } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import ReleasesSort from '~/releases/components/releases_sort.vue'; import createStore from '~/releases/stores'; import createListModule from '~/releases/stores/modules/list'; diff --git a/spec/frontend/releases/components/tag_field_exsting_spec.js b/spec/frontend/releases/components/tag_field_exsting_spec.js index d4110b57776..cef7a0272a6 100644 --- a/spec/frontend/releases/components/tag_field_exsting_spec.js +++ b/spec/frontend/releases/components/tag_field_exsting_spec.js @@ -1,6 +1,6 @@ -import Vuex from 'vuex'; import { GlFormInput } from '@gitlab/ui'; import { shallowMount, mount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import TagFieldExisting from '~/releases/components/tag_field_existing.vue'; import createStore from '~/releases/stores'; import createDetailModule from '~/releases/stores/modules/detail'; diff --git a/spec/frontend/releases/components/tag_field_new_spec.js b/spec/frontend/releases/components/tag_field_new_spec.js index eba0e286b27..d87718138b8 100644 --- a/spec/frontend/releases/components/tag_field_new_spec.js +++ b/spec/frontend/releases/components/tag_field_new_spec.js @@ -1,9 +1,9 @@ -import { mount, shallowMount } from '@vue/test-utils'; import { GlFormInput } from '@gitlab/ui'; +import { mount, shallowMount } from '@vue/test-utils'; +import RefSelector from '~/ref/components/ref_selector.vue'; import TagFieldNew from '~/releases/components/tag_field_new.vue'; import createStore from '~/releases/stores'; import createDetailModule from '~/releases/stores/modules/detail'; -import RefSelector from '~/ref/components/ref_selector.vue'; const TEST_TAG_NAME = 'test-tag-name'; const TEST_PROJECT_ID = '1234'; diff --git a/spec/frontend/releases/components/tag_field_spec.js b/spec/frontend/releases/components/tag_field_spec.js index c7909a2369b..2cf5944f9e6 100644 --- a/spec/frontend/releases/components/tag_field_spec.js +++ b/spec/frontend/releases/components/tag_field_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; import TagField from '~/releases/components/tag_field.vue'; -import TagFieldNew from '~/releases/components/tag_field_new.vue'; import TagFieldExisting from '~/releases/components/tag_field_existing.vue'; +import TagFieldNew from '~/releases/components/tag_field_new.vue'; import createStore from '~/releases/stores'; import createDetailModule from '~/releases/stores/modules/detail'; diff --git a/spec/frontend/releases/stores/modules/detail/actions_spec.js b/spec/frontend/releases/stores/modules/detail/actions_spec.js index 39c00ae69fe..9c125fbb87b 100644 --- a/spec/frontend/releases/stores/modules/detail/actions_spec.js +++ b/spec/frontend/releases/stores/modules/detail/actions_spec.js @@ -1,17 +1,17 @@ import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; import { cloneDeep } from 'lodash'; -import testAction from 'helpers/vuex_action_helper'; import { getJSONFixture } from 'helpers/fixtures'; -import * as actions from '~/releases/stores/modules/detail/actions'; -import * as types from '~/releases/stores/modules/detail/mutation_types'; -import createState from '~/releases/stores/modules/detail/state'; +import testAction from 'helpers/vuex_action_helper'; +import api from '~/api'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; -import { redirectTo } from '~/lib/utils/url_utility'; -import api from '~/api'; import httpStatus from '~/lib/utils/http_status'; +import { redirectTo } from '~/lib/utils/url_utility'; import { ASSET_LINK_TYPE } from '~/releases/constants'; +import * as actions from '~/releases/stores/modules/detail/actions'; +import * as types from '~/releases/stores/modules/detail/mutation_types'; +import createState from '~/releases/stores/modules/detail/state'; import { releaseToApiJson, apiJsonToRelease } from '~/releases/util'; jest.mock('~/flash'); diff --git a/spec/frontend/releases/stores/modules/detail/mutations_spec.js b/spec/frontend/releases/stores/modules/detail/mutations_spec.js index 88eddc4019c..cdf26bfa834 100644 --- a/spec/frontend/releases/stores/modules/detail/mutations_spec.js +++ b/spec/frontend/releases/stores/modules/detail/mutations_spec.js @@ -1,9 +1,9 @@ import { getJSONFixture } from 'helpers/fixtures'; -import createState from '~/releases/stores/modules/detail/state'; -import mutations from '~/releases/stores/modules/detail/mutations'; -import * as types from '~/releases/stores/modules/detail/mutation_types'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; import { ASSET_LINK_TYPE, DEFAULT_ASSET_LINK_TYPE } from '~/releases/constants'; +import * as types from '~/releases/stores/modules/detail/mutation_types'; +import mutations from '~/releases/stores/modules/detail/mutations'; +import createState from '~/releases/stores/modules/detail/state'; const originalRelease = getJSONFixture('api/releases/release.json'); diff --git a/spec/frontend/releases/stores/modules/list/actions_spec.js b/spec/frontend/releases/stores/modules/list/actions_spec.js index 278c8b3b3d3..309f7387929 100644 --- a/spec/frontend/releases/stores/modules/list/actions_spec.js +++ b/spec/frontend/releases/stores/modules/list/actions_spec.js @@ -1,6 +1,14 @@ import { cloneDeep } from 'lodash'; -import testAction from 'helpers/vuex_action_helper'; import { getJSONFixture } from 'helpers/fixtures'; +import testAction from 'helpers/vuex_action_helper'; +import api from '~/api'; +import { + normalizeHeaders, + parseIntPagination, + convertObjectPropsToCamelCase, +} from '~/lib/utils/common_utils'; +import { PAGE_SIZE } from '~/releases/constants'; +import allReleasesQuery from '~/releases/queries/all_releases.query.graphql'; import { fetchReleases, fetchReleasesGraphQl, @@ -8,17 +16,9 @@ import { receiveReleasesError, setSorting, } from '~/releases/stores/modules/list/actions'; -import createState from '~/releases/stores/modules/list/state'; import * as types from '~/releases/stores/modules/list/mutation_types'; -import api from '~/api'; +import createState from '~/releases/stores/modules/list/state'; import { gqClient, convertAllReleasesGraphQLResponse } from '~/releases/util'; -import { - normalizeHeaders, - parseIntPagination, - convertObjectPropsToCamelCase, -} from '~/lib/utils/common_utils'; -import allReleasesQuery from '~/releases/queries/all_releases.query.graphql'; -import { PAGE_SIZE } from '~/releases/constants'; import { pageInfoHeadersWithoutPagination } from '../../../mock_data'; const originalRelease = getJSONFixture('api/releases/release.json'); diff --git a/spec/frontend/releases/stores/modules/list/mutations_spec.js b/spec/frontend/releases/stores/modules/list/mutations_spec.js index 7eb78b23b7b..ea6a4ada16a 100644 --- a/spec/frontend/releases/stores/modules/list/mutations_spec.js +++ b/spec/frontend/releases/stores/modules/list/mutations_spec.js @@ -1,8 +1,8 @@ import { getJSONFixture } from 'helpers/fixtures'; -import createState from '~/releases/stores/modules/list/state'; -import mutations from '~/releases/stores/modules/list/mutations'; -import * as types from '~/releases/stores/modules/list/mutation_types'; import { parseIntPagination, convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; +import * as types from '~/releases/stores/modules/list/mutation_types'; +import mutations from '~/releases/stores/modules/list/mutations'; +import createState from '~/releases/stores/modules/list/state'; import { convertAllReleasesGraphQLResponse } from '~/releases/util'; import { pageInfoHeadersWithoutPagination } from '../../../mock_data'; diff --git a/spec/frontend/reports/accessibility_report/grouped_accessibility_reports_app_spec.js b/spec/frontend/reports/accessibility_report/grouped_accessibility_reports_app_spec.js index ccceb78f2d1..b716d54c9fc 100644 --- a/spec/frontend/reports/accessibility_report/grouped_accessibility_reports_app_spec.js +++ b/spec/frontend/reports/accessibility_report/grouped_accessibility_reports_app_spec.js @@ -1,7 +1,7 @@ import { mount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import GroupedAccessibilityReportsApp from '~/reports/accessibility_report/grouped_accessibility_reports_app.vue'; import AccessibilityIssueBody from '~/reports/accessibility_report/components/accessibility_issue_body.vue'; +import GroupedAccessibilityReportsApp from '~/reports/accessibility_report/grouped_accessibility_reports_app.vue'; import { getStoreConfig } from '~/reports/accessibility_report/store'; import { mockReport } from './mock_data'; diff --git a/spec/frontend/reports/accessibility_report/store/actions_spec.js b/spec/frontend/reports/accessibility_report/store/actions_spec.js index 4e607fa5a76..46dbe1ff7a1 100644 --- a/spec/frontend/reports/accessibility_report/store/actions_spec.js +++ b/spec/frontend/reports/accessibility_report/store/actions_spec.js @@ -1,10 +1,10 @@ import MockAdapter from 'axios-mock-adapter'; -import { TEST_HOST } from 'spec/test_constants'; import testAction from 'helpers/vuex_action_helper'; +import { TEST_HOST } from 'spec/test_constants'; import axios from '~/lib/utils/axios_utils'; +import createStore from '~/reports/accessibility_report/store'; import * as actions from '~/reports/accessibility_report/store/actions'; import * as types from '~/reports/accessibility_report/store/mutation_types'; -import createStore from '~/reports/accessibility_report/store'; import { mockReport } from '../mock_data'; describe('Accessibility Reports actions', () => { diff --git a/spec/frontend/reports/accessibility_report/store/getters_spec.js b/spec/frontend/reports/accessibility_report/store/getters_spec.js index d74c71cfa09..96344596003 100644 --- a/spec/frontend/reports/accessibility_report/store/getters_spec.js +++ b/spec/frontend/reports/accessibility_report/store/getters_spec.js @@ -1,5 +1,5 @@ -import * as getters from '~/reports/accessibility_report/store/getters'; import createStore from '~/reports/accessibility_report/store'; +import * as getters from '~/reports/accessibility_report/store/getters'; import { LOADING, ERROR, SUCCESS, STATUS_FAILED } from '~/reports/constants'; describe('Accessibility reports store getters', () => { diff --git a/spec/frontend/reports/accessibility_report/store/mutations_spec.js b/spec/frontend/reports/accessibility_report/store/mutations_spec.js index a4e9571b721..b336261d804 100644 --- a/spec/frontend/reports/accessibility_report/store/mutations_spec.js +++ b/spec/frontend/reports/accessibility_report/store/mutations_spec.js @@ -1,5 +1,5 @@ -import mutations from '~/reports/accessibility_report/store/mutations'; import createStore from '~/reports/accessibility_report/store'; +import mutations from '~/reports/accessibility_report/store/mutations'; describe('Accessibility Reports mutations', () => { let localState; diff --git a/spec/frontend/reports/codequality_report/grouped_codequality_reports_app_spec.js b/spec/frontend/reports/codequality_report/grouped_codequality_reports_app_spec.js index fb743c8b90c..f0b23bb7b58 100644 --- a/spec/frontend/reports/codequality_report/grouped_codequality_reports_app_spec.js +++ b/spec/frontend/reports/codequality_report/grouped_codequality_reports_app_spec.js @@ -1,7 +1,7 @@ import { mount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import GroupedCodequalityReportsApp from '~/reports/codequality_report/grouped_codequality_reports_app.vue'; import CodequalityIssueBody from '~/reports/codequality_report/components/codequality_issue_body.vue'; +import GroupedCodequalityReportsApp from '~/reports/codequality_report/grouped_codequality_reports_app.vue'; import { getStoreConfig } from '~/reports/codequality_report/store'; import { mockParsedHeadIssues, mockParsedBaseIssues } from './mock_data'; diff --git a/spec/frontend/reports/codequality_report/store/actions_spec.js b/spec/frontend/reports/codequality_report/store/actions_spec.js index 6ff6bae1284..a2b256448ef 100644 --- a/spec/frontend/reports/codequality_report/store/actions_spec.js +++ b/spec/frontend/reports/codequality_report/store/actions_spec.js @@ -1,10 +1,10 @@ import MockAdapter from 'axios-mock-adapter'; -import { TEST_HOST } from 'spec/test_constants'; import testAction from 'helpers/vuex_action_helper'; +import { TEST_HOST } from 'spec/test_constants'; import axios from '~/lib/utils/axios_utils'; +import createStore from '~/reports/codequality_report/store'; import * as actions from '~/reports/codequality_report/store/actions'; import * as types from '~/reports/codequality_report/store/mutation_types'; -import createStore from '~/reports/codequality_report/store'; import { headIssues, baseIssues, diff --git a/spec/frontend/reports/codequality_report/store/getters_spec.js b/spec/frontend/reports/codequality_report/store/getters_spec.js index a641e2fe74f..de025f814ef 100644 --- a/spec/frontend/reports/codequality_report/store/getters_spec.js +++ b/spec/frontend/reports/codequality_report/store/getters_spec.js @@ -1,5 +1,5 @@ -import * as getters from '~/reports/codequality_report/store/getters'; import createStore from '~/reports/codequality_report/store'; +import * as getters from '~/reports/codequality_report/store/getters'; import { LOADING, ERROR, SUCCESS } from '~/reports/constants'; describe('Codequality reports store getters', () => { diff --git a/spec/frontend/reports/codequality_report/store/mutations_spec.js b/spec/frontend/reports/codequality_report/store/mutations_spec.js index f7f9e611ee8..05a16cd6f82 100644 --- a/spec/frontend/reports/codequality_report/store/mutations_spec.js +++ b/spec/frontend/reports/codequality_report/store/mutations_spec.js @@ -1,5 +1,5 @@ -import mutations from '~/reports/codequality_report/store/mutations'; import createStore from '~/reports/codequality_report/store'; +import mutations from '~/reports/codequality_report/store/mutations'; describe('Codequality Reports mutations', () => { let localState; diff --git a/spec/frontend/reports/components/grouped_test_reports_app_spec.js b/spec/frontend/reports/components/grouped_test_reports_app_spec.js index 88a82908e1e..ed261ed12c0 100644 --- a/spec/frontend/reports/components/grouped_test_reports_app_spec.js +++ b/spec/frontend/reports/components/grouped_test_reports_app_spec.js @@ -5,11 +5,11 @@ import GroupedTestReportsApp from '~/reports/components/grouped_test_reports_app import { getStoreConfig } from '~/reports/store'; import { failedReport } from '../mock_data/mock_data'; -import successTestReports from '../mock_data/no_failures_report.json'; +import mixedResultsTestReports from '../mock_data/new_and_fixed_failures_report.json'; +import newErrorsTestReports from '../mock_data/new_errors_report.json'; import newFailedTestReports from '../mock_data/new_failures_report.json'; +import successTestReports from '../mock_data/no_failures_report.json'; import recentFailuresTestReports from '../mock_data/recent_failures_report.json'; -import newErrorsTestReports from '../mock_data/new_errors_report.json'; -import mixedResultsTestReports from '../mock_data/new_and_fixed_failures_report.json'; import resolvedFailures from '../mock_data/resolved_failures.json'; const localVue = createLocalVue(); diff --git a/spec/frontend/reports/components/modal_spec.js b/spec/frontend/reports/components/modal_spec.js index 39b84d1ee05..d47bb964e8a 100644 --- a/spec/frontend/reports/components/modal_spec.js +++ b/spec/frontend/reports/components/modal_spec.js @@ -2,9 +2,9 @@ import { GlLink, GlSprintf } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; -import CodeBlock from '~/vue_shared/components/code_block.vue'; import ReportsModal from '~/reports/components/modal.vue'; import state from '~/reports/store/state'; +import CodeBlock from '~/vue_shared/components/code_block.vue'; const StubbedGlModal = { template: '
', name: 'GlModal', props: ['title'] }; diff --git a/spec/frontend/reports/components/report_item_spec.js b/spec/frontend/reports/components/report_item_spec.js index 6aac07984e3..a7243c5377b 100644 --- a/spec/frontend/reports/components/report_item_spec.js +++ b/spec/frontend/reports/components/report_item_spec.js @@ -1,8 +1,8 @@ import { shallowMount } from '@vue/test-utils'; -import { STATUS_SUCCESS } from '~/reports/constants'; -import ReportItem from '~/reports/components/report_item.vue'; -import IssueStatusIcon from '~/reports/components/issue_status_icon.vue'; import { componentNames } from '~/reports/components/issue_body'; +import IssueStatusIcon from '~/reports/components/issue_status_icon.vue'; +import ReportItem from '~/reports/components/report_item.vue'; +import { STATUS_SUCCESS } from '~/reports/constants'; describe('ReportItem', () => { describe('showReportSectionStatusIcon', () => { diff --git a/spec/frontend/reports/components/report_section_spec.js b/spec/frontend/reports/components/report_section_spec.js index c3219b34057..c9bf3185f8f 100644 --- a/spec/frontend/reports/components/report_section_spec.js +++ b/spec/frontend/reports/components/report_section_spec.js @@ -1,5 +1,5 @@ -import Vue from 'vue'; import { shallowMount } from '@vue/test-utils'; +import Vue from 'vue'; import mountComponent, { mountComponentWithSlots } from 'helpers/vue_mount_component_helper'; import reportSection from '~/reports/components/report_section.vue'; diff --git a/spec/frontend/reports/components/test_issue_body_spec.js b/spec/frontend/reports/components/test_issue_body_spec.js index c13a3599fef..2843620a18d 100644 --- a/spec/frontend/reports/components/test_issue_body_spec.js +++ b/spec/frontend/reports/components/test_issue_body_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import { mountComponentWithStore } from 'helpers/vue_mount_component_helper'; import { trimText } from 'helpers/text_helper'; +import { mountComponentWithStore } from 'helpers/vue_mount_component_helper'; import component from '~/reports/components/test_issue_body.vue'; import createStore from '~/reports/store'; import { issue } from '../mock_data/mock_data'; diff --git a/spec/frontend/reports/store/actions_spec.js b/spec/frontend/reports/store/actions_spec.js index b7c4a31b1c8..25c3105466f 100644 --- a/spec/frontend/reports/store/actions_spec.js +++ b/spec/frontend/reports/store/actions_spec.js @@ -1,6 +1,6 @@ import MockAdapter from 'axios-mock-adapter'; -import testAction from 'helpers/vuex_action_helper'; import { TEST_HOST } from 'helpers/test_constants'; +import testAction from 'helpers/vuex_action_helper'; import axios from '~/lib/utils/axios_utils'; import { setEndpoint, @@ -13,8 +13,8 @@ import { openModal, closeModal, } from '~/reports/store/actions'; -import state from '~/reports/store/state'; import * as types from '~/reports/store/mutation_types'; +import state from '~/reports/store/state'; describe('Reports Store Actions', () => { let mockedState; diff --git a/spec/frontend/reports/store/mutations_spec.js b/spec/frontend/reports/store/mutations_spec.js index 59065d1151f..652b3b0ec45 100644 --- a/spec/frontend/reports/store/mutations_spec.js +++ b/spec/frontend/reports/store/mutations_spec.js @@ -1,6 +1,6 @@ -import state from '~/reports/store/state'; -import mutations from '~/reports/store/mutations'; import * as types from '~/reports/store/mutation_types'; +import mutations from '~/reports/store/mutations'; +import state from '~/reports/store/state'; import { issue } from '../mock_data/mock_data'; describe('Reports Store Mutations', () => { diff --git a/spec/frontend/reports/store/utils_spec.js b/spec/frontend/reports/store/utils_spec.js index 5249e9ffcce..cbc87bbb5ec 100644 --- a/spec/frontend/reports/store/utils_spec.js +++ b/spec/frontend/reports/store/utils_spec.js @@ -1,4 +1,3 @@ -import * as utils from '~/reports/store/utils'; import { STATUS_FAILED, STATUS_SUCCESS, @@ -6,6 +5,7 @@ import { ICON_SUCCESS, ICON_NOTFOUND, } from '~/reports/constants'; +import * as utils from '~/reports/store/utils'; describe('Reports store utils', () => { describe('summaryTextbuilder', () => { diff --git a/spec/frontend/repository/components/breadcrumbs_spec.js b/spec/frontend/repository/components/breadcrumbs_spec.js index a0dc608ddc9..2ac2069a177 100644 --- a/spec/frontend/repository/components/breadcrumbs_spec.js +++ b/spec/frontend/repository/components/breadcrumbs_spec.js @@ -1,5 +1,5 @@ -import { shallowMount, RouterLinkStub } from '@vue/test-utils'; import { GlDropdown } from '@gitlab/ui'; +import { shallowMount, RouterLinkStub } from '@vue/test-utils'; import Breadcrumbs from '~/repository/components/breadcrumbs.vue'; let vm; diff --git a/spec/frontend/repository/components/last_commit_spec.js b/spec/frontend/repository/components/last_commit_spec.js index f611d6a3535..ebea7dde34a 100644 --- a/spec/frontend/repository/components/last_commit_spec.js +++ b/spec/frontend/repository/components/last_commit_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import LastCommit from '~/repository/components/last_commit.vue'; import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; diff --git a/spec/frontend/repository/components/preview/index_spec.js b/spec/frontend/repository/components/preview/index_spec.js index ebd985e640c..466eed52739 100644 --- a/spec/frontend/repository/components/preview/index_spec.js +++ b/spec/frontend/repository/components/preview/index_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { handleLocationHash } from '~/lib/utils/common_utils'; import Preview from '~/repository/components/preview/index.vue'; diff --git a/spec/frontend/repository/components/table/index_spec.js b/spec/frontend/repository/components/table/index_spec.js index 1b8bbd5af6b..af263f43d7d 100644 --- a/spec/frontend/repository/components/table/index_spec.js +++ b/spec/frontend/repository/components/table/index_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlDeprecatedSkeletonLoading as GlSkeletonLoading, GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import Table from '~/repository/components/table/index.vue'; import TableRow from '~/repository/components/table/row.vue'; diff --git a/spec/frontend/repository/components/table/parent_row_spec.js b/spec/frontend/repository/components/table/parent_row_spec.js index b4800112fee..cf1ed272634 100644 --- a/spec/frontend/repository/components/table/parent_row_spec.js +++ b/spec/frontend/repository/components/table/parent_row_spec.js @@ -1,5 +1,5 @@ -import { shallowMount, RouterLinkStub } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount, RouterLinkStub } from '@vue/test-utils'; import ParentRow from '~/repository/components/table/parent_row.vue'; let vm; diff --git a/spec/frontend/repository/components/table/row_spec.js b/spec/frontend/repository/components/table/row_spec.js index 767b117c798..69cb69de5df 100644 --- a/spec/frontend/repository/components/table/row_spec.js +++ b/spec/frontend/repository/components/table/row_spec.js @@ -1,5 +1,5 @@ -import { shallowMount, RouterLinkStub } from '@vue/test-utils'; import { GlBadge, GlLink, GlIcon } from '@gitlab/ui'; +import { shallowMount, RouterLinkStub } from '@vue/test-utils'; import TableRow from '~/repository/components/table/row.vue'; import FileIcon from '~/vue_shared/components/file_icon.vue'; import { FILE_SYMLINK_MODE } from '~/vue_shared/constants'; diff --git a/spec/frontend/repository/components/tree_content_spec.js b/spec/frontend/repository/components/tree_content_spec.js index 70dbfaea551..2930e39df8a 100644 --- a/spec/frontend/repository/components/tree_content_spec.js +++ b/spec/frontend/repository/components/tree_content_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; -import TreeContent, { INITIAL_FETCH_COUNT } from '~/repository/components/tree_content.vue'; import FilePreview from '~/repository/components/preview/index.vue'; import FileTable from '~/repository/components/table/index.vue'; +import TreeContent, { INITIAL_FETCH_COUNT } from '~/repository/components/tree_content.vue'; let vm; let $apollo; diff --git a/spec/frontend/repository/utils/dom_spec.js b/spec/frontend/repository/utils/dom_spec.js index f9e619a82d1..9839ddc6cdb 100644 --- a/spec/frontend/repository/utils/dom_spec.js +++ b/spec/frontend/repository/utils/dom_spec.js @@ -1,5 +1,5 @@ -import { TEST_HOST } from 'helpers/test_constants'; import { setHTMLFixture } from 'helpers/fixtures'; +import { TEST_HOST } from 'helpers/test_constants'; import { updateElementsVisibility, updateFormAction } from '~/repository/utils/dom'; describe('updateElementsVisibility', () => { diff --git a/spec/frontend/right_sidebar_spec.js b/spec/frontend/right_sidebar_spec.js index 1b31030cb92..f3719b28baa 100644 --- a/spec/frontend/right_sidebar_spec.js +++ b/spec/frontend/right_sidebar_spec.js @@ -1,5 +1,5 @@ -import $ from 'jquery'; import MockAdapter from 'axios-mock-adapter'; +import $ from 'jquery'; import '~/commons/bootstrap'; import axios from '~/lib/utils/axios_utils'; import Sidebar from '~/right_sidebar'; diff --git a/spec/frontend/search/sidebar/components/app_spec.js b/spec/frontend/search/sidebar/components/app_spec.js index 94a39b90d02..b93527c1fe9 100644 --- a/spec/frontend/search/sidebar/components/app_spec.js +++ b/spec/frontend/search/sidebar/components/app_spec.js @@ -1,6 +1,6 @@ -import Vuex from 'vuex'; -import { createLocalVue, shallowMount } from '@vue/test-utils'; import { GlButton, GlLink } from '@gitlab/ui'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; +import Vuex from 'vuex'; import { MOCK_QUERY } from 'jest/search/mock_data'; import GlobalSearchSidebar from '~/search/sidebar/components/app.vue'; import ConfidentialityFilter from '~/search/sidebar/components/confidentiality_filter.vue'; diff --git a/spec/frontend/search/sidebar/components/confidentiality_filter_spec.js b/spec/frontend/search/sidebar/components/confidentiality_filter_spec.js index 42fcc859308..3713e1d414f 100644 --- a/spec/frontend/search/sidebar/components/confidentiality_filter_spec.js +++ b/spec/frontend/search/sidebar/components/confidentiality_filter_spec.js @@ -1,5 +1,5 @@ -import Vuex from 'vuex'; import { createLocalVue, shallowMount } from '@vue/test-utils'; +import Vuex from 'vuex'; import { MOCK_QUERY } from 'jest/search/mock_data'; import ConfidentialityFilter from '~/search/sidebar/components/confidentiality_filter.vue'; import RadioFilter from '~/search/sidebar/components/radio_filter.vue'; diff --git a/spec/frontend/search/sidebar/components/radio_filter_spec.js b/spec/frontend/search/sidebar/components/radio_filter_spec.js index 9918af54cfe..4c81312e479 100644 --- a/spec/frontend/search/sidebar/components/radio_filter_spec.js +++ b/spec/frontend/search/sidebar/components/radio_filter_spec.js @@ -1,10 +1,10 @@ -import Vuex from 'vuex'; -import { createLocalVue, shallowMount } from '@vue/test-utils'; import { GlFormRadioGroup, GlFormRadio } from '@gitlab/ui'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; +import Vuex from 'vuex'; import { MOCK_QUERY } from 'jest/search/mock_data'; import RadioFilter from '~/search/sidebar/components/radio_filter.vue'; -import { stateFilterData } from '~/search/sidebar/constants/state_filter_data'; import { confidentialFilterData } from '~/search/sidebar/constants/confidential_filter_data'; +import { stateFilterData } from '~/search/sidebar/constants/state_filter_data'; const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/spec/frontend/search/sidebar/components/status_filter_spec.js b/spec/frontend/search/sidebar/components/status_filter_spec.js index 21fc663397e..08ce57b206b 100644 --- a/spec/frontend/search/sidebar/components/status_filter_spec.js +++ b/spec/frontend/search/sidebar/components/status_filter_spec.js @@ -1,8 +1,8 @@ -import Vuex from 'vuex'; import { createLocalVue, shallowMount } from '@vue/test-utils'; +import Vuex from 'vuex'; import { MOCK_QUERY } from 'jest/search/mock_data'; -import StatusFilter from '~/search/sidebar/components/status_filter.vue'; import RadioFilter from '~/search/sidebar/components/radio_filter.vue'; +import StatusFilter from '~/search/sidebar/components/status_filter.vue'; const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/spec/frontend/search/sort/components/app_spec.js b/spec/frontend/search/sort/components/app_spec.js index 8e3f08f7e28..5806d6b51d2 100644 --- a/spec/frontend/search/sort/components/app_spec.js +++ b/spec/frontend/search/sort/components/app_spec.js @@ -1,6 +1,6 @@ -import Vuex from 'vuex'; -import { createLocalVue, shallowMount } from '@vue/test-utils'; import { GlButtonGroup, GlButton, GlDropdown, GlDropdownItem } from '@gitlab/ui'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; +import Vuex from 'vuex'; import { MOCK_QUERY, MOCK_SORT_OPTIONS } from 'jest/search/mock_data'; import GlobalSearchSort from '~/search/sort/components/app.vue'; import { SORT_DIRECTION_UI } from '~/search/sort/constants'; diff --git a/spec/frontend/search/store/actions_spec.js b/spec/frontend/search/store/actions_spec.js index e4536a3e136..ab622c53387 100644 --- a/spec/frontend/search/store/actions_spec.js +++ b/spec/frontend/search/store/actions_spec.js @@ -1,12 +1,12 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; import Api from '~/api'; +import createFlash from '~/flash'; +import axios from '~/lib/utils/axios_utils'; +import * as urlUtils from '~/lib/utils/url_utility'; import * as actions from '~/search/store/actions'; import * as types from '~/search/store/mutation_types'; -import * as urlUtils from '~/lib/utils/url_utility'; import createState from '~/search/store/state'; -import axios from '~/lib/utils/axios_utils'; -import createFlash from '~/flash'; import { MOCK_QUERY, MOCK_GROUPS, MOCK_PROJECT, MOCK_PROJECTS } from '../mock_data'; jest.mock('~/flash'); diff --git a/spec/frontend/search/store/mutations_spec.js b/spec/frontend/search/store/mutations_spec.js index 560ed66263b..df94ba40ff2 100644 --- a/spec/frontend/search/store/mutations_spec.js +++ b/spec/frontend/search/store/mutations_spec.js @@ -1,6 +1,6 @@ +import * as types from '~/search/store/mutation_types'; import mutations from '~/search/store/mutations'; import createState from '~/search/store/state'; -import * as types from '~/search/store/mutation_types'; import { MOCK_QUERY, MOCK_GROUPS, MOCK_PROJECTS } from '../mock_data'; describe('Global Search Store Mutations', () => { diff --git a/spec/frontend/search/topbar/components/app_spec.js b/spec/frontend/search/topbar/components/app_spec.js index faf3629b444..fb953f2ed1b 100644 --- a/spec/frontend/search/topbar/components/app_spec.js +++ b/spec/frontend/search/topbar/components/app_spec.js @@ -1,6 +1,6 @@ -import Vuex from 'vuex'; -import { createLocalVue, shallowMount } from '@vue/test-utils'; import { GlForm, GlSearchBoxByType, GlButton } from '@gitlab/ui'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; +import Vuex from 'vuex'; import { MOCK_QUERY } from 'jest/search/mock_data'; import GlobalSearchTopbar from '~/search/topbar/components/app.vue'; import GroupFilter from '~/search/topbar/components/group_filter.vue'; diff --git a/spec/frontend/search/topbar/components/group_filter_spec.js b/spec/frontend/search/topbar/components/group_filter_spec.js index 017808d576e..15b46f9c058 100644 --- a/spec/frontend/search/topbar/components/group_filter_spec.js +++ b/spec/frontend/search/topbar/components/group_filter_spec.js @@ -1,5 +1,5 @@ -import Vuex from 'vuex'; import { createLocalVue, shallowMount } from '@vue/test-utils'; +import Vuex from 'vuex'; import { MOCK_GROUP, MOCK_QUERY } from 'jest/search/mock_data'; import { visitUrl, setUrlParams } from '~/lib/utils/url_utility'; import GroupFilter from '~/search/topbar/components/group_filter.vue'; diff --git a/spec/frontend/search/topbar/components/project_filter_spec.js b/spec/frontend/search/topbar/components/project_filter_spec.js index f2ac8f2689d..3bd0769b34a 100644 --- a/spec/frontend/search/topbar/components/project_filter_spec.js +++ b/spec/frontend/search/topbar/components/project_filter_spec.js @@ -1,5 +1,5 @@ -import Vuex from 'vuex'; import { createLocalVue, shallowMount } from '@vue/test-utils'; +import Vuex from 'vuex'; import { MOCK_PROJECT, MOCK_QUERY } from 'jest/search/mock_data'; import { visitUrl, setUrlParams } from '~/lib/utils/url_utility'; import ProjectFilter from '~/search/topbar/components/project_filter.vue'; diff --git a/spec/frontend/search/topbar/components/searchable_dropdown_spec.js b/spec/frontend/search/topbar/components/searchable_dropdown_spec.js index 86e29571d0f..5de948592d4 100644 --- a/spec/frontend/search/topbar/components/searchable_dropdown_spec.js +++ b/spec/frontend/search/topbar/components/searchable_dropdown_spec.js @@ -1,6 +1,6 @@ -import Vuex from 'vuex'; -import { createLocalVue, shallowMount, mount } from '@vue/test-utils'; import { GlDropdown, GlDropdownItem, GlSearchBoxByType, GlSkeletonLoader } from '@gitlab/ui'; +import { createLocalVue, shallowMount, mount } from '@vue/test-utils'; +import Vuex from 'vuex'; import { MOCK_GROUPS, MOCK_GROUP, MOCK_QUERY } from 'jest/search/mock_data'; import SearchableDropdown from '~/search/topbar/components/searchable_dropdown.vue'; import { ANY_OPTION, GROUP_DATA } from '~/search/topbar/constants'; diff --git a/spec/frontend/search_autocomplete_spec.js b/spec/frontend/search_autocomplete_spec.js index e844bc96e05..fa808ad39d8 100644 --- a/spec/frontend/search_autocomplete_spec.js +++ b/spec/frontend/search_autocomplete_spec.js @@ -1,7 +1,7 @@ /* eslint-disable no-unused-expressions, consistent-return, no-param-reassign, default-case, no-return-assign */ -import $ from 'jquery'; import AxiosMockAdapter from 'axios-mock-adapter'; +import $ from 'jquery'; import { mockTracking, unmockTracking } from 'helpers/tracking_helper'; import initSearchAutocomplete from '~/search_autocomplete'; import '~/lib/utils/common_utils'; diff --git a/spec/frontend/security_configuration/configuration_table_spec.js b/spec/frontend/security_configuration/configuration_table_spec.js index beeca1b7169..49f9a7a3ea8 100644 --- a/spec/frontend/security_configuration/configuration_table_spec.js +++ b/spec/frontend/security_configuration/configuration_table_spec.js @@ -1,7 +1,7 @@ import { mount } from '@vue/test-utils'; +import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import ConfigurationTable from '~/security_configuration/components/configuration_table.vue'; import { features, UPGRADE_CTA } from '~/security_configuration/components/features_constants'; -import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import { REPORT_TYPE_SAST, diff --git a/spec/frontend/security_configuration/manage_sast_spec.js b/spec/frontend/security_configuration/manage_sast_spec.js index 6d3cfeb9ed1..7c76f19ddb4 100644 --- a/spec/frontend/security_configuration/manage_sast_spec.js +++ b/spec/frontend/security_configuration/manage_sast_spec.js @@ -1,13 +1,13 @@ +import { GlButton } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import Vue from 'vue'; import VueApollo from 'vue-apollo'; -import { mount } from '@vue/test-utils'; -import { GlButton } from '@gitlab/ui'; +import createMockApollo from 'helpers/mock_apollo_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import waitForPromises from 'helpers/wait_for_promises'; -import createMockApollo from 'helpers/mock_apollo_helper'; -import configureSastMutation from '~/security_configuration/graphql/configure_sast.mutation.graphql'; -import ManageSast from '~/security_configuration/components/manage_sast.vue'; import { redirectTo } from '~/lib/utils/url_utility'; +import ManageSast from '~/security_configuration/components/manage_sast.vue'; +import configureSastMutation from '~/security_configuration/graphql/configure_sast.mutation.graphql'; jest.mock('~/lib/utils/url_utility', () => ({ redirectTo: jest.fn(), diff --git a/spec/frontend/security_configuration/upgrade_spec.js b/spec/frontend/security_configuration/upgrade_spec.js index 53434d32f07..0ab1108b265 100644 --- a/spec/frontend/security_configuration/upgrade_spec.js +++ b/spec/frontend/security_configuration/upgrade_spec.js @@ -1,6 +1,6 @@ import { mount } from '@vue/test-utils'; -import Upgrade from '~/security_configuration/components/upgrade.vue'; import { UPGRADE_CTA } from '~/security_configuration/components/features_constants'; +import Upgrade from '~/security_configuration/components/upgrade.vue'; let wrapper; const createComponent = () => { diff --git a/spec/frontend/self_monitor/components/self_monitor_form_spec.js b/spec/frontend/self_monitor/components/self_monitor_form_spec.js index dfa961c5115..5f5934305c6 100644 --- a/spec/frontend/self_monitor/components/self_monitor_form_spec.js +++ b/spec/frontend/self_monitor/components/self_monitor_form_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; import SelfMonitor from '~/self_monitor/components/self_monitor_form.vue'; import { createStore } from '~/self_monitor/store'; diff --git a/spec/frontend/sentry/index_spec.js b/spec/frontend/sentry/index_spec.js index 82b6c445d96..13b9b9e909c 100644 --- a/spec/frontend/sentry/index_spec.js +++ b/spec/frontend/sentry/index_spec.js @@ -1,5 +1,5 @@ -import SentryConfig from '~/sentry/sentry_config'; import index from '~/sentry/index'; +import SentryConfig from '~/sentry/sentry_config'; describe('SentryConfig options', () => { const dsn = 'https://123@sentry.gitlab.test/123'; diff --git a/spec/frontend/sentry/sentry_config_spec.js b/spec/frontend/sentry/sentry_config_spec.js index 5ee261f480a..f7102f9b2f9 100644 --- a/spec/frontend/sentry/sentry_config_spec.js +++ b/spec/frontend/sentry/sentry_config_spec.js @@ -1,5 +1,5 @@ -import * as Sentry from '~/sentry/wrapper'; import SentryConfig from '~/sentry/sentry_config'; +import * as Sentry from '~/sentry/wrapper'; describe('SentryConfig', () => { describe('IGNORE_ERRORS', () => { diff --git a/spec/frontend/sentry_error_stack_trace/components/sentry_error_stack_trace_spec.js b/spec/frontend/sentry_error_stack_trace/components/sentry_error_stack_trace_spec.js index 135a3844e78..772d6903052 100644 --- a/spec/frontend/sentry_error_stack_trace/components/sentry_error_stack_trace_spec.js +++ b/spec/frontend/sentry_error_stack_trace/components/sentry_error_stack_trace_spec.js @@ -1,6 +1,6 @@ +import { GlLoadingIcon } from '@gitlab/ui'; import { createLocalVue, shallowMount } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlLoadingIcon } from '@gitlab/ui'; import Stacktrace from '~/error_tracking/components/stacktrace.vue'; import SentryErrorStackTrace from '~/sentry_error_stack_trace/components/sentry_error_stack_trace.vue'; diff --git a/spec/frontend/serverless/components/empty_state_spec.js b/spec/frontend/serverless/components/empty_state_spec.js index daa1576a4ec..d63882c2a6d 100644 --- a/spec/frontend/serverless/components/empty_state_spec.js +++ b/spec/frontend/serverless/components/empty_state_spec.js @@ -1,7 +1,7 @@ import { GlEmptyState, GlSprintf } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; -import { createStore } from '~/serverless/store'; import EmptyStateComponent from '~/serverless/components/empty_state.vue'; +import { createStore } from '~/serverless/store'; describe('EmptyStateComponent', () => { let wrapper; diff --git a/spec/frontend/serverless/components/function_details_spec.js b/spec/frontend/serverless/components/function_details_spec.js index 248dd418941..d2b8de71e01 100644 --- a/spec/frontend/serverless/components/function_details_spec.js +++ b/spec/frontend/serverless/components/function_details_spec.js @@ -1,6 +1,6 @@ +import { createLocalVue, shallowMount } from '@vue/test-utils'; import Vuex from 'vuex'; -import { createLocalVue, shallowMount } from '@vue/test-utils'; import functionDetailsComponent from '~/serverless/components/function_details.vue'; import { createStore } from '~/serverless/store'; diff --git a/spec/frontend/serverless/components/functions_spec.js b/spec/frontend/serverless/components/functions_spec.js index 0fca027fe56..01dd512c5d3 100644 --- a/spec/frontend/serverless/components/functions_spec.js +++ b/spec/frontend/serverless/components/functions_spec.js @@ -1,13 +1,13 @@ -import Vuex from 'vuex'; import { GlLoadingIcon } from '@gitlab/ui'; -import AxiosMockAdapter from 'axios-mock-adapter'; import { createLocalVue, shallowMount } from '@vue/test-utils'; +import AxiosMockAdapter from 'axios-mock-adapter'; +import Vuex from 'vuex'; import { TEST_HOST } from 'helpers/test_constants'; import axios from '~/lib/utils/axios_utils'; -import functionsComponent from '~/serverless/components/functions.vue'; -import { createStore } from '~/serverless/store'; import EmptyState from '~/serverless/components/empty_state.vue'; import EnvironmentRow from '~/serverless/components/environment_row.vue'; +import functionsComponent from '~/serverless/components/functions.vue'; +import { createStore } from '~/serverless/store'; import { mockServerlessFunctions } from '../mock_data'; describe('functionsComponent', () => { diff --git a/spec/frontend/serverless/components/missing_prometheus_spec.js b/spec/frontend/serverless/components/missing_prometheus_spec.js index ffdb1f13111..d5b187452c6 100644 --- a/spec/frontend/serverless/components/missing_prometheus_spec.js +++ b/spec/frontend/serverless/components/missing_prometheus_spec.js @@ -1,7 +1,7 @@ import { GlButton } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; -import { createStore } from '~/serverless/store'; import missingPrometheusComponent from '~/serverless/components/missing_prometheus.vue'; +import { createStore } from '~/serverless/store'; describe('missingPrometheusComponent', () => { let wrapper; diff --git a/spec/frontend/serverless/components/url_spec.js b/spec/frontend/serverless/components/url_spec.js index c43933e5b94..8c839577aa0 100644 --- a/spec/frontend/serverless/components/url_spec.js +++ b/spec/frontend/serverless/components/url_spec.js @@ -1,5 +1,5 @@ -import Vue from 'vue'; import { shallowMount } from '@vue/test-utils'; +import Vue from 'vue'; import urlComponent from '~/serverless/components/url.vue'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; diff --git a/spec/frontend/serverless/store/actions_spec.js b/spec/frontend/serverless/store/actions_spec.js index 41d99fcb26c..61b9bd121af 100644 --- a/spec/frontend/serverless/store/actions_spec.js +++ b/spec/frontend/serverless/store/actions_spec.js @@ -1,8 +1,8 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; +import axios from '~/lib/utils/axios_utils'; import statusCodes from '~/lib/utils/http_status'; import { fetchFunctions, fetchMetrics } from '~/serverless/store/actions'; -import axios from '~/lib/utils/axios_utils'; import { mockServerlessFunctions, mockMetrics } from '../mock_data'; import { adjustMetricQuery } from '../utils'; diff --git a/spec/frontend/serverless/store/getters_spec.js b/spec/frontend/serverless/store/getters_spec.js index 92853fda37c..e1942bd2759 100644 --- a/spec/frontend/serverless/store/getters_spec.js +++ b/spec/frontend/serverless/store/getters_spec.js @@ -1,5 +1,5 @@ -import serverlessState from '~/serverless/store/state'; import * as getters from '~/serverless/store/getters'; +import serverlessState from '~/serverless/store/state'; import { mockServerlessFunctions } from '../mock_data'; describe('Serverless Store Getters', () => { diff --git a/spec/frontend/serverless/store/mutations_spec.js b/spec/frontend/serverless/store/mutations_spec.js index e2771c7e5fd..a1a8f9a2ca7 100644 --- a/spec/frontend/serverless/store/mutations_spec.js +++ b/spec/frontend/serverless/store/mutations_spec.js @@ -1,5 +1,5 @@ -import mutations from '~/serverless/store/mutations'; import * as types from '~/serverless/store/mutation_types'; +import mutations from '~/serverless/store/mutations'; import { mockServerlessFunctions, mockMetrics } from '../mock_data'; describe('ServerlessMutations', () => { diff --git a/spec/frontend/serverless/survey_banner_spec.js b/spec/frontend/serverless/survey_banner_spec.js index 29b36fb9b5f..4682c2328c3 100644 --- a/spec/frontend/serverless/survey_banner_spec.js +++ b/spec/frontend/serverless/survey_banner_spec.js @@ -1,6 +1,6 @@ +import { GlBanner } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import Cookies from 'js-cookie'; -import { GlBanner } from '@gitlab/ui'; import SurveyBanner from '~/serverless/survey_banner.vue'; describe('Knative survey banner', () => { diff --git a/spec/frontend/set_status_modal/set_status_modal_wrapper_spec.js b/spec/frontend/set_status_modal/set_status_modal_wrapper_spec.js index f3085fb7ffb..21b9721438d 100644 --- a/spec/frontend/set_status_modal/set_status_modal_wrapper_spec.js +++ b/spec/frontend/set_status_modal/set_status_modal_wrapper_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlModal, GlFormCheckbox } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { initEmojiMock } from 'helpers/emoji'; import * as UserApi from '~/api/user_api'; import { deprecatedCreateFlash as createFlash } from '~/flash'; diff --git a/spec/frontend/sidebar/assignee_title_spec.js b/spec/frontend/sidebar/assignee_title_spec.js index 9f5d51c7795..3079cb28406 100644 --- a/spec/frontend/sidebar/assignee_title_spec.js +++ b/spec/frontend/sidebar/assignee_title_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { mockTracking, triggerEvent } from 'helpers/tracking_helper'; import Component from '~/sidebar/components/assignees/assignee_title.vue'; diff --git a/spec/frontend/sidebar/assignees_realtime_spec.js b/spec/frontend/sidebar/assignees_realtime_spec.js index a7e280b5ae1..0fab6a29f71 100644 --- a/spec/frontend/sidebar/assignees_realtime_spec.js +++ b/spec/frontend/sidebar/assignees_realtime_spec.js @@ -1,8 +1,8 @@ -import { shallowMount } from '@vue/test-utils'; import ActionCable from '@rails/actioncable'; +import { shallowMount } from '@vue/test-utils'; +import query from '~/issuable_sidebar/queries/issue_sidebar.query.graphql'; import AssigneesRealtime from '~/sidebar/components/assignees/assignees_realtime.vue'; import SidebarMediator from '~/sidebar/sidebar_mediator'; -import query from '~/issuable_sidebar/queries/issue_sidebar.query.graphql'; import Mock from './mock_data'; jest.mock('@rails/actioncable', () => { diff --git a/spec/frontend/sidebar/assignees_spec.js b/spec/frontend/sidebar/assignees_spec.js index fbf5fca2234..74dce499999 100644 --- a/spec/frontend/sidebar/assignees_spec.js +++ b/spec/frontend/sidebar/assignees_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import { trimText } from 'helpers/text_helper'; import UsersMockHelper from 'helpers/user_mock_data_helper'; import Assignee from '~/sidebar/components/assignees/assignees.vue'; 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 03d1ac3ab8d..d7dc0aaae78 100644 --- a/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js +++ b/spec/frontend/sidebar/components/assignees/assignee_avatar_link_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; -import AssigneeAvatarLink from '~/sidebar/components/assignees/assignee_avatar_link.vue'; import AssigneeAvatar from '~/sidebar/components/assignees/assignee_avatar.vue'; +import AssigneeAvatarLink from '~/sidebar/components/assignees/assignee_avatar_link.vue'; import userDataMock from '../../user_data_mock'; const TOOLTIP_PLACEMENT = 'bottom'; 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 8e158c99971..4365dc79272 100644 --- a/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js +++ b/spec/frontend/sidebar/components/assignees/collapsed_assignee_list_spec.js @@ -1,8 +1,8 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +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 CollapsedAssigneeList from '~/sidebar/components/assignees/collapsed_assignee_list.vue'; const DEFAULT_MAX_COUNTER = 99; diff --git a/spec/frontend/sidebar/components/assignees/collapsed_assignee_spec.js b/spec/frontend/sidebar/components/assignees/collapsed_assignee_spec.js index ee1f8ed8d2b..51c245d24ce 100644 --- a/spec/frontend/sidebar/components/assignees/collapsed_assignee_spec.js +++ b/spec/frontend/sidebar/components/assignees/collapsed_assignee_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; -import CollapsedAssignee from '~/sidebar/components/assignees/collapsed_assignee.vue'; import AssigneeAvatar from '~/sidebar/components/assignees/assignee_avatar.vue'; +import CollapsedAssignee from '~/sidebar/components/assignees/collapsed_assignee.vue'; import userDataMock from '../../user_data_mock'; const TEST_USER = userDataMock(); 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 da69f56d442..7e81df1d7d2 100644 --- a/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js +++ b/spec/frontend/sidebar/components/assignees/uncollapsed_assignee_list_spec.js @@ -1,8 +1,8 @@ import { mount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; import UsersMockHelper from 'helpers/user_mock_data_helper'; -import UncollapsedAssigneeList from '~/sidebar/components/assignees/uncollapsed_assignee_list.vue'; import AssigneeAvatarLink from '~/sidebar/components/assignees/assignee_avatar_link.vue'; +import UncollapsedAssigneeList from '~/sidebar/components/assignees/uncollapsed_assignee_list.vue'; import userDataMock from '../../user_data_mock'; const DEFAULT_RENDER_COUNT = 5; diff --git a/spec/frontend/sidebar/components/copy_email_to_clipboard_spec.js b/spec/frontend/sidebar/components/copy_email_to_clipboard_spec.js index b9132fa4450..704847f65bf 100644 --- a/spec/frontend/sidebar/components/copy_email_to_clipboard_spec.js +++ b/spec/frontend/sidebar/components/copy_email_to_clipboard_spec.js @@ -1,7 +1,7 @@ -import { mount } from '@vue/test-utils'; import { getByText } from '@testing-library/dom'; -import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; +import { mount } from '@vue/test-utils'; import CopyEmailToClipboard from '~/sidebar/components/copy_email_to_clipboard.vue'; +import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; describe('CopyEmailToClipboard component', () => { const sampleEmail = 'sample+email@test.com'; diff --git a/spec/frontend/sidebar/components/reviewers/uncollapsed_reviewer_list_spec.js b/spec/frontend/sidebar/components/reviewers/uncollapsed_reviewer_list_spec.js index 41180fcc4c2..7c67149b517 100644 --- a/spec/frontend/sidebar/components/reviewers/uncollapsed_reviewer_list_spec.js +++ b/spec/frontend/sidebar/components/reviewers/uncollapsed_reviewer_list_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; -import UncollapsedReviewerList from '~/sidebar/components/reviewers/uncollapsed_reviewer_list.vue'; import ReviewerAvatarLink from '~/sidebar/components/reviewers/reviewer_avatar_link.vue'; +import UncollapsedReviewerList from '~/sidebar/components/reviewers/uncollapsed_reviewer_list.vue'; import userDataMock from '../../user_data_mock'; describe('UncollapsedReviewerList component', () => { diff --git a/spec/frontend/sidebar/components/severity/severity_spec.js b/spec/frontend/sidebar/components/severity/severity_spec.js index ba7cea0919c..1e4624e4dcd 100644 --- a/spec/frontend/sidebar/components/severity/severity_spec.js +++ b/spec/frontend/sidebar/components/severity/severity_spec.js @@ -1,7 +1,7 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; -import SeverityToken from '~/sidebar/components/severity/severity.vue'; +import { shallowMount } from '@vue/test-utils'; import { INCIDENT_SEVERITY } from '~/sidebar/components/severity/constants'; +import SeverityToken from '~/sidebar/components/severity/severity.vue'; describe('SeverityToken', () => { let wrapper; diff --git a/spec/frontend/sidebar/components/severity/sidebar_severity_spec.js b/spec/frontend/sidebar/components/severity/sidebar_severity_spec.js index fa40d75d4e9..747d370e1cf 100644 --- a/spec/frontend/sidebar/components/severity/sidebar_severity_spec.js +++ b/spec/frontend/sidebar/components/severity/sidebar_severity_spec.js @@ -1,11 +1,11 @@ -import { shallowMount } from '@vue/test-utils'; import { GlDropdown, GlDropdownItem, GlLoadingIcon, GlTooltip, GlSprintf } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import waitForPromises from 'helpers/wait_for_promises'; import createFlash from '~/flash'; -import SidebarSeverity from '~/sidebar/components/severity/sidebar_severity.vue'; -import SeverityToken from '~/sidebar/components/severity/severity.vue'; -import updateIssuableSeverity from '~/sidebar/components/severity/graphql/mutations/update_issuable_severity.mutation.graphql'; import { INCIDENT_SEVERITY, ISSUABLE_TYPES } from '~/sidebar/components/severity/constants'; +import updateIssuableSeverity from '~/sidebar/components/severity/graphql/mutations/update_issuable_severity.mutation.graphql'; +import SeverityToken from '~/sidebar/components/severity/severity.vue'; +import SidebarSeverity from '~/sidebar/components/severity/sidebar_severity.vue'; jest.mock('~/flash'); diff --git a/spec/frontend/sidebar/components/time_tracking/time_tracker_spec.js b/spec/frontend/sidebar/components/time_tracking/time_tracker_spec.js index d52a59bb67b..4d03aedf1be 100644 --- a/spec/frontend/sidebar/components/time_tracking/time_tracker_spec.js +++ b/spec/frontend/sidebar/components/time_tracking/time_tracker_spec.js @@ -1,6 +1,6 @@ import { mount } from '@vue/test-utils'; -import { createMockDirective } from 'helpers/vue_mock_directive'; import { stubTransition } from 'helpers/stub_transition'; +import { createMockDirective } from 'helpers/vue_mock_directive'; import TimeTracker from '~/sidebar/components/time_tracking/time_tracker.vue'; describe('Issuable Time Tracker', () => { diff --git a/spec/frontend/sidebar/confidential/edit_form_buttons_spec.js b/spec/frontend/sidebar/confidential/edit_form_buttons_spec.js index 8c868205295..427e3a89c29 100644 --- a/spec/frontend/sidebar/confidential/edit_form_buttons_spec.js +++ b/spec/frontend/sidebar/confidential/edit_form_buttons_spec.js @@ -1,9 +1,9 @@ import { shallowMount } from '@vue/test-utils'; import waitForPromises from 'helpers/wait_for_promises'; +import { deprecatedCreateFlash as flash } from '~/flash'; +import createStore from '~/notes/stores'; import EditFormButtons from '~/sidebar/components/confidential/edit_form_buttons.vue'; import eventHub from '~/sidebar/event_hub'; -import createStore from '~/notes/stores'; -import { deprecatedCreateFlash as flash } from '~/flash'; jest.mock('~/sidebar/event_hub', () => ({ $emit: jest.fn() })); jest.mock('~/flash'); diff --git a/spec/frontend/sidebar/confidential_issue_sidebar_spec.js b/spec/frontend/sidebar/confidential_issue_sidebar_spec.js index bc2df9305d0..93a6401b1fc 100644 --- a/spec/frontend/sidebar/confidential_issue_sidebar_spec.js +++ b/spec/frontend/sidebar/confidential_issue_sidebar_spec.js @@ -1,10 +1,10 @@ import { shallowMount } from '@vue/test-utils'; -import { mockTracking, triggerEvent } from 'helpers/tracking_helper'; import { useMockLocationHelper } from 'helpers/mock_window_location_helper'; -import ConfidentialIssueSidebar from '~/sidebar/components/confidential/confidential_issue_sidebar.vue'; -import EditForm from '~/sidebar/components/confidential/edit_form.vue'; +import { mockTracking, triggerEvent } from 'helpers/tracking_helper'; import createStore from '~/notes/stores'; import * as types from '~/notes/stores/mutation_types'; +import ConfidentialIssueSidebar from '~/sidebar/components/confidential/confidential_issue_sidebar.vue'; +import EditForm from '~/sidebar/components/confidential/edit_form.vue'; jest.mock('~/flash'); jest.mock('~/sidebar/services/sidebar_service'); diff --git a/spec/frontend/sidebar/lock/edit_form_buttons_spec.js b/spec/frontend/sidebar/lock/edit_form_buttons_spec.js index a14ca711204..49283ea99cf 100644 --- a/spec/frontend/sidebar/lock/edit_form_buttons_spec.js +++ b/spec/frontend/sidebar/lock/edit_form_buttons_spec.js @@ -1,9 +1,9 @@ import { mount } from '@vue/test-utils'; -import EditFormButtons from '~/sidebar/components/lock/edit_form_buttons.vue'; -import eventHub from '~/sidebar/event_hub'; import { deprecatedCreateFlash as flash } from '~/flash'; -import createStore from '~/notes/stores'; import { createStore as createMrStore } from '~/mr_notes/stores'; +import createStore from '~/notes/stores'; +import EditFormButtons from '~/sidebar/components/lock/edit_form_buttons.vue'; +import eventHub from '~/sidebar/event_hub'; import { ISSUABLE_TYPE_ISSUE, ISSUABLE_TYPE_MR } from './constants'; jest.mock('~/sidebar/event_hub', () => ({ $emit: jest.fn() })); diff --git a/spec/frontend/sidebar/lock/issuable_lock_form_spec.js b/spec/frontend/sidebar/lock/issuable_lock_form_spec.js index 92cdba4f1f2..1743e114bb0 100644 --- a/spec/frontend/sidebar/lock/issuable_lock_form_spec.js +++ b/spec/frontend/sidebar/lock/issuable_lock_form_spec.js @@ -1,10 +1,10 @@ import { shallowMount } from '@vue/test-utils'; import { mockTracking, triggerEvent } from 'helpers/tracking_helper'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; -import IssuableLockForm from '~/sidebar/components/lock/issuable_lock_form.vue'; -import EditForm from '~/sidebar/components/lock/edit_form.vue'; -import createStore from '~/notes/stores'; import { createStore as createMrStore } from '~/mr_notes/stores'; +import createStore from '~/notes/stores'; +import EditForm from '~/sidebar/components/lock/edit_form.vue'; +import IssuableLockForm from '~/sidebar/components/lock/issuable_lock_form.vue'; import { ISSUABLE_TYPE_ISSUE, ISSUABLE_TYPE_MR } from './constants'; describe('IssuableLockForm', () => { diff --git a/spec/frontend/sidebar/reviewer_title_spec.js b/spec/frontend/sidebar/reviewer_title_spec.js index cbd36040579..3c250be5d5e 100644 --- a/spec/frontend/sidebar/reviewer_title_spec.js +++ b/spec/frontend/sidebar/reviewer_title_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { mockTracking, triggerEvent } from 'helpers/tracking_helper'; import Component from '~/sidebar/components/reviewers/reviewer_title.vue'; diff --git a/spec/frontend/sidebar/reviewers_spec.js b/spec/frontend/sidebar/reviewers_spec.js index 9208fb7288b..fc24b51287f 100644 --- a/spec/frontend/sidebar/reviewers_spec.js +++ b/spec/frontend/sidebar/reviewers_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import { trimText } from 'helpers/text_helper'; import UsersMockHelper from 'helpers/user_mock_data_helper'; import Reviewer from '~/sidebar/components/reviewers/reviewers.vue'; diff --git a/spec/frontend/sidebar/sidebar_assignees_spec.js b/spec/frontend/sidebar/sidebar_assignees_spec.js index f1c13a5f818..e737b57e33d 100644 --- a/spec/frontend/sidebar/sidebar_assignees_spec.js +++ b/spec/frontend/sidebar/sidebar_assignees_spec.js @@ -1,11 +1,11 @@ import { shallowMount } from '@vue/test-utils'; -import AxiosMockAdapter from 'axios-mock-adapter'; import axios from 'axios'; -import SidebarAssignees from '~/sidebar/components/assignees/sidebar_assignees.vue'; +import AxiosMockAdapter from 'axios-mock-adapter'; import Assigness from '~/sidebar/components/assignees/assignees.vue'; import AssigneesRealtime from '~/sidebar/components/assignees/assignees_realtime.vue'; -import SidebarMediator from '~/sidebar/sidebar_mediator'; +import SidebarAssignees from '~/sidebar/components/assignees/sidebar_assignees.vue'; import SidebarService from '~/sidebar/services/sidebar_service'; +import SidebarMediator from '~/sidebar/sidebar_mediator'; import SidebarStore from '~/sidebar/stores/sidebar_store'; import Mock from './mock_data'; diff --git a/spec/frontend/sidebar/sidebar_move_issue_spec.js b/spec/frontend/sidebar/sidebar_move_issue_spec.js index 24bb5a8e916..6a7758ace40 100644 --- a/spec/frontend/sidebar/sidebar_move_issue_spec.js +++ b/spec/frontend/sidebar/sidebar_move_issue_spec.js @@ -1,10 +1,10 @@ -import $ from 'jquery'; import MockAdapter from 'axios-mock-adapter'; +import $ from 'jquery'; import axios from '~/lib/utils/axios_utils'; +import SidebarMoveIssue from '~/sidebar/lib/sidebar_move_issue'; +import SidebarService from '~/sidebar/services/sidebar_service'; import SidebarMediator from '~/sidebar/sidebar_mediator'; import SidebarStore from '~/sidebar/stores/sidebar_store'; -import SidebarService from '~/sidebar/services/sidebar_service'; -import SidebarMoveIssue from '~/sidebar/lib/sidebar_move_issue'; import Mock from './mock_data'; describe('SidebarMoveIssue', () => { diff --git a/spec/frontend/sidebar/sidebar_subscriptions_spec.js b/spec/frontend/sidebar/sidebar_subscriptions_spec.js index 18aaeabe3dd..d900fde7e70 100644 --- a/spec/frontend/sidebar/sidebar_subscriptions_spec.js +++ b/spec/frontend/sidebar/sidebar_subscriptions_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; import SidebarSubscriptions from '~/sidebar/components/subscriptions/sidebar_subscriptions.vue'; -import SidebarMediator from '~/sidebar/sidebar_mediator'; import SidebarService from '~/sidebar/services/sidebar_service'; +import SidebarMediator from '~/sidebar/sidebar_mediator'; import SidebarStore from '~/sidebar/stores/sidebar_store'; import Mock from './mock_data'; diff --git a/spec/frontend/sidebar/todo_spec.js b/spec/frontend/sidebar/todo_spec.js index 7b7e24f2a8f..ff6da3abad0 100644 --- a/spec/frontend/sidebar/todo_spec.js +++ b/spec/frontend/sidebar/todo_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon, GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import SidebarTodos from '~/sidebar/components/todo_toggle/todo.vue'; diff --git a/spec/frontend/snippets/components/edit_spec.js b/spec/frontend/snippets/components/edit_spec.js index 7a1c6e64614..2b6d3ca8c2a 100644 --- a/spec/frontend/snippets/components/edit_spec.js +++ b/spec/frontend/snippets/components/edit_spec.js @@ -1,29 +1,29 @@ -import VueApollo, { ApolloMutation } from 'vue-apollo'; import { GlLoadingIcon } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; -import { nextTick } from 'vue'; import { merge } from 'lodash'; +import { nextTick } from 'vue'; +import VueApollo, { ApolloMutation } from 'vue-apollo'; import { useFakeDate } from 'helpers/fake_date'; -import waitForPromises from 'helpers/wait_for_promises'; import createMockApollo from 'helpers/mock_apollo_helper'; import { stubComponent } from 'helpers/stub_component'; +import waitForPromises from 'helpers/wait_for_promises'; import GetSnippetQuery from 'shared_queries/snippet/snippet.query.graphql'; +import CaptchaModal from '~/captcha/captcha_modal.vue'; import { deprecatedCreateFlash as Flash } from '~/flash'; import * as urlUtils from '~/lib/utils/url_utility'; import SnippetEditApp from '~/snippets/components/edit.vue'; -import CaptchaModal from '~/captcha/captcha_modal.vue'; +import SnippetBlobActionsEdit from '~/snippets/components/snippet_blob_actions_edit.vue'; import SnippetDescriptionEdit from '~/snippets/components/snippet_description_edit.vue'; import SnippetVisibilityEdit from '~/snippets/components/snippet_visibility_edit.vue'; -import SnippetBlobActionsEdit from '~/snippets/components/snippet_blob_actions_edit.vue'; -import TitleField from '~/vue_shared/components/form/title.vue'; -import FormFooterActions from '~/vue_shared/components/form/form_footer_actions.vue'; import { SNIPPET_VISIBILITY_PRIVATE, SNIPPET_VISIBILITY_INTERNAL, SNIPPET_VISIBILITY_PUBLIC, } from '~/snippets/constants'; -import UpdateSnippetMutation from '~/snippets/mutations/updateSnippet.mutation.graphql'; import CreateSnippetMutation from '~/snippets/mutations/createSnippet.mutation.graphql'; +import UpdateSnippetMutation from '~/snippets/mutations/updateSnippet.mutation.graphql'; +import FormFooterActions from '~/vue_shared/components/form/form_footer_actions.vue'; +import TitleField from '~/vue_shared/components/form/title.vue'; import { testEntries, createGQLSnippetsQueryResponse, createGQLSnippet } from '../test_utils'; jest.mock('~/flash'); diff --git a/spec/frontend/snippets/components/embed_dropdown_spec.js b/spec/frontend/snippets/components/embed_dropdown_spec.js index f1eb7d43409..389b1c618a3 100644 --- a/spec/frontend/snippets/components/embed_dropdown_spec.js +++ b/spec/frontend/snippets/components/embed_dropdown_spec.js @@ -1,6 +1,6 @@ -import { escape as esc } from 'lodash'; -import { mount } from '@vue/test-utils'; import { GlFormInputGroup } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; +import { escape as esc } from 'lodash'; import { TEST_HOST } from 'helpers/test_constants'; import EmbedDropdown from '~/snippets/components/embed_dropdown.vue'; diff --git a/spec/frontend/snippets/components/show_spec.js b/spec/frontend/snippets/components/show_spec.js index 6dbf7cfc4b4..e6162c6aad2 100644 --- a/spec/frontend/snippets/components/show_spec.js +++ b/spec/frontend/snippets/components/show_spec.js @@ -1,18 +1,17 @@ import { GlLoadingIcon } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import { Blob, BinaryBlob } from 'jest/blob/components/mock_data'; -import SnippetApp from '~/snippets/components/show.vue'; import EmbedDropdown from '~/snippets/components/embed_dropdown.vue'; +import SnippetApp from '~/snippets/components/show.vue'; +import SnippetBlob from '~/snippets/components/snippet_blob_view.vue'; import SnippetHeader from '~/snippets/components/snippet_header.vue'; import SnippetTitle from '~/snippets/components/snippet_title.vue'; -import SnippetBlob from '~/snippets/components/snippet_blob_view.vue'; -import CloneDropdownButton from '~/vue_shared/components/clone_dropdown.vue'; - import { SNIPPET_VISIBILITY_INTERNAL, SNIPPET_VISIBILITY_PRIVATE, SNIPPET_VISIBILITY_PUBLIC, } from '~/snippets/constants'; +import CloneDropdownButton from '~/vue_shared/components/clone_dropdown.vue'; describe('Snippet view app', () => { let wrapper; diff --git a/spec/frontend/snippets/components/snippet_blob_actions_edit_spec.js b/spec/frontend/snippets/components/snippet_blob_actions_edit_spec.js index 08056e788de..2693b26aeae 100644 --- a/spec/frontend/snippets/components/snippet_blob_actions_edit_spec.js +++ b/spec/frontend/snippets/components/snippet_blob_actions_edit_spec.js @@ -1,5 +1,5 @@ -import { times } from 'lodash'; import { shallowMount } from '@vue/test-utils'; +import { times } from 'lodash'; import SnippetBlobActionsEdit from '~/snippets/components/snippet_blob_actions_edit.vue'; import SnippetBlobEdit from '~/snippets/components/snippet_blob_edit.vue'; import { diff --git a/spec/frontend/snippets/components/snippet_blob_edit_spec.js b/spec/frontend/snippets/components/snippet_blob_edit_spec.js index 9d0311fd682..a7ab205ca7b 100644 --- a/spec/frontend/snippets/components/snippet_blob_edit_spec.js +++ b/spec/frontend/snippets/components/snippet_blob_edit_spec.js @@ -1,14 +1,14 @@ import { GlLoadingIcon } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import AxiosMockAdapter from 'axios-mock-adapter'; -import waitForPromises from 'helpers/wait_for_promises'; import { TEST_HOST } from 'helpers/test_constants'; -import SnippetBlobEdit from '~/snippets/components/snippet_blob_edit.vue'; +import waitForPromises from 'helpers/wait_for_promises'; import BlobHeaderEdit from '~/blob/components/blob_edit_header.vue'; -import EditorLite from '~/vue_shared/components/editor_lite.vue'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import { joinPaths } from '~/lib/utils/url_utility'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; +import SnippetBlobEdit from '~/snippets/components/snippet_blob_edit.vue'; +import EditorLite from '~/vue_shared/components/editor_lite.vue'; jest.mock('~/flash'); diff --git a/spec/frontend/snippets/components/snippet_blob_view_spec.js b/spec/frontend/snippets/components/snippet_blob_view_spec.js index 1ccecd7b5ba..b92c1907980 100644 --- a/spec/frontend/snippets/components/snippet_blob_view_spec.js +++ b/spec/frontend/snippets/components/snippet_blob_view_spec.js @@ -1,5 +1,5 @@ -import { nextTick } from 'vue'; import { mount } from '@vue/test-utils'; +import { nextTick } from 'vue'; import { Blob as BlobMock, SimpleViewerMock, @@ -7,16 +7,16 @@ import { RichBlobContentMock, SimpleBlobContentMock, } from 'jest/blob/components/mock_data'; -import SnippetBlobView from '~/snippets/components/snippet_blob_view.vue'; -import BlobHeader from '~/blob/components/blob_header.vue'; import BlobContent from '~/blob/components/blob_content.vue'; +import BlobHeader from '~/blob/components/blob_header.vue'; import { BLOB_RENDER_EVENT_LOAD, BLOB_RENDER_EVENT_SHOW_SOURCE, BLOB_RENDER_ERRORS, } from '~/blob/components/constants'; -import { RichViewer, SimpleViewer } from '~/vue_shared/components/blob_viewers'; +import SnippetBlobView from '~/snippets/components/snippet_blob_view.vue'; import { SNIPPET_VISIBILITY_PUBLIC } from '~/snippets/constants'; +import { RichViewer, SimpleViewer } from '~/vue_shared/components/blob_viewers'; describe('Blob Embeddable', () => { let wrapper; diff --git a/spec/frontend/snippets/components/snippet_header_spec.js b/spec/frontend/snippets/components/snippet_header_spec.js index 93a66db32c6..585614a6b79 100644 --- a/spec/frontend/snippets/components/snippet_header_spec.js +++ b/spec/frontend/snippets/components/snippet_header_spec.js @@ -1,11 +1,11 @@ -import { ApolloMutation } from 'vue-apollo'; import { GlButton, GlModal } from '@gitlab/ui'; import { mount } from '@vue/test-utils'; -import { Blob, BinaryBlob } from 'jest/blob/components/mock_data'; +import { ApolloMutation } from 'vue-apollo'; import waitForPromises from 'helpers/wait_for_promises'; -import DeleteSnippetMutation from '~/snippets/mutations/deleteSnippet.mutation.graphql'; -import SnippetHeader from '~/snippets/components/snippet_header.vue'; +import { Blob, BinaryBlob } from 'jest/blob/components/mock_data'; import { differenceInMilliseconds } from '~/lib/utils/datetime_utility'; +import SnippetHeader from '~/snippets/components/snippet_header.vue'; +import DeleteSnippetMutation from '~/snippets/mutations/deleteSnippet.mutation.graphql'; describe('Snippet header component', () => { let wrapper; diff --git a/spec/frontend/snippets/components/snippet_title_spec.js b/spec/frontend/snippets/components/snippet_title_spec.js index f201cfb19b7..48fb51ce703 100644 --- a/spec/frontend/snippets/components/snippet_title_spec.js +++ b/spec/frontend/snippets/components/snippet_title_spec.js @@ -1,7 +1,7 @@ import { GlSprintf } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; -import SnippetTitle from '~/snippets/components/snippet_title.vue'; import SnippetDescription from '~/snippets/components/snippet_description_view.vue'; +import SnippetTitle from '~/snippets/components/snippet_title.vue'; describe('Snippet header component', () => { let wrapper; diff --git a/spec/frontend/static_site_editor/components/edit_area_spec.js b/spec/frontend/static_site_editor/components/edit_area_spec.js index 07097d00cc5..17fb3fe788a 100644 --- a/spec/frontend/static_site_editor/components/edit_area_spec.js +++ b/spec/frontend/static_site_editor/components/edit_area_spec.js @@ -1,15 +1,14 @@ -import { nextTick } from 'vue'; import { shallowMount } from '@vue/test-utils'; +import { nextTick } from 'vue'; import { stubComponent } from 'helpers/stub_component'; -import RichContentEditor from '~/vue_shared/components/rich_content_editor/rich_content_editor.vue'; -import { EDITOR_TYPES } from '~/vue_shared/components/rich_content_editor/constants'; - import EditArea from '~/static_site_editor/components/edit_area.vue'; -import PublishToolbar from '~/static_site_editor/components/publish_toolbar.vue'; -import EditHeader from '~/static_site_editor/components/edit_header.vue'; import EditDrawer from '~/static_site_editor/components/edit_drawer.vue'; +import EditHeader from '~/static_site_editor/components/edit_header.vue'; +import PublishToolbar from '~/static_site_editor/components/publish_toolbar.vue'; import UnsavedChangesConfirmDialog from '~/static_site_editor/components/unsaved_changes_confirm_dialog.vue'; +import { EDITOR_TYPES } from '~/vue_shared/components/rich_content_editor/constants'; +import RichContentEditor from '~/vue_shared/components/rich_content_editor/rich_content_editor.vue'; import { sourceContentTitle as title, diff --git a/spec/frontend/static_site_editor/components/edit_drawer_spec.js b/spec/frontend/static_site_editor/components/edit_drawer_spec.js index c47eef59997..402dfe441c5 100644 --- a/spec/frontend/static_site_editor/components/edit_drawer_spec.js +++ b/spec/frontend/static_site_editor/components/edit_drawer_spec.js @@ -1,6 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; - import { GlDrawer } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import EditDrawer from '~/static_site_editor/components/edit_drawer.vue'; import FrontMatterControls from '~/static_site_editor/components/front_matter_controls.vue'; diff --git a/spec/frontend/static_site_editor/components/edit_meta_controls_spec.js b/spec/frontend/static_site_editor/components/edit_meta_controls_spec.js index cf82efc3d0b..7a8834933e0 100644 --- a/spec/frontend/static_site_editor/components/edit_meta_controls_spec.js +++ b/spec/frontend/static_site_editor/components/edit_meta_controls_spec.js @@ -1,6 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; - import { GlDropdown, GlDropdownItem, GlFormInput, GlFormTextarea } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import EditMetaControls from '~/static_site_editor/components/edit_meta_controls.vue'; diff --git a/spec/frontend/static_site_editor/components/edit_meta_modal_spec.js b/spec/frontend/static_site_editor/components/edit_meta_modal_spec.js index d80b28b91f8..3a336f6a230 100644 --- a/spec/frontend/static_site_editor/components/edit_meta_modal_spec.js +++ b/spec/frontend/static_site_editor/components/edit_meta_modal_spec.js @@ -1,12 +1,12 @@ -import { shallowMount } from '@vue/test-utils'; import { GlModal } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import { useLocalStorageSpy } from 'helpers/local_storage_helper'; import axios from '~/lib/utils/axios_utils'; -import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; -import EditMetaModal from '~/static_site_editor/components/edit_meta_modal.vue'; import EditMetaControls from '~/static_site_editor/components/edit_meta_controls.vue'; +import EditMetaModal from '~/static_site_editor/components/edit_meta_modal.vue'; import { MR_META_LOCAL_STORAGE_KEY } from '~/static_site_editor/constants'; +import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; import { sourcePath, mergeRequestMeta, diff --git a/spec/frontend/static_site_editor/components/front_matter_controls_spec.js b/spec/frontend/static_site_editor/components/front_matter_controls_spec.js index 8001f2fbd29..5fda3b40306 100644 --- a/spec/frontend/static_site_editor/components/front_matter_controls_spec.js +++ b/spec/frontend/static_site_editor/components/front_matter_controls_spec.js @@ -1,6 +1,6 @@ +import { GlFormGroup } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; -import { GlFormGroup } from '@gitlab/ui'; import { humanize } from '~/lib/utils/text_utility'; import FrontMatterControls from '~/static_site_editor/components/front_matter_controls.vue'; diff --git a/spec/frontend/static_site_editor/components/submit_changes_error_spec.js b/spec/frontend/static_site_editor/components/submit_changes_error_spec.js index 7af3014b338..82a5c5f624a 100644 --- a/spec/frontend/static_site_editor/components/submit_changes_error_spec.js +++ b/spec/frontend/static_site_editor/components/submit_changes_error_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton, GlAlert } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import SubmitChangesError from '~/static_site_editor/components/submit_changes_error.vue'; diff --git a/spec/frontend/static_site_editor/graphql/resolvers/submit_content_changes_spec.js b/spec/frontend/static_site_editor/graphql/resolvers/submit_content_changes_spec.js index 750b777cf5d..a0529f5f945 100644 --- a/spec/frontend/static_site_editor/graphql/resolvers/submit_content_changes_spec.js +++ b/spec/frontend/static_site_editor/graphql/resolvers/submit_content_changes_spec.js @@ -1,6 +1,6 @@ import savedContentMetaQuery from '~/static_site_editor/graphql/queries/saved_content_meta.query.graphql'; -import submitContentChanges from '~/static_site_editor/services/submit_content_changes'; import submitContentChangesResolver from '~/static_site_editor/graphql/resolvers/submit_content_changes'; +import submitContentChanges from '~/static_site_editor/services/submit_content_changes'; import { projectId as project, diff --git a/spec/frontend/static_site_editor/pages/home_spec.js b/spec/frontend/static_site_editor/pages/home_spec.js index 3e488a950dc..0936ba3011c 100644 --- a/spec/frontend/static_site_editor/pages/home_spec.js +++ b/spec/frontend/static_site_editor/pages/home_spec.js @@ -1,15 +1,15 @@ import { shallowMount, createLocalVue } from '@vue/test-utils'; import { mockTracking, unmockTracking } from 'helpers/tracking_helper'; -import Home from '~/static_site_editor/pages/home.vue'; -import SkeletonLoader from '~/static_site_editor/components/skeleton_loader.vue'; import EditArea from '~/static_site_editor/components/edit_area.vue'; import EditMetaModal from '~/static_site_editor/components/edit_meta_modal.vue'; import InvalidContentMessage from '~/static_site_editor/components/invalid_content_message.vue'; +import SkeletonLoader from '~/static_site_editor/components/skeleton_loader.vue'; import SubmitChangesError from '~/static_site_editor/components/submit_changes_error.vue'; -import submitContentChangesMutation from '~/static_site_editor/graphql/mutations/submit_content_changes.mutation.graphql'; +import { TRACKING_ACTION_INITIALIZE_EDITOR } from '~/static_site_editor/constants'; import hasSubmittedChangesMutation from '~/static_site_editor/graphql/mutations/has_submitted_changes.mutation.graphql'; +import submitContentChangesMutation from '~/static_site_editor/graphql/mutations/submit_content_changes.mutation.graphql'; +import Home from '~/static_site_editor/pages/home.vue'; import { SUCCESS_ROUTE } from '~/static_site_editor/router/constants'; -import { TRACKING_ACTION_INITIALIZE_EDITOR } from '~/static_site_editor/constants'; import { project, diff --git a/spec/frontend/static_site_editor/pages/success_spec.js b/spec/frontend/static_site_editor/pages/success_spec.js index 7d2d5edda84..fbdc2c435a0 100644 --- a/spec/frontend/static_site_editor/pages/success_spec.js +++ b/spec/frontend/static_site_editor/pages/success_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton, GlEmptyState, GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import Success from '~/static_site_editor/pages/success.vue'; import { HOME_ROUTE } from '~/static_site_editor/router/constants'; import { savedContentMeta, returnUrl, sourcePath } from '../mock_data'; diff --git a/spec/frontend/task_list_spec.js b/spec/frontend/task_list_spec.js index a8bdc506102..b6ac3167fea 100644 --- a/spec/frontend/task_list_spec.js +++ b/spec/frontend/task_list_spec.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import TaskList from '~/task_list'; import axios from '~/lib/utils/axios_utils'; +import TaskList from '~/task_list'; describe('TaskList', () => { let taskList; diff --git a/spec/frontend/terraform/components/states_table_spec.js b/spec/frontend/terraform/components/states_table_spec.js index dbef4d3f495..a9aeba202e0 100644 --- a/spec/frontend/terraform/components/states_table_spec.js +++ b/spec/frontend/terraform/components/states_table_spec.js @@ -1,8 +1,8 @@ import { GlIcon, GlTooltip } from '@gitlab/ui'; import { mount } from '@vue/test-utils'; import { useFakeDate } from 'helpers/fake_date'; -import StateActions from '~/terraform/components/states_table_actions.vue'; import StatesTable from '~/terraform/components/states_table.vue'; +import StateActions from '~/terraform/components/states_table_actions.vue'; describe('StatesTable', () => { let wrapper; diff --git a/spec/frontend/test_setup.js b/spec/frontend/test_setup.js index 61746b3c453..646f6b1f59d 100644 --- a/spec/frontend/test_setup.js +++ b/spec/frontend/test_setup.js @@ -5,10 +5,10 @@ import * as jqueryMatchers from 'custom-jquery-matchers'; import { config as testUtilsConfig } from '@vue/test-utils'; import { setGlobalDateToFakeDate } from 'helpers/fake_date'; import Translate from '~/vue_shared/translate'; -import { initializeTestTimeout } from './__helpers__/timeout'; import { getJSONFixture, loadHTMLFixture, setHTMLFixture } from './__helpers__/fixtures'; -import { setupManualMocks } from './mocks/mocks_helper'; +import { initializeTestTimeout } from './__helpers__/timeout'; import customMatchers from './matchers'; +import { setupManualMocks } from './mocks/mocks_helper'; import './__helpers__/dom_shims'; import './__helpers__/jquery'; diff --git a/spec/frontend/tooltips/components/tooltips_spec.js b/spec/frontend/tooltips/components/tooltips_spec.js index 3a894427643..e21626456e2 100644 --- a/spec/frontend/tooltips/components/tooltips_spec.js +++ b/spec/frontend/tooltips/components/tooltips_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlTooltip } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { useMockMutationObserver } from 'helpers/mock_dom_observer'; import Tooltips from '~/tooltips/components/tooltips.vue'; diff --git a/spec/frontend/user_lists/components/edit_user_list_spec.js b/spec/frontend/user_lists/components/edit_user_list_spec.js index 4149a43e06b..bd71a677a24 100644 --- a/spec/frontend/user_lists/components/edit_user_list_spec.js +++ b/spec/frontend/user_lists/components/edit_user_list_spec.js @@ -1,13 +1,13 @@ +import { GlAlert, GlLoadingIcon } from '@gitlab/ui'; +import { createLocalVue, mount } from '@vue/test-utils'; import Vue from 'vue'; import Vuex from 'vuex'; -import { createLocalVue, mount } from '@vue/test-utils'; -import { GlAlert, GlLoadingIcon } from '@gitlab/ui'; import waitForPromises from 'helpers/wait_for_promises'; import Api from '~/api'; -import createStore from '~/user_lists/store/edit'; +import { redirectTo } from '~/lib/utils/url_utility'; import EditUserList from '~/user_lists/components/edit_user_list.vue'; import UserListForm from '~/user_lists/components/user_list_form.vue'; -import { redirectTo } from '~/lib/utils/url_utility'; +import createStore from '~/user_lists/store/edit'; import { userList } from '../../feature_flags/mock_data'; jest.mock('~/api'); diff --git a/spec/frontend/user_lists/components/new_user_list_spec.js b/spec/frontend/user_lists/components/new_user_list_spec.js index 421b49f40e9..a81e8912714 100644 --- a/spec/frontend/user_lists/components/new_user_list_spec.js +++ b/spec/frontend/user_lists/components/new_user_list_spec.js @@ -1,12 +1,12 @@ +import { GlAlert } from '@gitlab/ui'; import { mount, createLocalVue } from '@vue/test-utils'; import Vue from 'vue'; import Vuex from 'vuex'; -import { GlAlert } from '@gitlab/ui'; import waitForPromises from 'helpers/wait_for_promises'; import Api from '~/api'; -import createStore from '~/user_lists/store/new'; -import NewUserList from '~/user_lists/components/new_user_list.vue'; import { redirectTo } from '~/lib/utils/url_utility'; +import NewUserList from '~/user_lists/components/new_user_list.vue'; +import createStore from '~/user_lists/store/new'; import { userList } from '../../feature_flags/mock_data'; jest.mock('~/api'); diff --git a/spec/frontend/user_lists/components/user_list_spec.js b/spec/frontend/user_lists/components/user_list_spec.js index cd00c421154..f016b5091d9 100644 --- a/spec/frontend/user_lists/components/user_list_spec.js +++ b/spec/frontend/user_lists/components/user_list_spec.js @@ -1,12 +1,12 @@ -import Vue from 'vue'; -import Vuex from 'vuex'; +import { GlAlert, GlEmptyState, GlLoadingIcon } from '@gitlab/ui'; import { mount } from '@vue/test-utils'; import { uniq } from 'lodash'; -import { GlAlert, GlEmptyState, GlLoadingIcon } from '@gitlab/ui'; +import Vue from 'vue'; +import Vuex from 'vuex'; import Api from '~/api'; -import { parseUserIds, stringifyUserIds } from '~/user_lists/store/utils'; -import createStore from '~/user_lists/store/show'; import UserList from '~/user_lists/components/user_list.vue'; +import createStore from '~/user_lists/store/show'; +import { parseUserIds, stringifyUserIds } from '~/user_lists/store/utils'; import { userList } from '../../feature_flags/mock_data'; jest.mock('~/api'); diff --git a/spec/frontend/user_lists/store/edit/actions_spec.js b/spec/frontend/user_lists/store/edit/actions_spec.js index 7f0fb8e5401..c4b0f888d3e 100644 --- a/spec/frontend/user_lists/store/edit/actions_spec.js +++ b/spec/frontend/user_lists/store/edit/actions_spec.js @@ -1,9 +1,9 @@ import testAction from 'helpers/vuex_action_helper'; import Api from '~/api'; -import createState from '~/user_lists/store/edit/state'; -import * as types from '~/user_lists/store/edit/mutation_types'; -import * as actions from '~/user_lists/store/edit/actions'; import { redirectTo } from '~/lib/utils/url_utility'; +import * as actions from '~/user_lists/store/edit/actions'; +import * as types from '~/user_lists/store/edit/mutation_types'; +import createState from '~/user_lists/store/edit/state'; import { userList } from '../../../feature_flags/mock_data'; jest.mock('~/api'); diff --git a/spec/frontend/user_lists/store/edit/mutations_spec.js b/spec/frontend/user_lists/store/edit/mutations_spec.js index 3d4d2a59717..0943c64e934 100644 --- a/spec/frontend/user_lists/store/edit/mutations_spec.js +++ b/spec/frontend/user_lists/store/edit/mutations_spec.js @@ -1,7 +1,7 @@ import statuses from '~/user_lists/constants/edit'; -import createState from '~/user_lists/store/edit/state'; import * as types from '~/user_lists/store/edit/mutation_types'; import mutations from '~/user_lists/store/edit/mutations'; +import createState from '~/user_lists/store/edit/state'; import { userList } from '../../../feature_flags/mock_data'; describe('User List Edit Mutations', () => { diff --git a/spec/frontend/user_lists/store/new/actions_spec.js b/spec/frontend/user_lists/store/new/actions_spec.js index 9cc6212a125..916ec2e6da7 100644 --- a/spec/frontend/user_lists/store/new/actions_spec.js +++ b/spec/frontend/user_lists/store/new/actions_spec.js @@ -1,9 +1,9 @@ import testAction from 'helpers/vuex_action_helper'; import Api from '~/api'; -import createState from '~/user_lists/store/new/state'; -import * as types from '~/user_lists/store/new/mutation_types'; -import * as actions from '~/user_lists/store/new/actions'; import { redirectTo } from '~/lib/utils/url_utility'; +import * as actions from '~/user_lists/store/new/actions'; +import * as types from '~/user_lists/store/new/mutation_types'; +import createState from '~/user_lists/store/new/state'; import { userList } from '../../../feature_flags/mock_data'; jest.mock('~/api'); diff --git a/spec/frontend/user_lists/store/new/mutations_spec.js b/spec/frontend/user_lists/store/new/mutations_spec.js index 89e8a83eb25..a928849e941 100644 --- a/spec/frontend/user_lists/store/new/mutations_spec.js +++ b/spec/frontend/user_lists/store/new/mutations_spec.js @@ -1,6 +1,6 @@ -import createState from '~/user_lists/store/new/state'; import * as types from '~/user_lists/store/new/mutation_types'; import mutations from '~/user_lists/store/new/mutations'; +import createState from '~/user_lists/store/new/state'; describe('User List Edit Mutations', () => { let state; diff --git a/spec/frontend/user_lists/store/show/actions_spec.js b/spec/frontend/user_lists/store/show/actions_spec.js index 25a6b9ec0e4..7b82fd8cf24 100644 --- a/spec/frontend/user_lists/store/show/actions_spec.js +++ b/spec/frontend/user_lists/store/show/actions_spec.js @@ -1,10 +1,10 @@ import testAction from 'helpers/vuex_action_helper'; import { userList } from 'jest/feature_flags/mock_data'; import Api from '~/api'; -import { stringifyUserIds } from '~/user_lists/store/utils'; -import createState from '~/user_lists/store/show/state'; -import * as types from '~/user_lists/store/show/mutation_types'; import * as actions from '~/user_lists/store/show/actions'; +import * as types from '~/user_lists/store/show/mutation_types'; +import createState from '~/user_lists/store/show/state'; +import { stringifyUserIds } from '~/user_lists/store/utils'; jest.mock('~/api'); diff --git a/spec/frontend/user_lists/store/show/mutations_spec.js b/spec/frontend/user_lists/store/show/mutations_spec.js index cd379641ee1..92e2fcb06be 100644 --- a/spec/frontend/user_lists/store/show/mutations_spec.js +++ b/spec/frontend/user_lists/store/show/mutations_spec.js @@ -1,9 +1,9 @@ import { uniq } from 'lodash'; import { userList } from 'jest/feature_flags/mock_data'; -import createState from '~/user_lists/store/show/state'; -import mutations from '~/user_lists/store/show/mutations'; import { states } from '~/user_lists/constants/show'; import * as types from '~/user_lists/store/show/mutation_types'; +import mutations from '~/user_lists/store/show/mutations'; +import createState from '~/user_lists/store/show/state'; describe('User Lists Show Mutations', () => { let mockState; diff --git a/spec/frontend/user_popovers_spec.js b/spec/frontend/user_popovers_spec.js index 1e0c4dd29ee..7c9c3d69efa 100644 --- a/spec/frontend/user_popovers_spec.js +++ b/spec/frontend/user_popovers_spec.js @@ -1,5 +1,5 @@ -import initUserPopovers from '~/user_popovers'; import UsersCache from '~/lib/utils/users_cache'; +import initUserPopovers from '~/user_popovers'; describe('User Popovers', () => { const fixtureTemplate = 'merge_requests/merge_request_with_mentions.html'; diff --git a/spec/frontend/vue_mr_widget/components/approvals/approvals_spec.js b/spec/frontend/vue_mr_widget/components/approvals/approvals_spec.js index fd8b0dddc61..d6a1c2d3b07 100644 --- a/spec/frontend/vue_mr_widget/components/approvals/approvals_spec.js +++ b/spec/frontend/vue_mr_widget/components/approvals/approvals_spec.js @@ -1,9 +1,9 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import Approvals from '~/vue_merge_request_widget/components/approvals/approvals.vue'; import ApprovalsSummary from '~/vue_merge_request_widget/components/approvals/approvals_summary.vue'; import ApprovalsSummaryOptional from '~/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; import { FETCH_LOADING, FETCH_ERROR, diff --git a/spec/frontend/vue_mr_widget/components/approvals/approvals_summary_optional_spec.js b/spec/frontend/vue_mr_widget/components/approvals/approvals_summary_optional_spec.js index d9a5230f55f..65cafc647e0 100644 --- a/spec/frontend/vue_mr_widget/components/approvals/approvals_summary_optional_spec.js +++ b/spec/frontend/vue_mr_widget/components/approvals/approvals_summary_optional_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLink } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import ApprovalsSummaryOptional from '~/vue_merge_request_widget/components/approvals/approvals_summary_optional.vue'; const TEST_HELP_PATH = 'help/path'; diff --git a/spec/frontend/vue_mr_widget/components/approvals/approvals_summary_spec.js b/spec/frontend/vue_mr_widget/components/approvals/approvals_summary_spec.js index b8ba619fbb1..ef712ec23a6 100644 --- a/spec/frontend/vue_mr_widget/components/approvals/approvals_summary_spec.js +++ b/spec/frontend/vue_mr_widget/components/approvals/approvals_summary_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; -import { APPROVED_MESSAGE } from '~/vue_merge_request_widget/components/approvals/messages'; -import ApprovalsSummary from '~/vue_merge_request_widget/components/approvals/approvals_summary.vue'; import { toNounSeriesText } from '~/lib/utils/grammar'; +import ApprovalsSummary from '~/vue_merge_request_widget/components/approvals/approvals_summary.vue'; +import { APPROVED_MESSAGE } from '~/vue_merge_request_widget/components/approvals/messages'; import UserAvatarList from '~/vue_shared/components/user_avatar/user_avatar_list.vue'; const testApprovers = () => Array.from({ length: 5 }, (_, i) => i).map((id) => ({ id })); diff --git a/spec/frontend/vue_mr_widget/components/artifacts_list_app_spec.js b/spec/frontend/vue_mr_widget/components/artifacts_list_app_spec.js index 2e1e21299b3..b2cc7d9be6b 100644 --- a/spec/frontend/vue_mr_widget/components/artifacts_list_app_spec.js +++ b/spec/frontend/vue_mr_widget/components/artifacts_list_app_spec.js @@ -1,8 +1,8 @@ +import { GlLoadingIcon } from '@gitlab/ui'; import { mount } from '@vue/test-utils'; -import Vuex from 'vuex'; -import Vue, { nextTick } from 'vue'; import MockAdapter from 'axios-mock-adapter'; -import { GlLoadingIcon } from '@gitlab/ui'; +import Vue, { nextTick } from 'vue'; +import Vuex from 'vuex'; import { TEST_HOST as FAKE_ENDPOINT } from 'helpers/test_constants'; import axios from '~/lib/utils/axios_utils'; import ArtifactsListApp from '~/vue_merge_request_widget/components/artifacts_list_app.vue'; diff --git a/spec/frontend/vue_mr_widget/components/artifacts_list_spec.js b/spec/frontend/vue_mr_widget/components/artifacts_list_spec.js index fd432381512..712abfe228a 100644 --- a/spec/frontend/vue_mr_widget/components/artifacts_list_spec.js +++ b/spec/frontend/vue_mr_widget/components/artifacts_list_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLink } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import ArtifactsList from '~/vue_merge_request_widget/components/artifacts_list.vue'; import { artifacts } from '../mock_data'; diff --git a/spec/frontend/vue_mr_widget/components/mr_collapsible_extension_spec.js b/spec/frontend/vue_mr_widget/components/mr_collapsible_extension_spec.js index ba2a8ee0a41..94d4cccab5f 100644 --- a/spec/frontend/vue_mr_widget/components/mr_collapsible_extension_spec.js +++ b/spec/frontend/vue_mr_widget/components/mr_collapsible_extension_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import MrCollapsibleSection from '~/vue_merge_request_widget/components/mr_collapsible_extension.vue'; describe('Merge Request Collapsible Extension', () => { diff --git a/spec/frontend/vue_mr_widget/components/mr_widget_alert_message_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_alert_message_spec.js index 720ce613b85..07e869a070f 100644 --- a/spec/frontend/vue_mr_widget/components/mr_widget_alert_message_spec.js +++ b/spec/frontend/vue_mr_widget/components/mr_widget_alert_message_spec.js @@ -1,5 +1,5 @@ -import { shallowMount, createLocalVue } from '@vue/test-utils'; import { GlLink } from '@gitlab/ui'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; import MrWidgetAlertMessage from '~/vue_merge_request_widget/components/mr_widget_alert_message.vue'; describe('MrWidgetAlertMessage', () => { diff --git a/spec/frontend/vue_mr_widget/components/mr_widget_icon_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_icon_spec.js index 4bcae904ddc..ebd10f31fa7 100644 --- a/spec/frontend/vue_mr_widget/components/mr_widget_icon_spec.js +++ b/spec/frontend/vue_mr_widget/components/mr_widget_icon_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import MrWidgetIcon from '~/vue_merge_request_widget/components/mr_widget_icon.vue'; const TEST_ICON = 'commit'; diff --git a/spec/frontend/vue_mr_widget/components/mr_widget_memory_usage_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_memory_usage_spec.js index 79a0dd1e760..f55d313a719 100644 --- a/spec/frontend/vue_mr_widget/components/mr_widget_memory_usage_spec.js +++ b/spec/frontend/vue_mr_widget/components/mr_widget_memory_usage_spec.js @@ -1,6 +1,6 @@ -import Vue from 'vue'; import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; +import Vue from 'vue'; import MemoryUsage from '~/vue_merge_request_widget/components/deployment/memory_usage.vue'; import MRWidgetService from '~/vue_merge_request_widget/services/mr_widget_service'; diff --git a/spec/frontend/vue_mr_widget/components/mr_widget_pipeline_container_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_pipeline_container_spec.js index bc192a7d9d8..3baade5161e 100644 --- a/spec/frontend/vue_mr_widget/components/mr_widget_pipeline_container_spec.js +++ b/spec/frontend/vue_mr_widget/components/mr_widget_pipeline_container_spec.js @@ -1,9 +1,9 @@ import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; -import MrWidgetPipelineContainer from '~/vue_merge_request_widget/components/mr_widget_pipeline_container.vue'; -import MrWidgetPipeline from '~/vue_merge_request_widget/components/mr_widget_pipeline.vue'; -import ArtifactsApp from '~/vue_merge_request_widget/components/artifacts_list_app.vue'; import axios from '~/lib/utils/axios_utils'; +import ArtifactsApp from '~/vue_merge_request_widget/components/artifacts_list_app.vue'; +import MrWidgetPipeline from '~/vue_merge_request_widget/components/mr_widget_pipeline.vue'; +import MrWidgetPipelineContainer from '~/vue_merge_request_widget/components/mr_widget_pipeline_container.vue'; import { mockStore } from '../mock_data'; describe('MrWidgetPipelineContainer', () => { diff --git a/spec/frontend/vue_mr_widget/components/mr_widget_pipeline_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_pipeline_spec.js index 3e5ab5cd32d..b93236d4628 100644 --- a/spec/frontend/vue_mr_widget/components/mr_widget_pipeline_spec.js +++ b/spec/frontend/vue_mr_widget/components/mr_widget_pipeline_spec.js @@ -1,9 +1,9 @@ -import { shallowMount, mount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount, mount } from '@vue/test-utils'; import { trimText } from 'helpers/text_helper'; -import { SUCCESS } from '~/vue_merge_request_widget/constants'; -import PipelineComponent from '~/vue_merge_request_widget/components/mr_widget_pipeline.vue'; import PipelineStage from '~/pipelines/components/pipelines_list/stage.vue'; +import PipelineComponent from '~/vue_merge_request_widget/components/mr_widget_pipeline.vue'; +import { SUCCESS } from '~/vue_merge_request_widget/constants'; import mockData from '../mock_data'; describe('MRWidgetPipeline', () => { diff --git a/spec/frontend/vue_mr_widget/components/mr_widget_rebase_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_rebase_spec.js index bdd038edd71..5081e1e5906 100644 --- a/spec/frontend/vue_mr_widget/components/mr_widget_rebase_spec.js +++ b/spec/frontend/vue_mr_widget/components/mr_widget_rebase_spec.js @@ -1,7 +1,7 @@ -import { nextTick } from 'vue'; import { shallowMount } from '@vue/test-utils'; -import eventHub from '~/vue_merge_request_widget/event_hub'; +import { nextTick } from 'vue'; import WidgetRebase from '~/vue_merge_request_widget/components/states/mr_widget_rebase.vue'; +import eventHub from '~/vue_merge_request_widget/event_hub'; let wrapper; diff --git a/spec/frontend/vue_mr_widget/components/mr_widget_suggest_pipeline_spec.js b/spec/frontend/vue_mr_widget/components/mr_widget_suggest_pipeline_spec.js index 6ce6253c74d..b5afc1ab21a 100644 --- a/spec/frontend/vue_mr_widget/components/mr_widget_suggest_pipeline_spec.js +++ b/spec/frontend/vue_mr_widget/components/mr_widget_suggest_pipeline_spec.js @@ -1,11 +1,10 @@ -import { mount, shallowMount } from '@vue/test-utils'; import { GlLink, GlSprintf } from '@gitlab/ui'; +import { mount, shallowMount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import { mockTracking, triggerEvent, unmockTracking } from 'helpers/tracking_helper'; -import suggestPipelineComponent from '~/vue_merge_request_widget/components/mr_widget_suggest_pipeline.vue'; -import MrWidgetIcon from '~/vue_merge_request_widget/components/mr_widget_icon.vue'; -import dismissibleContainer from '~/vue_shared/components/dismissible_container.vue'; import axios from '~/lib/utils/axios_utils'; +import MrWidgetIcon from '~/vue_merge_request_widget/components/mr_widget_icon.vue'; +import suggestPipelineComponent from '~/vue_merge_request_widget/components/mr_widget_suggest_pipeline.vue'; import { SP_TRACK_LABEL, SP_LINK_TRACK_EVENT, @@ -14,6 +13,7 @@ import { SP_SHOW_TRACK_VALUE, SP_HELP_URL, } from '~/vue_merge_request_widget/constants'; +import dismissibleContainer from '~/vue_shared/components/dismissible_container.vue'; import { suggestProps, iconName } from './pipeline_tour_mock_data'; describe('MRWidgetSuggestPipeline', () => { diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js index d309aa905e8..4dd1bd2aa9c 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_enabled_spec.js @@ -1,11 +1,11 @@ -import { nextTick } from 'vue'; import { shallowMount } from '@vue/test-utils'; +import { nextTick } from 'vue'; import { trimText } from 'helpers/text_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import autoMergeEnabledComponent from '~/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue'; -import MRWidgetService from '~/vue_merge_request_widget/services/mr_widget_service'; -import eventHub from '~/vue_merge_request_widget/event_hub'; import { MWPS_MERGE_STRATEGY } from '~/vue_merge_request_widget/constants'; +import eventHub from '~/vue_merge_request_widget/event_hub'; +import MRWidgetService from '~/vue_merge_request_widget/services/mr_widget_service'; let wrapper; let mergeRequestWidgetGraphqlEnabled = false; diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js index dca3798f7ea..24198096564 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_auto_merge_failed_spec.js @@ -1,6 +1,6 @@ -import { nextTick } from 'vue'; -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon, GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; +import { nextTick } from 'vue'; import AutoMergeFailedComponent from '~/vue_merge_request_widget/components/states/mr_widget_auto_merge_failed.vue'; import eventHub from '~/vue_merge_request_widget/event_hub'; diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_commit_message_dropdown_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_commit_message_dropdown_spec.js index 706d60368b5..4c763f40cbe 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_commit_message_dropdown_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_commit_message_dropdown_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlDropdownItem } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import CommitMessageDropdown from '~/vue_merge_request_widget/components/states/commit_message_dropdown.vue'; const commits = [ diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js index f5a059698b6..d3fc1e0e05b 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_conflicts_spec.js @@ -1,7 +1,7 @@ -import $ from 'jquery'; import { createLocalVue, shallowMount } from '@vue/test-utils'; -import { removeBreakLine } from 'helpers/text_helper'; +import $ from 'jquery'; import { TEST_HOST } from 'helpers/test_constants'; +import { removeBreakLine } from 'helpers/text_helper'; import ConflictsComponent from '~/vue_merge_request_widget/components/states/mr_widget_conflicts.vue'; describe('MRWidgetConflicts', () => { diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_merged_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_merged_spec.js index 8e61bf2dda5..6af8ac9e18e 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_merged_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_merged_spec.js @@ -1,10 +1,10 @@ -import Vue from 'vue'; import { getByRole } from '@testing-library/dom'; +import Vue from 'vue'; import mountComponent from 'helpers/vue_mount_component_helper'; +import { OPEN_REVERT_MODAL, OPEN_CHERRY_PICK_MODAL } from '~/projects/commit/constants'; +import modalEventHub from '~/projects/commit/event_hub'; import mergedComponent from '~/vue_merge_request_widget/components/states/mr_widget_merged.vue'; import eventHub from '~/vue_merge_request_widget/event_hub'; -import modalEventHub from '~/projects/commit/event_hub'; -import { OPEN_REVERT_MODAL, OPEN_CHERRY_PICK_MODAL } from '~/projects/commit/constants'; describe('MRWidgetMerged', () => { let vm; diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_pipeline_failed_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_pipeline_failed_spec.js index ed3e7d9c0eb..3e0840fef4e 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_pipeline_failed_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_pipeline_failed_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; -import PipelineFailed from '~/vue_merge_request_widget/components/states/pipeline_failed.vue'; import statusIcon from '~/vue_merge_request_widget/components/mr_widget_status_icon.vue'; +import PipelineFailed from '~/vue_merge_request_widget/components/states/pipeline_failed.vue'; describe('PipelineFailed', () => { let wrapper; diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js index 8eddf59820c..983e4a35078 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_ready_to_merge_spec.js @@ -1,14 +1,14 @@ -import Vue from 'vue'; import { createLocalVue, shallowMount } from '@vue/test-utils'; -import ReadyToMerge from '~/vue_merge_request_widget/components/states/ready_to_merge.vue'; -import SquashBeforeMerge from '~/vue_merge_request_widget/components/states/squash_before_merge.vue'; -import CommitsHeader from '~/vue_merge_request_widget/components/states/commits_header.vue'; +import Vue from 'vue'; +import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests'; +import simplePoll from '~/lib/utils/simple_poll'; import CommitEdit from '~/vue_merge_request_widget/components/states/commit_edit.vue'; import CommitMessageDropdown from '~/vue_merge_request_widget/components/states/commit_message_dropdown.vue'; -import eventHub from '~/vue_merge_request_widget/event_hub'; +import CommitsHeader from '~/vue_merge_request_widget/components/states/commits_header.vue'; +import ReadyToMerge from '~/vue_merge_request_widget/components/states/ready_to_merge.vue'; +import SquashBeforeMerge from '~/vue_merge_request_widget/components/states/squash_before_merge.vue'; import { MWPS_MERGE_STRATEGY, MTWPS_MERGE_STRATEGY } from '~/vue_merge_request_widget/constants'; -import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests'; -import simplePoll from '~/lib/utils/simple_poll'; +import eventHub from '~/vue_merge_request_widget/event_hub'; jest.mock('~/lib/utils/simple_poll', () => jest.fn().mockImplementation(jest.requireActual('~/lib/utils/simple_poll').default), diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js index 38920846a50..ef6a9b1e8fc 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_sha_mismatch_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import mountComponent from 'helpers/vue_mount_component_helper'; import { removeBreakLine } from 'helpers/text_helper'; +import mountComponent from 'helpers/vue_mount_component_helper'; import ShaMismatch from '~/vue_merge_request_widget/components/states/sha_mismatch.vue'; describe('ShaMismatch', () => { diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js index cc160f6182d..8ead0002950 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js @@ -1,5 +1,5 @@ -import { createLocalVue, shallowMount } from '@vue/test-utils'; import { GlFormCheckbox } from '@gitlab/ui'; +import { createLocalVue, shallowMount } from '@vue/test-utils'; import SquashBeforeMerge from '~/vue_merge_request_widget/components/states/squash_before_merge.vue'; import { SQUASH_BEFORE_MERGE } from '~/vue_merge_request_widget/i18n'; diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_unresolved_discussions_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_unresolved_discussions_spec.js index a5531577a8c..6c0d69ea109 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_unresolved_discussions_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_unresolved_discussions_spec.js @@ -1,7 +1,7 @@ import { mount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; -import UnresolvedDiscussions from '~/vue_merge_request_widget/components/states/unresolved_discussions.vue'; import notesEventHub from '~/notes/event_hub'; +import UnresolvedDiscussions from '~/vue_merge_request_widget/components/states/unresolved_discussions.vue'; function createComponent({ path = '' } = {}) { return mount(UnresolvedDiscussions, { diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js index 6d63d4b1be3..e0077a008a2 100644 --- a/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js +++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_wip_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import WorkInProgress from '~/vue_merge_request_widget/components/states/work_in_progress.vue'; import eventHub from '~/vue_merge_request_widget/event_hub'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; jest.mock('~/flash'); diff --git a/spec/frontend/vue_mr_widget/components/terraform/mr_widget_terraform_container_spec.js b/spec/frontend/vue_mr_widget/components/terraform/mr_widget_terraform_container_spec.js index a9b852b084d..364f849eb4f 100644 --- a/spec/frontend/vue_mr_widget/components/terraform/mr_widget_terraform_container_spec.js +++ b/spec/frontend/vue_mr_widget/components/terraform/mr_widget_terraform_container_spec.js @@ -2,9 +2,9 @@ import { GlDeprecatedSkeletonLoading as GlSkeletonLoading, GlSprintf } from '@gi import { shallowMount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import axios from '~/lib/utils/axios_utils'; +import Poll from '~/lib/utils/poll'; import MrWidgetExpanableSection from '~/vue_merge_request_widget/components/mr_widget_expandable_section.vue'; import MrWidgetTerraformContainer from '~/vue_merge_request_widget/components/terraform/mr_widget_terraform_container.vue'; -import Poll from '~/lib/utils/poll'; import TerraformPlan from '~/vue_merge_request_widget/components/terraform/terraform_plan.vue'; import { invalidPlanWithName, plans, validPlanWithName } from './mock_data'; diff --git a/spec/frontend/vue_mr_widget/deployment/deployment_action_button_spec.js b/spec/frontend/vue_mr_widget/deployment/deployment_action_button_spec.js index bc0d2501809..8c5036e35f6 100644 --- a/spec/frontend/vue_mr_widget/deployment/deployment_action_button_spec.js +++ b/spec/frontend/vue_mr_widget/deployment/deployment_action_button_spec.js @@ -1,12 +1,12 @@ -import { mount } from '@vue/test-utils'; import { GlIcon, GlLoadingIcon, GlButton } from '@gitlab/ui'; -import DeploymentActionButton from '~/vue_merge_request_widget/components/deployment/deployment_action_button.vue'; +import { mount } from '@vue/test-utils'; import { CREATED, RUNNING, DEPLOYING, REDEPLOYING, } from '~/vue_merge_request_widget/components/deployment/constants'; +import DeploymentActionButton from '~/vue_merge_request_widget/components/deployment/deployment_action_button.vue'; import { actionButtonMocks } from './deployment_mock_data'; const baseProps = { diff --git a/spec/frontend/vue_mr_widget/deployment/deployment_actions_spec.js b/spec/frontend/vue_mr_widget/deployment/deployment_actions_spec.js index 13c0665f929..22e58ac6abf 100644 --- a/spec/frontend/vue_mr_widget/deployment/deployment_actions_spec.js +++ b/spec/frontend/vue_mr_widget/deployment/deployment_actions_spec.js @@ -1,8 +1,6 @@ import { mount } from '@vue/test-utils'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { visitUrl } from '~/lib/utils/url_utility'; -import MRWidgetService from '~/vue_merge_request_widget/services/mr_widget_service'; -import DeploymentActions from '~/vue_merge_request_widget/components/deployment/deployment_actions.vue'; import { CREATED, MANUAL_DEPLOY, @@ -11,6 +9,8 @@ import { REDEPLOYING, STOPPING, } from '~/vue_merge_request_widget/components/deployment/constants'; +import DeploymentActions from '~/vue_merge_request_widget/components/deployment/deployment_actions.vue'; +import MRWidgetService from '~/vue_merge_request_widget/services/mr_widget_service'; import { actionButtonMocks, deploymentMockData, diff --git a/spec/frontend/vue_mr_widget/deployment/deployment_spec.js b/spec/frontend/vue_mr_widget/deployment/deployment_spec.js index 87bf32351bd..c27cbd8b781 100644 --- a/spec/frontend/vue_mr_widget/deployment/deployment_spec.js +++ b/spec/frontend/vue_mr_widget/deployment/deployment_spec.js @@ -1,7 +1,4 @@ import { mount } from '@vue/test-utils'; -import DeploymentComponent from '~/vue_merge_request_widget/components/deployment/deployment.vue'; -import DeploymentInfo from '~/vue_merge_request_widget/components/deployment/deployment_info.vue'; -import DeploymentViewButton from '~/vue_merge_request_widget/components/deployment/deployment_view_button.vue'; import { CREATED, RUNNING, @@ -10,6 +7,9 @@ import { CANCELED, SKIPPED, } from '~/vue_merge_request_widget/components/deployment/constants'; +import DeploymentComponent from '~/vue_merge_request_widget/components/deployment/deployment.vue'; +import DeploymentInfo from '~/vue_merge_request_widget/components/deployment/deployment_info.vue'; +import DeploymentViewButton from '~/vue_merge_request_widget/components/deployment/deployment_view_button.vue'; import { deploymentMockData, playDetails, retryDetails } from './deployment_mock_data'; describe('Deployment component', () => { diff --git a/spec/frontend/vue_mr_widget/mr_widget_options_spec.js b/spec/frontend/vue_mr_widget/mr_widget_options_spec.js index 872dcd2af7f..7b020813bd5 100644 --- a/spec/frontend/vue_mr_widget/mr_widget_options_spec.js +++ b/spec/frontend/vue_mr_widget/mr_widget_options_spec.js @@ -1,17 +1,17 @@ import { mount } from '@vue/test-utils'; +import MockAdapter from 'axios-mock-adapter'; import Vue, { nextTick } from 'vue'; import VueApollo from 'vue-apollo'; -import MockAdapter from 'axios-mock-adapter'; import createMockApollo from 'helpers/mock_apollo_helper'; import { securityReportDownloadPathsQueryResponse } from 'jest/vue_shared/security_reports/mock_data'; import axios from '~/lib/utils/axios_utils'; -import MrWidgetOptions from '~/vue_merge_request_widget/mr_widget_options.vue'; -import eventHub from '~/vue_merge_request_widget/event_hub'; +import { setFaviconOverlay } from '~/lib/utils/favicon'; import notify from '~/lib/utils/notify'; import SmartInterval from '~/smart_interval'; -import { setFaviconOverlay } from '~/lib/utils/favicon'; -import { stateKey } from '~/vue_merge_request_widget/stores/state_maps'; import { SUCCESS } from '~/vue_merge_request_widget/components/deployment/constants'; +import eventHub from '~/vue_merge_request_widget/event_hub'; +import MrWidgetOptions from '~/vue_merge_request_widget/mr_widget_options.vue'; +import { stateKey } from '~/vue_merge_request_widget/stores/state_maps'; import securityReportDownloadPathsQuery from '~/vue_shared/security_reports/queries/security_report_download_paths.query.graphql'; import { faviconDataUrl, overlayDataUrl } from '../lib/utils/mock_data'; import mockData from './mock_data'; diff --git a/spec/frontend/vue_mr_widget/stores/artifacts_list/actions_spec.js b/spec/frontend/vue_mr_widget/stores/artifacts_list/actions_spec.js index 1dfa7564535..9423fa17c44 100644 --- a/spec/frontend/vue_mr_widget/stores/artifacts_list/actions_spec.js +++ b/spec/frontend/vue_mr_widget/stores/artifacts_list/actions_spec.js @@ -1,6 +1,6 @@ import MockAdapter from 'axios-mock-adapter'; -import testAction from 'helpers/vuex_action_helper'; import { TEST_HOST } from 'helpers/test_constants'; +import testAction from 'helpers/vuex_action_helper'; import axios from '~/lib/utils/axios_utils'; import { setEndpoint, @@ -11,8 +11,8 @@ import { receiveArtifactsSuccess, receiveArtifactsError, } from '~/vue_merge_request_widget/stores/artifacts_list/actions'; -import state from '~/vue_merge_request_widget/stores/artifacts_list/state'; import * as types from '~/vue_merge_request_widget/stores/artifacts_list/mutation_types'; +import state from '~/vue_merge_request_widget/stores/artifacts_list/state'; describe('Artifacts App Store Actions', () => { let mockedState; diff --git a/spec/frontend/vue_mr_widget/stores/artifacts_list/mutations_spec.js b/spec/frontend/vue_mr_widget/stores/artifacts_list/mutations_spec.js index ea89fdb72e9..a4e6788c7f6 100644 --- a/spec/frontend/vue_mr_widget/stores/artifacts_list/mutations_spec.js +++ b/spec/frontend/vue_mr_widget/stores/artifacts_list/mutations_spec.js @@ -1,6 +1,6 @@ -import state from '~/vue_merge_request_widget/stores/artifacts_list/state'; -import mutations from '~/vue_merge_request_widget/stores/artifacts_list/mutations'; import * as types from '~/vue_merge_request_widget/stores/artifacts_list/mutation_types'; +import mutations from '~/vue_merge_request_widget/stores/artifacts_list/mutations'; +import state from '~/vue_merge_request_widget/stores/artifacts_list/state'; describe('Artifacts Store Mutations', () => { let stateCopy; diff --git a/spec/frontend/vue_shared/alert_details/alert_details_spec.js b/spec/frontend/vue_shared/alert_details/alert_details_spec.js index d2ab5878172..dd9a7be6268 100644 --- a/spec/frontend/vue_shared/alert_details/alert_details_spec.js +++ b/spec/frontend/vue_shared/alert_details/alert_details_spec.js @@ -4,12 +4,12 @@ import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import waitForPromises from 'helpers/wait_for_promises'; +import { joinPaths } from '~/lib/utils/url_utility'; +import Tracking from '~/tracking'; import AlertDetails from '~/vue_shared/alert_details/components/alert_details.vue'; import AlertSummaryRow from '~/vue_shared/alert_details/components/alert_summary_row.vue'; import { SEVERITY_LEVELS } from '~/vue_shared/alert_details/constants'; import createIssueMutation from '~/vue_shared/alert_details/graphql/mutations/alert_issue_create.mutation.graphql'; -import { joinPaths } from '~/lib/utils/url_utility'; -import Tracking from '~/tracking'; import AlertDetailsTable from '~/vue_shared/components/alert_details_table.vue'; import mockAlerts from './mocks/alerts.json'; diff --git a/spec/frontend/vue_shared/alert_details/alert_management_sidebar_todo_spec.js b/spec/frontend/vue_shared/alert_details/alert_management_sidebar_todo_spec.js index e08955d5f8e..87ad5e36564 100644 --- a/spec/frontend/vue_shared/alert_details/alert_management_sidebar_todo_spec.js +++ b/spec/frontend/vue_shared/alert_details/alert_management_sidebar_todo_spec.js @@ -1,7 +1,7 @@ import { mount } from '@vue/test-utils'; +import todoMarkDoneMutation from '~/graphql_shared/mutations/todo_mark_done.mutation.graphql'; import SidebarTodo from '~/vue_shared/alert_details/components/sidebar/sidebar_todo.vue'; import createAlertTodoMutation from '~/vue_shared/alert_details/graphql/mutations/alert_todo_create.mutation.graphql'; -import todoMarkDoneMutation from '~/graphql_shared/mutations/todo_mark_done.mutation.graphql'; import mockAlerts from './mocks/alerts.json'; const mockAlert = mockAlerts[0]; diff --git a/spec/frontend/vue_shared/alert_details/alert_metrics_spec.js b/spec/frontend/vue_shared/alert_details/alert_metrics_spec.js index c75909651d7..b5a61a4adc1 100644 --- a/spec/frontend/vue_shared/alert_details/alert_metrics_spec.js +++ b/spec/frontend/vue_shared/alert_details/alert_metrics_spec.js @@ -1,9 +1,9 @@ import { shallowMount } from '@vue/test-utils'; -import MockAdapter from 'axios-mock-adapter'; import axios from 'axios'; +import MockAdapter from 'axios-mock-adapter'; import waitForPromises from 'helpers/wait_for_promises'; -import AlertMetrics from '~/vue_shared/alert_details/components/alert_metrics.vue'; import MetricEmbed from '~/monitoring/components/embeds/metric_embed.vue'; +import AlertMetrics from '~/vue_shared/alert_details/components/alert_metrics.vue'; jest.mock('~/monitoring/stores', () => ({ monitoringDashboard: {}, diff --git a/spec/frontend/vue_shared/alert_details/alert_status_spec.js b/spec/frontend/vue_shared/alert_details/alert_status_spec.js index b37518cc424..a866fc13539 100644 --- a/spec/frontend/vue_shared/alert_details/alert_status_spec.js +++ b/spec/frontend/vue_shared/alert_details/alert_status_spec.js @@ -1,9 +1,9 @@ -import { shallowMount } from '@vue/test-utils'; import { GlDropdown, GlDropdownItem } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import waitForPromises from 'helpers/wait_for_promises'; -import AlertManagementStatus from '~/vue_shared/alert_details/components/alert_status.vue'; import updateAlertStatusMutation from '~/graphql_shared//mutations/alert_status_update.mutation.graphql'; import Tracking from '~/tracking'; +import AlertManagementStatus from '~/vue_shared/alert_details/components/alert_status.vue'; import mockAlerts from './mocks/alerts.json'; const mockAlert = mockAlerts[0]; diff --git a/spec/frontend/vue_shared/alert_details/sidebar/alert_managment_sidebar_assignees_spec.js b/spec/frontend/vue_shared/alert_details/sidebar/alert_managment_sidebar_assignees_spec.js index 4c7f86a40ee..28646994ed1 100644 --- a/spec/frontend/vue_shared/alert_details/sidebar/alert_managment_sidebar_assignees_spec.js +++ b/spec/frontend/vue_shared/alert_details/sidebar/alert_managment_sidebar_assignees_spec.js @@ -1,7 +1,7 @@ +import { GlDropdownItem } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; -import { GlDropdownItem } from '@gitlab/ui'; import SidebarAssignee from '~/vue_shared/alert_details/components/sidebar/sidebar_assignee.vue'; import SidebarAssignees from '~/vue_shared/alert_details/components/sidebar/sidebar_assignees.vue'; import AlertSetAssignees from '~/vue_shared/alert_details/graphql/mutations/alert_set_assignees.mutation.graphql'; diff --git a/spec/frontend/vue_shared/alert_details/sidebar/alert_sidebar_status_spec.js b/spec/frontend/vue_shared/alert_details/sidebar/alert_sidebar_status_spec.js index 95c9dac5034..f5b9efb4d98 100644 --- a/spec/frontend/vue_shared/alert_details/sidebar/alert_sidebar_status_spec.js +++ b/spec/frontend/vue_shared/alert_details/sidebar/alert_sidebar_status_spec.js @@ -1,7 +1,7 @@ -import { mount } from '@vue/test-utils'; import { GlDropdown, GlDropdownItem, GlLoadingIcon } from '@gitlab/ui'; -import AlertSidebarStatus from '~/vue_shared/alert_details/components/sidebar/sidebar_status.vue'; +import { mount } from '@vue/test-utils'; import updateAlertStatusMutation from '~/graphql_shared/mutations/alert_status_update.mutation.graphql'; +import AlertSidebarStatus from '~/vue_shared/alert_details/components/sidebar/sidebar_status.vue'; import mockAlerts from '../mocks/alerts.json'; const mockAlert = mockAlerts[0]; diff --git a/spec/frontend/vue_shared/alert_details/system_notes/alert_management_system_note_spec.js b/spec/frontend/vue_shared/alert_details/system_notes/alert_management_system_note_spec.js index 90966482bb4..a5a9fb55737 100644 --- a/spec/frontend/vue_shared/alert_details/system_notes/alert_management_system_note_spec.js +++ b/spec/frontend/vue_shared/alert_details/system_notes/alert_management_system_note_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import SystemNote from '~/vue_shared/alert_details/components/system_notes/system_note.vue'; import mockAlerts from '../mocks/alerts.json'; diff --git a/spec/frontend/vue_shared/components/actions_button_spec.js b/spec/frontend/vue_shared/components/actions_button_spec.js index 2ac4bfda29a..e5b7b693cb5 100644 --- a/spec/frontend/vue_shared/components/actions_button_spec.js +++ b/spec/frontend/vue_shared/components/actions_button_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlDropdown, GlDropdownDivider, GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import ActionsButton from '~/vue_shared/components/actions_button.vue'; diff --git a/spec/frontend/vue_shared/components/blob_viewers/rich_viewer_spec.js b/spec/frontend/vue_shared/components/blob_viewers/rich_viewer_spec.js index 22643a17b2b..f592db935ec 100644 --- a/spec/frontend/vue_shared/components/blob_viewers/rich_viewer_spec.js +++ b/spec/frontend/vue_shared/components/blob_viewers/rich_viewer_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; +import { handleBlobRichViewer } from '~/blob/viewer'; import RichViewer from '~/vue_shared/components/blob_viewers/rich_viewer.vue'; import MarkdownFieldView from '~/vue_shared/components/markdown/field_view.vue'; -import { handleBlobRichViewer } from '~/blob/viewer'; jest.mock('~/blob/viewer'); diff --git a/spec/frontend/vue_shared/components/blob_viewers/simple_viewer_spec.js b/spec/frontend/vue_shared/components/blob_viewers/simple_viewer_spec.js index 8434fdaccde..9a0616343fe 100644 --- a/spec/frontend/vue_shared/components/blob_viewers/simple_viewer_spec.js +++ b/spec/frontend/vue_shared/components/blob_viewers/simple_viewer_spec.js @@ -1,6 +1,6 @@ import { shallowMount } from '@vue/test-utils'; -import SimpleViewer from '~/vue_shared/components/blob_viewers/simple_viewer.vue'; import { HIGHLIGHT_CLASS_NAME } from '~/vue_shared/components/blob_viewers/constants'; +import SimpleViewer from '~/vue_shared/components/blob_viewers/simple_viewer.vue'; describe('Blob Simple Viewer component', () => { let wrapper; diff --git a/spec/frontend/vue_shared/components/changed_file_icon_spec.js b/spec/frontend/vue_shared/components/changed_file_icon_spec.js index 80918c5e771..6b9658a6d18 100644 --- a/spec/frontend/vue_shared/components/changed_file_icon_spec.js +++ b/spec/frontend/vue_shared/components/changed_file_icon_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import ChangedFileIcon from '~/vue_shared/components/changed_file_icon.vue'; const changedFile = () => ({ changed: true }); diff --git a/spec/frontend/vue_shared/components/ci_icon_spec.js b/spec/frontend/vue_shared/components/ci_icon_spec.js index 7e84ad5ef0c..6d52db7ae65 100644 --- a/spec/frontend/vue_shared/components/ci_icon_spec.js +++ b/spec/frontend/vue_shared/components/ci_icon_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import ciIcon from '~/vue_shared/components/ci_icon.vue'; describe('CI Icon component', () => { diff --git a/spec/frontend/vue_shared/components/clipboard_button_spec.js b/spec/frontend/vue_shared/components/clipboard_button_spec.js index 0d4266ce82f..ab4008484e5 100644 --- a/spec/frontend/vue_shared/components/clipboard_button_spec.js +++ b/spec/frontend/vue_shared/components/clipboard_button_spec.js @@ -1,7 +1,7 @@ -import { mount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; -import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; +import { mount } from '@vue/test-utils'; import initCopyToClipboard from '~/behaviors/copy_to_clipboard'; +import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; describe('clipboard button', () => { let wrapper; diff --git a/spec/frontend/vue_shared/components/clone_dropdown_spec.js b/spec/frontend/vue_shared/components/clone_dropdown_spec.js index 5b8576ad761..eefd1838988 100644 --- a/spec/frontend/vue_shared/components/clone_dropdown_spec.js +++ b/spec/frontend/vue_shared/components/clone_dropdown_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlFormInputGroup, GlDropdownSectionHeader } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import CloneDropdown from '~/vue_shared/components/clone_dropdown.vue'; describe('Clone Dropdown Button', () => { diff --git a/spec/frontend/vue_shared/components/commit_spec.js b/spec/frontend/vue_shared/components/commit_spec.js index 4ed91497663..66ceebed489 100644 --- a/spec/frontend/vue_shared/components/commit_spec.js +++ b/spec/frontend/vue_shared/components/commit_spec.js @@ -1,8 +1,8 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; +import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import CommitComponent from '~/vue_shared/components/commit.vue'; import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; -import { extendedWrapper } from 'helpers/vue_test_utils_helper'; describe('Commit component', () => { let props; diff --git a/spec/frontend/vue_shared/components/content_viewer/viewers/markdown_viewer_spec.js b/spec/frontend/vue_shared/components/content_viewer/viewers/markdown_viewer_spec.js index 22ee6acfed8..3ffb23dc7a0 100644 --- a/spec/frontend/vue_shared/components/content_viewer/viewers/markdown_viewer_spec.js +++ b/spec/frontend/vue_shared/components/content_viewer/viewers/markdown_viewer_spec.js @@ -1,6 +1,6 @@ -import $ from 'jquery'; -import MockAdapter from 'axios-mock-adapter'; import { mount } from '@vue/test-utils'; +import MockAdapter from 'axios-mock-adapter'; +import $ from 'jquery'; import waitForPromises from 'helpers/wait_for_promises'; import axios from '~/lib/utils/axios_utils'; import MarkdownViewer from '~/vue_shared/components/content_viewer/viewers/markdown_viewer.vue'; diff --git a/spec/frontend/vue_shared/components/diff_viewer/viewers/image_diff_viewer_spec.js b/spec/frontend/vue_shared/components/diff_viewer/viewers/image_diff_viewer_spec.js index b6bffbcc6f3..eacc41ccdad 100644 --- a/spec/frontend/vue_shared/components/diff_viewer/viewers/image_diff_viewer_spec.js +++ b/spec/frontend/vue_shared/components/diff_viewer/viewers/image_diff_viewer_spec.js @@ -1,6 +1,6 @@ +import { mount } from '@vue/test-utils'; import Vue from 'vue'; import { compileToFunctions } from 'vue-template-compiler'; -import { mount } from '@vue/test-utils'; import { GREEN_BOX_IMAGE_URL, RED_BOX_IMAGE_URL } from 'spec/test_constants'; import imageDiffViewer from '~/vue_shared/components/diff_viewer/viewers/image_diff_viewer.vue'; diff --git a/spec/frontend/vue_shared/components/diff_viewer/viewers/renamed_spec.js b/spec/frontend/vue_shared/components/diff_viewer/viewers/renamed_spec.js index e91e6577aaf..9f433816b34 100644 --- a/spec/frontend/vue_shared/components/diff_viewer/viewers/renamed_spec.js +++ b/spec/frontend/vue_shared/components/diff_viewer/viewers/renamed_spec.js @@ -1,6 +1,5 @@ -import Vuex from 'vuex'; import { createLocalVue, shallowMount, mount } from '@vue/test-utils'; -import Renamed from '~/vue_shared/components/diff_viewer/viewers/renamed.vue'; +import Vuex from 'vuex'; import { TRANSITION_LOAD_START, TRANSITION_LOAD_ERROR, @@ -10,6 +9,7 @@ import { STATE_LOADING, STATE_ERRORED, } from '~/diffs/constants'; +import Renamed from '~/vue_shared/components/diff_viewer/viewers/renamed.vue'; const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/spec/frontend/vue_shared/components/dismissible_alert_spec.js b/spec/frontend/vue_shared/components/dismissible_alert_spec.js index 17905254292..cfa6d1064e5 100644 --- a/spec/frontend/vue_shared/components/dismissible_alert_spec.js +++ b/spec/frontend/vue_shared/components/dismissible_alert_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlAlert } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import DismissibleAlert from '~/vue_shared/components/dismissible_alert.vue'; const TEST_HTML = 'Hello World! Foo'; diff --git a/spec/frontend/vue_shared/components/dismissible_container_spec.js b/spec/frontend/vue_shared/components/dismissible_container_spec.js index 2c0e363fa0e..b8aeea38e77 100644 --- a/spec/frontend/vue_shared/components/dismissible_container_spec.js +++ b/spec/frontend/vue_shared/components/dismissible_container_spec.js @@ -1,5 +1,5 @@ -import MockAdapter from 'axios-mock-adapter'; import { shallowMount } from '@vue/test-utils'; +import MockAdapter from 'axios-mock-adapter'; import axios from '~/lib/utils/axios_utils'; import dismissibleContainer from '~/vue_shared/components/dismissible_container.vue'; diff --git a/spec/frontend/vue_shared/components/dismissible_feedback_alert_spec.js b/spec/frontend/vue_shared/components/dismissible_feedback_alert_spec.js index 4c4baf23120..175d79dd1c2 100644 --- a/spec/frontend/vue_shared/components/dismissible_feedback_alert_spec.js +++ b/spec/frontend/vue_shared/components/dismissible_feedback_alert_spec.js @@ -1,5 +1,5 @@ -import { mount, shallowMount } from '@vue/test-utils'; import { GlAlert, GlSprintf, GlLink } from '@gitlab/ui'; +import { mount, shallowMount } from '@vue/test-utils'; import { useLocalStorageSpy } from 'helpers/local_storage_helper'; import Component from '~/vue_shared/components/dismissible_feedback_alert.vue'; diff --git a/spec/frontend/vue_shared/components/editor_lite_spec.js b/spec/frontend/vue_shared/components/editor_lite_spec.js index 9298851d143..badd5aed0e3 100644 --- a/spec/frontend/vue_shared/components/editor_lite_spec.js +++ b/spec/frontend/vue_shared/components/editor_lite_spec.js @@ -1,8 +1,8 @@ import { shallowMount } from '@vue/test-utils'; import { nextTick } from 'vue'; -import EditorLite from '~/vue_shared/components/editor_lite.vue'; -import Editor from '~/editor/editor_lite'; import { EDITOR_READY_EVENT } from '~/editor/constants'; +import Editor from '~/editor/editor_lite'; +import EditorLite from '~/vue_shared/components/editor_lite.vue'; jest.mock('~/editor/editor_lite'); diff --git a/spec/frontend/vue_shared/components/expand_button_spec.js b/spec/frontend/vue_shared/components/expand_button_spec.js index 724405a109f..7874658cc0f 100644 --- a/spec/frontend/vue_shared/components/expand_button_spec.js +++ b/spec/frontend/vue_shared/components/expand_button_spec.js @@ -1,5 +1,5 @@ -import Vue from 'vue'; import { mount } from '@vue/test-utils'; +import Vue from 'vue'; import ExpandButton from '~/vue_shared/components/expand_button.vue'; const text = { diff --git a/spec/frontend/vue_shared/components/file_finder/index_spec.js b/spec/frontend/vue_shared/components/file_finder/index_spec.js index 238a5440664..d757b7fac72 100644 --- a/spec/frontend/vue_shared/components/file_finder/index_spec.js +++ b/spec/frontend/vue_shared/components/file_finder/index_spec.js @@ -1,9 +1,9 @@ -import Vue from 'vue'; import Mousetrap from 'mousetrap'; -import { file } from 'jest/ide/helpers'; +import Vue from 'vue'; import waitForPromises from 'helpers/wait_for_promises'; -import FindFileComponent from '~/vue_shared/components/file_finder/index.vue'; +import { file } from 'jest/ide/helpers'; import { UP_KEY_CODE, DOWN_KEY_CODE, ENTER_KEY_CODE, ESC_KEY_CODE } from '~/lib/utils/keycodes'; +import FindFileComponent from '~/vue_shared/components/file_finder/index.vue'; describe('File finder item spec', () => { const Component = Vue.extend(FindFileComponent); diff --git a/spec/frontend/vue_shared/components/file_finder/item_spec.js b/spec/frontend/vue_shared/components/file_finder/item_spec.js index c60e6335389..1a4a97efb95 100644 --- a/spec/frontend/vue_shared/components/file_finder/item_spec.js +++ b/spec/frontend/vue_shared/components/file_finder/item_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import { file } from 'jest/ide/helpers'; import createComponent from 'helpers/vue_mount_component_helper'; +import { file } from 'jest/ide/helpers'; import ItemComponent from '~/vue_shared/components/file_finder/item.vue'; describe('File finder item spec', () => { diff --git a/spec/frontend/vue_shared/components/file_icon_spec.js b/spec/frontend/vue_shared/components/file_icon_spec.js index e55449dc684..c10663f6c14 100644 --- a/spec/frontend/vue_shared/components/file_icon_spec.js +++ b/spec/frontend/vue_shared/components/file_icon_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon, GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import FileIcon from '~/vue_shared/components/file_icon.vue'; import { FILE_SYMLINK_MODE } from '~/vue_shared/constants'; diff --git a/spec/frontend/vue_shared/components/file_row_spec.js b/spec/frontend/vue_shared/components/file_row_spec.js index 92690f6fc37..62fb29c455c 100644 --- a/spec/frontend/vue_shared/components/file_row_spec.js +++ b/spec/frontend/vue_shared/components/file_row_spec.js @@ -1,10 +1,10 @@ import { shallowMount } from '@vue/test-utils'; import { nextTick } from 'vue'; import { file } from 'jest/ide/helpers'; +import { escapeFileUrl } from '~/lib/utils/url_utility'; +import FileIcon from '~/vue_shared/components/file_icon.vue'; import FileRow from '~/vue_shared/components/file_row.vue'; import FileHeader from '~/vue_shared/components/file_row_header.vue'; -import FileIcon from '~/vue_shared/components/file_icon.vue'; -import { escapeFileUrl } from '~/lib/utils/url_utility'; describe('File row component', () => { let wrapper; diff --git a/spec/frontend/vue_shared/components/file_tree_spec.js b/spec/frontend/vue_shared/components/file_tree_spec.js index 7a4982fd29b..39a7c7a2b3a 100644 --- a/spec/frontend/vue_shared/components/file_tree_spec.js +++ b/spec/frontend/vue_shared/components/file_tree_spec.js @@ -1,5 +1,5 @@ -import { pick } from 'lodash'; import { shallowMount } from '@vue/test-utils'; +import { pick } from 'lodash'; import FileTree from '~/vue_shared/components/file_tree.vue'; const MockFileRow = { diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/filtered_search_bar_root_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/filtered_search_bar_root_spec.js index b58ce0083c0..9fa9d35e3e2 100644 --- a/spec/frontend/vue_shared/components/filtered_search_bar/filtered_search_bar_root_spec.js +++ b/spec/frontend/vue_shared/components/filtered_search_bar/filtered_search_bar_root_spec.js @@ -1,4 +1,3 @@ -import { shallowMount, mount } from '@vue/test-utils'; import { GlFilteredSearch, GlButtonGroup, @@ -7,13 +6,13 @@ import { GlDropdownItem, GlFormCheckbox, } from '@gitlab/ui'; +import { shallowMount, mount } from '@vue/test-utils'; +import RecentSearchesService from '~/filtered_search/services/recent_searches_service'; +import RecentSearchesStore from '~/filtered_search/stores/recent_searches_store'; +import { SortDirection } from '~/vue_shared/components/filtered_search_bar/constants'; import FilteredSearchBarRoot from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; import { uniqueTokens } from '~/vue_shared/components/filtered_search_bar/filtered_search_utils'; -import { SortDirection } from '~/vue_shared/components/filtered_search_bar/constants'; - -import RecentSearchesStore from '~/filtered_search/stores/recent_searches_store'; -import RecentSearchesService from '~/filtered_search/services/recent_searches_service'; import { mockAvailableTokens, diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/store/modules/filters/actions_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/store/modules/filters/actions_spec.js index 1dd5f08e76a..05bad572472 100644 --- a/spec/frontend/vue_shared/components/filtered_search_bar/store/modules/filters/actions_spec.js +++ b/spec/frontend/vue_shared/components/filtered_search_bar/store/modules/filters/actions_spec.js @@ -2,12 +2,12 @@ import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; import { mockBranches } from 'jest/vue_shared/components/filtered_search_bar/mock_data'; +import Api from '~/api'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; +import httpStatusCodes from '~/lib/utils/http_status'; import * as actions from '~/vue_shared/components/filtered_search_bar/store/modules/filters/actions'; import * as types from '~/vue_shared/components/filtered_search_bar/store/modules/filters/mutation_types'; import initialState from '~/vue_shared/components/filtered_search_bar/store/modules/filters/state'; -import httpStatusCodes from '~/lib/utils/http_status'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; -import Api from '~/api'; import { filterMilestones, filterUsers, filterLabels } from './mock_data'; const milestonesEndpoint = 'fake_milestones_endpoint'; diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/store/modules/filters/mutations_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/store/modules/filters/mutations_spec.js index 263a4ee178f..66c6267027b 100644 --- a/spec/frontend/vue_shared/components/filtered_search_bar/store/modules/filters/mutations_spec.js +++ b/spec/frontend/vue_shared/components/filtered_search_bar/store/modules/filters/mutations_spec.js @@ -1,9 +1,9 @@ import { get } from 'lodash'; import { mockBranches } from 'jest/vue_shared/components/filtered_search_bar/mock_data'; -import initialState from '~/vue_shared/components/filtered_search_bar/store/modules/filters/state'; -import mutations from '~/vue_shared/components/filtered_search_bar/store/modules/filters/mutations'; -import * as types from '~/vue_shared/components/filtered_search_bar/store/modules/filters/mutation_types'; import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils'; +import * as types from '~/vue_shared/components/filtered_search_bar/store/modules/filters/mutation_types'; +import mutations from '~/vue_shared/components/filtered_search_bar/store/modules/filters/mutations'; +import initialState from '~/vue_shared/components/filtered_search_bar/store/modules/filters/state'; import { filterMilestones, filterUsers, filterLabels } from './mock_data'; let state = null; diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/author_token_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/author_token_spec.js index 3997d6a99a6..765e576914c 100644 --- a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/author_token_spec.js +++ b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/author_token_spec.js @@ -1,15 +1,15 @@ -import { mount } from '@vue/test-utils'; import { GlFilteredSearchToken, GlFilteredSearchTokenSegment, GlFilteredSearchSuggestion, GlDropdownDivider, } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import waitForPromises from 'helpers/wait_for_promises'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; import { DEFAULT_LABEL_NONE, DEFAULT_LABEL_ANY, diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/branch_token_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/branch_token_spec.js index 35f487330be..a20bc4986fc 100644 --- a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/branch_token_spec.js +++ b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/branch_token_spec.js @@ -1,15 +1,15 @@ -import { mount } from '@vue/test-utils'; import { GlFilteredSearchToken, GlFilteredSearchSuggestion, GlFilteredSearchTokenSegment, GlDropdownDivider, } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import waitForPromises from 'helpers/wait_for_promises'; -import axios from '~/lib/utils/axios_utils'; import createFlash from '~/flash'; +import axios from '~/lib/utils/axios_utils'; import { DEFAULT_LABEL_NONE, DEFAULT_LABEL_ANY, diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/label_token_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/label_token_spec.js index dda0ad39bbc..7676ce10ce0 100644 --- a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/label_token_spec.js +++ b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/label_token_spec.js @@ -1,19 +1,19 @@ -import { mount } from '@vue/test-utils'; import { GlFilteredSearchToken, GlFilteredSearchSuggestion, GlFilteredSearchTokenSegment, GlDropdownDivider, } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import waitForPromises from 'helpers/wait_for_promises'; import { mockRegularLabel, mockLabels, } from 'jest/vue_shared/components/sidebar/labels_select_vue/mock_data'; +import { deprecatedCreateFlash as createFlash } from '~/flash'; import axios from '~/lib/utils/axios_utils'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; import { DEFAULT_LABELS, DEFAULT_LABEL_NONE, diff --git a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/milestone_token_spec.js b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/milestone_token_spec.js index 164561f6244..9f550ac9afc 100644 --- a/spec/frontend/vue_shared/components/filtered_search_bar/tokens/milestone_token_spec.js +++ b/spec/frontend/vue_shared/components/filtered_search_bar/tokens/milestone_token_spec.js @@ -1,15 +1,15 @@ -import { mount } from '@vue/test-utils'; import { GlFilteredSearchToken, GlFilteredSearchSuggestion, GlFilteredSearchTokenSegment, GlDropdownDivider, } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import waitForPromises from 'helpers/wait_for_promises'; +import createFlash from '~/flash'; import axios from '~/lib/utils/axios_utils'; -import createFlash from '~/flash'; import { DEFAULT_MILESTONES } from '~/vue_shared/components/filtered_search_bar/constants'; import MilestoneToken from '~/vue_shared/components/filtered_search_bar/tokens/milestone_token.vue'; diff --git a/spec/frontend/vue_shared/components/gl_modal_vuex_spec.js b/spec/frontend/vue_shared/components/gl_modal_vuex_spec.js index 81518e67377..390a70792f3 100644 --- a/spec/frontend/vue_shared/components/gl_modal_vuex_spec.js +++ b/spec/frontend/vue_shared/components/gl_modal_vuex_spec.js @@ -1,9 +1,9 @@ +import { GlModal } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlModal } from '@gitlab/ui'; +import { BV_SHOW_MODAL, BV_HIDE_MODAL } from '~/lib/utils/constants'; import GlModalVuex from '~/vue_shared/components/gl_modal_vuex.vue'; import createState from '~/vuex_shared/modules/modal/state'; -import { BV_SHOW_MODAL, BV_HIDE_MODAL } from '~/lib/utils/constants'; const localVue = createLocalVue(); localVue.use(Vuex); diff --git a/spec/frontend/vue_shared/components/gl_toggle_vuex_spec.js b/spec/frontend/vue_shared/components/gl_toggle_vuex_spec.js index 30afb044bbf..ac670b622b1 100644 --- a/spec/frontend/vue_shared/components/gl_toggle_vuex_spec.js +++ b/spec/frontend/vue_shared/components/gl_toggle_vuex_spec.js @@ -1,6 +1,6 @@ -import Vuex from 'vuex'; import { GlToggle } from '@gitlab/ui'; import { mount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import GlToggleVuex from '~/vue_shared/components/gl_toggle_vuex.vue'; const localVue = createLocalVue(); diff --git a/spec/frontend/vue_shared/components/help_popover_spec.js b/spec/frontend/vue_shared/components/help_popover_spec.js index 112085e91e1..baf80a8a04e 100644 --- a/spec/frontend/vue_shared/components/help_popover_spec.js +++ b/spec/frontend/vue_shared/components/help_popover_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlButton, GlPopover } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import HelpPopover from '~/vue_shared/components/help_popover.vue'; describe('HelpPopover', () => { diff --git a/spec/frontend/vue_shared/components/integration_help_text_spec.js b/spec/frontend/vue_shared/components/integration_help_text_spec.js index 4269d36d0e2..c0e8b719007 100644 --- a/spec/frontend/vue_shared/components/integration_help_text_spec.js +++ b/spec/frontend/vue_shared/components/integration_help_text_spec.js @@ -1,6 +1,6 @@ +import { GlIcon, GlLink, GlSprintf } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; -import { GlIcon, GlLink, GlSprintf } from '@gitlab/ui'; import IntegrationHelpText from '~/vue_shared/components/integrations_help_text.vue'; describe('IntegrationHelpText component', () => { diff --git a/spec/frontend/vue_shared/components/issuable/issuable_header_warnings_spec.js b/spec/frontend/vue_shared/components/issuable/issuable_header_warnings_spec.js index a03a3915e1b..573501233b9 100644 --- a/spec/frontend/vue_shared/components/issuable/issuable_header_warnings_spec.js +++ b/spec/frontend/vue_shared/components/issuable/issuable_header_warnings_spec.js @@ -1,8 +1,8 @@ import { shallowMount, createLocalVue } from '@vue/test-utils'; import Vuex from 'vuex'; -import IssuableHeaderWarnings from '~/vue_shared/components/issuable/issuable_header_warnings.vue'; -import createIssueStore from '~/notes/stores'; import { createStore as createMrStore } from '~/mr_notes/stores'; +import createIssueStore from '~/notes/stores'; +import IssuableHeaderWarnings from '~/vue_shared/components/issuable/issuable_header_warnings.vue'; const ISSUABLE_TYPE_ISSUE = 'issue'; const ISSUABLE_TYPE_MR = 'merge request'; diff --git a/spec/frontend/vue_shared/components/issue/issue_assignees_spec.js b/spec/frontend/vue_shared/components/issue/issue_assignees_spec.js index 5f614bfc751..5c29c267c99 100644 --- a/spec/frontend/vue_shared/components/issue/issue_assignees_spec.js +++ b/spec/frontend/vue_shared/components/issue/issue_assignees_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; import { mockAssigneesList } from 'jest/boards/mock_data'; -import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; import IssueAssignees from '~/vue_shared/components/issue/issue_assignees.vue'; +import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; const TEST_CSS_CLASSES = 'test-classes'; const TEST_MAX_VISIBLE = 4; diff --git a/spec/frontend/vue_shared/components/issue/issue_milestone_spec.js b/spec/frontend/vue_shared/components/issue/issue_milestone_spec.js index 8143196c6e8..9a121050225 100644 --- a/spec/frontend/vue_shared/components/issue/issue_milestone_spec.js +++ b/spec/frontend/vue_shared/components/issue/issue_milestone_spec.js @@ -1,7 +1,7 @@ -import Vue from 'vue'; +import { GlIcon } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; +import Vue from 'vue'; -import { GlIcon } from '@gitlab/ui'; import { mockMilestone } from 'jest/boards/mock_data'; import IssueMilestone from '~/vue_shared/components/issue/issue_milestone.vue'; diff --git a/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js b/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js index 3dc34583118..f34a2db0851 100644 --- a/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js +++ b/spec/frontend/vue_shared/components/issue/related_issuable_item_spec.js @@ -1,8 +1,8 @@ import { mount } from '@vue/test-utils'; import { TEST_HOST } from 'helpers/test_constants'; +import IssueDueDate from '~/boards/components/issue_due_date.vue'; import { formatDate } from '~/lib/utils/datetime_utility'; import RelatedIssuableItem from '~/vue_shared/components/issue/related_issuable_item.vue'; -import IssueDueDate from '~/boards/components/issue_due_date.vue'; import { defaultAssignees, defaultMilestone } from './related_issuable_mock_data'; describe('RelatedIssuableItem', () => { diff --git a/spec/frontend/vue_shared/components/markdown/apply_suggestion_spec.js b/spec/frontend/vue_shared/components/markdown/apply_suggestion_spec.js index b9f0d88548d..c56628fcbcd 100644 --- a/spec/frontend/vue_shared/components/markdown/apply_suggestion_spec.js +++ b/spec/frontend/vue_shared/components/markdown/apply_suggestion_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlDropdown, GlFormTextarea, GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import ApplySuggestionComponent from '~/vue_shared/components/markdown/apply_suggestion.vue'; describe('Apply Suggestion component', () => { diff --git a/spec/frontend/vue_shared/components/markdown/field_spec.js b/spec/frontend/vue_shared/components/markdown/field_spec.js index 97cc22e1418..442032840e1 100644 --- a/spec/frontend/vue_shared/components/markdown/field_spec.js +++ b/spec/frontend/vue_shared/components/markdown/field_spec.js @@ -2,8 +2,8 @@ import { mount } from '@vue/test-utils'; import AxiosMockAdapter from 'axios-mock-adapter'; import $ from 'jquery'; import { TEST_HOST, FIXTURES_PATH } from 'spec/test_constants'; -import MarkdownField from '~/vue_shared/components/markdown/field.vue'; import axios from '~/lib/utils/axios_utils'; +import MarkdownField from '~/vue_shared/components/markdown/field.vue'; const markdownPreviewPath = `${TEST_HOST}/preview`; const markdownDocsPath = `${TEST_HOST}/docs`; diff --git a/spec/frontend/vue_shared/components/markdown/field_view_spec.js b/spec/frontend/vue_shared/components/markdown/field_view_spec.js index 80cf1f655c6..be1d840dd29 100644 --- a/spec/frontend/vue_shared/components/markdown/field_view_spec.js +++ b/spec/frontend/vue_shared/components/markdown/field_view_spec.js @@ -1,5 +1,5 @@ -import $ from 'jquery'; import { shallowMount } from '@vue/test-utils'; +import $ from 'jquery'; import MarkdownFieldView from '~/vue_shared/components/markdown/field_view.vue'; diff --git a/spec/frontend/vue_shared/components/memory_graph_spec.js b/spec/frontend/vue_shared/components/memory_graph_spec.js index 9a5ee544d8f..53b96bd1b98 100644 --- a/spec/frontend/vue_shared/components/memory_graph_spec.js +++ b/spec/frontend/vue_shared/components/memory_graph_spec.js @@ -1,6 +1,6 @@ -import Vue from 'vue'; -import { shallowMount } from '@vue/test-utils'; import { GlSparklineChart } from '@gitlab/ui/dist/charts'; +import { shallowMount } from '@vue/test-utils'; +import Vue from 'vue'; import MemoryGraph from '~/vue_shared/components/memory_graph.vue'; describe('MemoryGraph', () => { diff --git a/spec/frontend/vue_shared/components/modal_copy_button_spec.js b/spec/frontend/vue_shared/components/modal_copy_button_spec.js index 97d4313b89e..adb72c3ef85 100644 --- a/spec/frontend/vue_shared/components/modal_copy_button_spec.js +++ b/spec/frontend/vue_shared/components/modal_copy_button_spec.js @@ -1,6 +1,6 @@ import { shallowMount, createWrapper } from '@vue/test-utils'; -import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue'; import { BV_HIDE_TOOLTIP } from '~/lib/utils/constants'; +import ModalCopyButton from '~/vue_shared/components/modal_copy_button.vue'; describe('modal copy button', () => { let wrapper; diff --git a/spec/frontend/vue_shared/components/multiselect_dropdown_spec.js b/spec/frontend/vue_shared/components/multiselect_dropdown_spec.js index 233c488b60b..99671f1ffb7 100644 --- a/spec/frontend/vue_shared/components/multiselect_dropdown_spec.js +++ b/spec/frontend/vue_shared/components/multiselect_dropdown_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { getByText } from '@testing-library/dom'; +import { shallowMount } from '@vue/test-utils'; import MultiSelectDropdown from '~/vue_shared/components/sidebar/multiselect_dropdown.vue'; describe('MultiSelectDropdown Component', () => { diff --git a/spec/frontend/vue_shared/components/navigation_tabs_spec.js b/spec/frontend/vue_shared/components/navigation_tabs_spec.js index b1119bfb150..30a89fed12f 100644 --- a/spec/frontend/vue_shared/components/navigation_tabs_spec.js +++ b/spec/frontend/vue_shared/components/navigation_tabs_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlTab } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import NavigationTabs from '~/vue_shared/components/navigation_tabs.vue'; describe('navigation tabs component', () => { diff --git a/spec/frontend/vue_shared/components/notes/noteable_warning_spec.js b/spec/frontend/vue_shared/components/notes/noteable_warning_spec.js index cc9f05beb06..835759b1f20 100644 --- a/spec/frontend/vue_shared/components/notes/noteable_warning_spec.js +++ b/spec/frontend/vue_shared/components/notes/noteable_warning_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import NoteableWarning from '~/vue_shared/components/notes/noteable_warning.vue'; describe('Issue Warning Component', () => { diff --git a/spec/frontend/vue_shared/components/notes/system_note_spec.js b/spec/frontend/vue_shared/components/notes/system_note_spec.js index d5eac7c2aa3..48dacc50923 100644 --- a/spec/frontend/vue_shared/components/notes/system_note_spec.js +++ b/spec/frontend/vue_shared/components/notes/system_note_spec.js @@ -1,7 +1,7 @@ import { mount } from '@vue/test-utils'; -import IssueSystemNote from '~/vue_shared/components/notes/system_note.vue'; -import createStore from '~/notes/stores'; import initMRPopovers from '~/mr_popover/index'; +import createStore from '~/notes/stores'; +import IssueSystemNote from '~/vue_shared/components/notes/system_note.vue'; jest.mock('~/mr_popover/index', () => jest.fn()); diff --git a/spec/frontend/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs_spec.js b/spec/frontend/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs_spec.js index 491f783622a..74e9cbcbb53 100644 --- a/spec/frontend/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs_spec.js +++ b/spec/frontend/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs_spec.js @@ -1,9 +1,9 @@ -import { mount } from '@vue/test-utils'; import { GlAlert, GlBadge, GlPagination, GlTabs, GlTab } from '@gitlab/ui'; -import PageWrapper from '~/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue'; +import { mount } from '@vue/test-utils'; +import Tracking from '~/tracking'; import FilteredSearchBar from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue'; import AuthorToken from '~/vue_shared/components/filtered_search_bar/tokens/author_token.vue'; -import Tracking from '~/tracking'; +import PageWrapper from '~/vue_shared/components/paginated_table_with_search_and_tabs/paginated_table_with_search_and_tabs.vue'; import mockItems from './mocks/items.json'; import mockFilters from './mocks/items_filters.json'; diff --git a/spec/frontend/vue_shared/components/pagination_links_spec.js b/spec/frontend/vue_shared/components/pagination_links_spec.js index ad82aee0098..83f1e2844f9 100644 --- a/spec/frontend/vue_shared/components/pagination_links_spec.js +++ b/spec/frontend/vue_shared/components/pagination_links_spec.js @@ -1,6 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlPagination } from '@gitlab/ui'; -import PaginationLinks from '~/vue_shared/components/pagination_links.vue'; +import { mount } from '@vue/test-utils'; import { PREV, NEXT, @@ -9,6 +8,7 @@ import { LABEL_NEXT_PAGE, LABEL_LAST_PAGE, } from '~/vue_shared/components/pagination/constants'; +import PaginationLinks from '~/vue_shared/components/pagination_links.vue'; describe('Pagination links component', () => { const pageInfo = { diff --git a/spec/frontend/vue_shared/components/pikaday_spec.js b/spec/frontend/vue_shared/components/pikaday_spec.js index 1c6876c282c..fed4ce5e696 100644 --- a/spec/frontend/vue_shared/components/pikaday_spec.js +++ b/spec/frontend/vue_shared/components/pikaday_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlDatepicker } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import datePicker from '~/vue_shared/components/pikaday.vue'; describe('datePicker', () => { diff --git a/spec/frontend/vue_shared/components/project_selector/project_selector_spec.js b/spec/frontend/vue_shared/components/project_selector/project_selector_spec.js index 016622fd0bb..06b00a8e196 100644 --- a/spec/frontend/vue_shared/components/project_selector/project_selector_spec.js +++ b/spec/frontend/vue_shared/components/project_selector/project_selector_spec.js @@ -1,8 +1,7 @@ -import Vue from 'vue'; -import { head } from 'lodash'; - import { GlSearchBoxByType, GlInfiniteScroll } from '@gitlab/ui'; import { mount, createLocalVue } from '@vue/test-utils'; +import { head } from 'lodash'; +import Vue from 'vue'; import { trimText } from 'helpers/text_helper'; import ProjectListItem from '~/vue_shared/components/project_selector/project_list_item.vue'; import ProjectSelector from '~/vue_shared/components/project_selector/project_selector.vue'; diff --git a/spec/frontend/vue_shared/components/registry/code_instruction_spec.js b/spec/frontend/vue_shared/components/registry/code_instruction_spec.js index 84c738764a3..4ec608aaf07 100644 --- a/spec/frontend/vue_shared/components/registry/code_instruction_spec.js +++ b/spec/frontend/vue_shared/components/registry/code_instruction_spec.js @@ -1,7 +1,7 @@ import { mount } from '@vue/test-utils'; import Tracking from '~/tracking'; -import CodeInstruction from '~/vue_shared/components/registry/code_instruction.vue'; import ClipboardButton from '~/vue_shared/components/clipboard_button.vue'; +import CodeInstruction from '~/vue_shared/components/registry/code_instruction.vue'; describe('Package code instruction', () => { let wrapper; diff --git a/spec/frontend/vue_shared/components/registry/details_row_spec.js b/spec/frontend/vue_shared/components/registry/details_row_spec.js index 09dacfae363..3134e0d3e21 100644 --- a/spec/frontend/vue_shared/components/registry/details_row_spec.js +++ b/spec/frontend/vue_shared/components/registry/details_row_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import component from '~/vue_shared/components/registry/details_row.vue'; describe('DetailsRow', () => { diff --git a/spec/frontend/vue_shared/components/registry/history_item_spec.js b/spec/frontend/vue_shared/components/registry/history_item_spec.js index d51ddda2e3e..f146f87342f 100644 --- a/spec/frontend/vue_shared/components/registry/history_item_spec.js +++ b/spec/frontend/vue_shared/components/registry/history_item_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue'; import component from '~/vue_shared/components/registry/history_item.vue'; diff --git a/spec/frontend/vue_shared/components/registry/metadata_item_spec.js b/spec/frontend/vue_shared/components/registry/metadata_item_spec.js index 3d3cfbe13e3..1ccf3ddc5a5 100644 --- a/spec/frontend/vue_shared/components/registry/metadata_item_spec.js +++ b/spec/frontend/vue_shared/components/registry/metadata_item_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon, GlLink } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import component from '~/vue_shared/components/registry/metadata_item.vue'; import TooltipOnTruncate from '~/vue_shared/components/tooltip_on_truncate.vue'; diff --git a/spec/frontend/vue_shared/components/resizable_chart/resizable_chart_container_spec.js b/spec/frontend/vue_shared/components/resizable_chart/resizable_chart_container_spec.js index 3a5514ef318..1fce3c5d0b0 100644 --- a/spec/frontend/vue_shared/components/resizable_chart/resizable_chart_container_spec.js +++ b/spec/frontend/vue_shared/components/resizable_chart/resizable_chart_container_spec.js @@ -1,6 +1,6 @@ -import Vue from 'vue'; import { mount } from '@vue/test-utils'; import $ from 'jquery'; +import Vue from 'vue'; import ResizableChartContainer from '~/vue_shared/components/resizable_chart/resizable_chart_container.vue'; jest.mock('~/lib/utils/common_utils', () => ({ diff --git a/spec/frontend/vue_shared/components/rich_content_editor/editor_service_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/editor_service_spec.js index 51619cd9578..ce2b0d1ddc1 100644 --- a/spec/frontend/vue_shared/components/rich_content_editor/editor_service_spec.js +++ b/spec/frontend/vue_shared/components/rich_content_editor/editor_service_spec.js @@ -1,3 +1,5 @@ +import buildCustomRenderer from '~/vue_shared/components/rich_content_editor/services/build_custom_renderer'; +import buildHTMLToMarkdownRenderer from '~/vue_shared/components/rich_content_editor/services/build_html_to_markdown_renderer'; import { generateToolbarItem, addCustomEventListener, @@ -8,8 +10,6 @@ import { getMarkdown, getEditorOptions, } from '~/vue_shared/components/rich_content_editor/services/editor_service'; -import buildHTMLToMarkdownRenderer from '~/vue_shared/components/rich_content_editor/services/build_html_to_markdown_renderer'; -import buildCustomRenderer from '~/vue_shared/components/rich_content_editor/services/build_custom_renderer'; import sanitizeHTML from '~/vue_shared/components/rich_content_editor/services/sanitize_html'; jest.mock('~/vue_shared/components/rich_content_editor/services/build_html_to_markdown_renderer'); diff --git a/spec/frontend/vue_shared/components/rich_content_editor/modals/add_image/add_image_modal_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/modals/add_image/add_image_modal_spec.js index 16370a7aaad..97aecda97d2 100644 --- a/spec/frontend/vue_shared/components/rich_content_editor/modals/add_image/add_image_modal_spec.js +++ b/spec/frontend/vue_shared/components/rich_content_editor/modals/add_image/add_image_modal_spec.js @@ -1,8 +1,8 @@ -import { shallowMount } from '@vue/test-utils'; import { GlModal, GlTabs } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; +import { IMAGE_TABS } from '~/vue_shared/components/rich_content_editor/constants'; import AddImageModal from '~/vue_shared/components/rich_content_editor/modals/add_image/add_image_modal.vue'; import UploadImageTab from '~/vue_shared/components/rich_content_editor/modals/add_image/upload_image_tab.vue'; -import { IMAGE_TABS } from '~/vue_shared/components/rich_content_editor/constants'; describe('Add Image Modal', () => { let wrapper; diff --git a/spec/frontend/vue_shared/components/rich_content_editor/modals/insert_video_modal_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/modals/insert_video_modal_spec.js index d59d4cc1de9..3e9eaf58181 100644 --- a/spec/frontend/vue_shared/components/rich_content_editor/modals/insert_video_modal_spec.js +++ b/spec/frontend/vue_shared/components/rich_content_editor/modals/insert_video_modal_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlModal } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import InsertVideoModal from '~/vue_shared/components/rich_content_editor/modals/insert_video_modal.vue'; describe('Insert Video Modal', () => { diff --git a/spec/frontend/vue_shared/components/rich_content_editor/rich_content_editor_integration_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/rich_content_editor_integration_spec.js index b9b93b274d2..47b1abd2ad2 100644 --- a/spec/frontend/vue_shared/components/rich_content_editor/rich_content_editor_integration_spec.js +++ b/spec/frontend/vue_shared/components/rich_content_editor/rich_content_editor_integration_spec.js @@ -1,6 +1,6 @@ import Editor from '@toast-ui/editor'; -import { registerHTMLToMarkdownRenderer } from '~/vue_shared/components/rich_content_editor/services/editor_service'; import buildMarkdownToHTMLRenderer from '~/vue_shared/components/rich_content_editor/services/build_custom_renderer'; +import { registerHTMLToMarkdownRenderer } from '~/vue_shared/components/rich_content_editor/services/editor_service'; describe('vue_shared/components/rich_content_editor', () => { let editor; diff --git a/spec/frontend/vue_shared/components/rich_content_editor/rich_content_editor_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/rich_content_editor_spec.js index 2eb353a1801..8eb880b3984 100644 --- a/spec/frontend/vue_shared/components/rich_content_editor/rich_content_editor_spec.js +++ b/spec/frontend/vue_shared/components/rich_content_editor/rich_content_editor_spec.js @@ -1,14 +1,14 @@ -import { shallowMount } from '@vue/test-utils'; import { Editor, mockEditorApi } from '@toast-ui/vue-editor'; -import RichContentEditor from '~/vue_shared/components/rich_content_editor/rich_content_editor.vue'; -import AddImageModal from '~/vue_shared/components/rich_content_editor/modals/add_image/add_image_modal.vue'; -import InsertVideoModal from '~/vue_shared/components/rich_content_editor/modals/insert_video_modal.vue'; +import { shallowMount } from '@vue/test-utils'; import { EDITOR_TYPES, EDITOR_HEIGHT, EDITOR_PREVIEW_STYLE, CUSTOM_EVENTS, } from '~/vue_shared/components/rich_content_editor/constants'; +import AddImageModal from '~/vue_shared/components/rich_content_editor/modals/add_image/add_image_modal.vue'; +import InsertVideoModal from '~/vue_shared/components/rich_content_editor/modals/insert_video_modal.vue'; +import RichContentEditor from '~/vue_shared/components/rich_content_editor/rich_content_editor.vue'; import { addCustomEventListener, diff --git a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_font_awesome_html_inline_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_font_awesome_html_inline_spec.js index d6bb01259bb..c1aaed6f0c3 100644 --- a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_font_awesome_html_inline_spec.js +++ b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_font_awesome_html_inline_spec.js @@ -1,5 +1,5 @@ -import renderer from '~/vue_shared/components/rich_content_editor/services/renderers/render_font_awesome_html_inline'; import { buildUneditableInlineTokens } from '~/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token'; +import renderer from '~/vue_shared/components/rich_content_editor/services/renderers/render_font_awesome_html_inline'; import { normalTextNode } from './mock_data'; diff --git a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_html_block_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_html_block_spec.js index b31684a400e..234f6a4d4ca 100644 --- a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_html_block_spec.js +++ b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_html_block_spec.js @@ -1,5 +1,5 @@ -import renderer from '~/vue_shared/components/rich_content_editor/services/renderers/render_html_block'; import { buildUneditableHtmlAsTextTokens } from '~/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token'; +import renderer from '~/vue_shared/components/rich_content_editor/services/renderers/render_html_block'; describe('rich_content_editor/services/renderers/render_html_block', () => { const htmlBlockNode = { diff --git a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_identifier_instance_text_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_identifier_instance_text_spec.js index 521885f5687..425d0f41bcd 100644 --- a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_identifier_instance_text_spec.js +++ b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_identifier_instance_text_spec.js @@ -1,5 +1,5 @@ -import renderer from '~/vue_shared/components/rich_content_editor/services/renderers/render_identifier_instance_text'; import { buildUneditableInlineTokens } from '~/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token'; +import renderer from '~/vue_shared/components/rich_content_editor/services/renderers/render_identifier_instance_text'; import { buildMockTextNode, normalTextNode } from './mock_data'; diff --git a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_utils_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_utils_spec.js index 774f830f421..7c1809c290c 100644 --- a/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_utils_spec.js +++ b/spec/frontend/vue_shared/components/rich_content_editor/services/renderers/render_utils_spec.js @@ -1,3 +1,7 @@ +import { + buildUneditableBlockTokens, + buildUneditableOpenTokens, +} from '~/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token'; import { renderUneditableLeaf, renderUneditableBranch, @@ -5,11 +9,6 @@ import { willAlwaysRender, } from '~/vue_shared/components/rich_content_editor/services/renderers/render_utils'; -import { - buildUneditableBlockTokens, - buildUneditableOpenTokens, -} from '~/vue_shared/components/rich_content_editor/services/renderers/build_uneditable_token'; - import { originToken, uneditableCloseToken, attributeDefinition } from './mock_data'; describe('rich_content_editor/renderers/render_utils', () => { diff --git a/spec/frontend/vue_shared/components/rich_content_editor/toolbar_item_spec.js b/spec/frontend/vue_shared/components/rich_content_editor/toolbar_item_spec.js index 594b1ab9d78..5a56b499769 100644 --- a/spec/frontend/vue_shared/components/rich_content_editor/toolbar_item_spec.js +++ b/spec/frontend/vue_shared/components/rich_content_editor/toolbar_item_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import ToolbarItem from '~/vue_shared/components/rich_content_editor/toolbar_item.vue'; diff --git a/spec/frontend/vue_shared/components/runner_instructions/runner_instructions_spec.js b/spec/frontend/vue_shared/components/runner_instructions/runner_instructions_spec.js index 6e2ba603e04..48db60bfd33 100644 --- a/spec/frontend/vue_shared/components/runner_instructions/runner_instructions_spec.js +++ b/spec/frontend/vue_shared/components/runner_instructions/runner_instructions_spec.js @@ -1,9 +1,9 @@ import { shallowMount, createLocalVue } from '@vue/test-utils'; import VueApollo from 'vue-apollo'; import createMockApollo from 'helpers/mock_apollo_helper'; -import RunnerInstructions from '~/vue_shared/components/runner_instructions/runner_instructions.vue'; import getRunnerPlatforms from '~/vue_shared/components/runner_instructions/graphql/queries/get_runner_platforms.query.graphql'; import getRunnerSetupInstructions from '~/vue_shared/components/runner_instructions/graphql/queries/get_runner_setup.query.graphql'; +import RunnerInstructions from '~/vue_shared/components/runner_instructions/runner_instructions.vue'; import { mockGraphqlRunnerPlatforms, mockGraphqlInstructions } from './mock_data'; diff --git a/spec/frontend/vue_shared/components/settings/settings_block_spec.js b/spec/frontend/vue_shared/components/settings/settings_block_spec.js index b550c4cfcc3..2db0b001b5b 100644 --- a/spec/frontend/vue_shared/components/settings/settings_block_spec.js +++ b/spec/frontend/vue_shared/components/settings/settings_block_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import component from '~/vue_shared/components/settings/settings_block.vue'; describe('Settings Block', () => { diff --git a/spec/frontend/vue_shared/components/sidebar/date_picker_spec.js b/spec/frontend/vue_shared/components/sidebar/date_picker_spec.js index fc1fa3fc1c1..3221e88192b 100644 --- a/spec/frontend/vue_shared/components/sidebar/date_picker_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/date_picker_spec.js @@ -1,6 +1,6 @@ import { mount } from '@vue/test-utils'; -import SidebarDatePicker from '~/vue_shared/components/sidebar/date_picker.vue'; import DatePicker from '~/vue_shared/components/pikaday.vue'; +import SidebarDatePicker from '~/vue_shared/components/sidebar/date_picker.vue'; describe('SidebarDatePicker', () => { let wrapper; diff --git a/spec/frontend/vue_shared/components/sidebar/issuable_move_dropdown_spec.js b/spec/frontend/vue_shared/components/sidebar/issuable_move_dropdown_spec.js index 256b3cff525..a5a099d803a 100644 --- a/spec/frontend/vue_shared/components/sidebar/issuable_move_dropdown_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/issuable_move_dropdown_spec.js @@ -1,5 +1,3 @@ -import { shallowMount } from '@vue/test-utils'; -import MockAdapter from 'axios-mock-adapter'; import { GlIcon, GlLoadingIcon, @@ -9,6 +7,8 @@ import { GlSearchBoxByType, GlButton, } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; +import MockAdapter from 'axios-mock-adapter'; import axios from '~/lib/utils/axios_utils'; import IssuableMoveDropdown from '~/vue_shared/components/sidebar/issuable_move_dropdown.vue'; diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select/base_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select/base_spec.js index a55ad37c498..68ea94e72ce 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select/base_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select/base_spec.js @@ -1,6 +1,6 @@ +import { shallowMount } from '@vue/test-utils'; import Vue from 'vue'; -import { shallowMount } from '@vue/test-utils'; import LabelsSelect from '~/labels_select'; import BaseComponent from '~/vue_shared/components/sidebar/labels_select/base.vue'; diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_title_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_title_spec.js index 5cbbb99eaef..30dd92b72a4 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_title_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_title_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlLoadingIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import dropdownTitleComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_title.vue'; const createComponent = (canEdit = true) => diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_value_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_value_spec.js index ecb3c3a42c8..37f59c108df 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_value_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select/dropdown_value_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlLabel } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import DropdownValueComponent from '~/vue_shared/components/sidebar/labels_select/dropdown_value.vue'; import { mockConfig, mockLabels } from './mock_data'; diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_button_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_button_spec.js index 951f706421f..59b170bfba9 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_button_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_button_spec.js @@ -1,7 +1,7 @@ -import Vuex from 'vuex'; +import { GlIcon, GlButton } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; -import { GlIcon, GlButton } from '@gitlab/ui'; import DropdownButton from '~/vue_shared/components/sidebar/labels_select_vue/dropdown_button.vue'; import labelSelectModule from '~/vue_shared/components/sidebar/labels_select_vue/store'; diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_create_view_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_create_view_spec.js index 0f49fe4fc5b..c4a645082e6 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_create_view_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_create_view_spec.js @@ -1,7 +1,7 @@ -import Vuex from 'vuex'; +import { GlButton, GlFormInput, GlLink, GlLoadingIcon } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; -import { GlButton, GlFormInput, GlLink, GlLoadingIcon } from '@gitlab/ui'; import DropdownContentsCreateView from '~/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_create_view.vue'; import labelSelectModule from '~/vue_shared/components/sidebar/labels_select_vue/store'; diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view_spec.js index 989cd256e26..60903933505 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view_spec.js @@ -1,6 +1,3 @@ -import Vuex from 'vuex'; -import { shallowMount, createLocalVue } from '@vue/test-utils'; - import { GlIntersectionObserver, GlButton, @@ -8,14 +5,16 @@ import { GlSearchBoxByType, GlLink, } from '@gitlab/ui'; +import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import { UP_KEY_CODE, DOWN_KEY_CODE, ENTER_KEY_CODE, ESC_KEY_CODE } from '~/lib/utils/keycodes'; import DropdownContentsLabelsView from '~/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_labels_view.vue'; import LabelItem from '~/vue_shared/components/sidebar/labels_select_vue/label_item.vue'; -import defaultState from '~/vue_shared/components/sidebar/labels_select_vue/store/state'; -import mutations from '~/vue_shared/components/sidebar/labels_select_vue/store/mutations'; import * as actions from '~/vue_shared/components/sidebar/labels_select_vue/store/actions'; import * as getters from '~/vue_shared/components/sidebar/labels_select_vue/store/getters'; +import mutations from '~/vue_shared/components/sidebar/labels_select_vue/store/mutations'; +import defaultState from '~/vue_shared/components/sidebar/labels_select_vue/store/state'; import { mockConfig, mockLabels, mockRegularLabel } from './mock_data'; diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_spec.js index 97946993857..1175d183c6c 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_contents_spec.js @@ -1,5 +1,5 @@ -import Vuex from 'vuex'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; import DropdownContents from '~/vue_shared/components/sidebar/labels_select_vue/dropdown_contents.vue'; diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_title_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_title_spec.js index c1d9be7393c..726a113dbd9 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_title_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_title_spec.js @@ -1,7 +1,7 @@ -import Vuex from 'vuex'; +import { GlButton, GlLoadingIcon } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; -import { GlButton, GlLoadingIcon } from '@gitlab/ui'; import DropdownTitle from '~/vue_shared/components/sidebar/labels_select_vue/dropdown_title.vue'; import labelsSelectModule from '~/vue_shared/components/sidebar/labels_select_vue/store'; diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_value_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_value_spec.js index 70311f8235f..0d1d6ebcfe5 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_value_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/dropdown_value_spec.js @@ -1,7 +1,7 @@ -import Vuex from 'vuex'; +import { GlLabel } from '@gitlab/ui'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; -import { GlLabel } from '@gitlab/ui'; import DropdownValue from '~/vue_shared/components/sidebar/labels_select_vue/dropdown_value.vue'; import labelsSelectModule from '~/vue_shared/components/sidebar/labels_select_vue/store'; diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/label_item_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/label_item_spec.js index a6ec01ad7e1..bd1705e7693 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/label_item_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/label_item_spec.js @@ -1,6 +1,6 @@ +import { GlIcon, GlLink } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; -import { GlIcon, GlLink } from '@gitlab/ui'; import LabelItem from '~/vue_shared/components/sidebar/labels_select_vue/label_item.vue'; import { mockRegularLabel } from './mock_data'; diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/labels_select_root_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/labels_select_root_spec.js index 1206450bbeb..4cf36df2502 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/labels_select_root_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/labels_select_root_spec.js @@ -1,15 +1,15 @@ -import Vuex from 'vuex'; import { shallowMount, createLocalVue } from '@vue/test-utils'; +import Vuex from 'vuex'; -import LabelsSelectRoot from '~/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue'; -import DropdownTitle from '~/vue_shared/components/sidebar/labels_select_vue/dropdown_title.vue'; -import DropdownValue from '~/vue_shared/components/sidebar/labels_select_vue/dropdown_value.vue'; +import { isInViewport } from '~/lib/utils/common_utils'; import DropdownValueCollapsed from '~/vue_shared/components/sidebar/labels_select/dropdown_value_collapsed.vue'; import DropdownButton from '~/vue_shared/components/sidebar/labels_select_vue/dropdown_button.vue'; import DropdownContents from '~/vue_shared/components/sidebar/labels_select_vue/dropdown_contents.vue'; +import DropdownTitle from '~/vue_shared/components/sidebar/labels_select_vue/dropdown_title.vue'; +import DropdownValue from '~/vue_shared/components/sidebar/labels_select_vue/dropdown_value.vue'; +import LabelsSelectRoot from '~/vue_shared/components/sidebar/labels_select_vue/labels_select_root.vue'; import labelsSelectModule from '~/vue_shared/components/sidebar/labels_select_vue/store'; -import { isInViewport } from '~/lib/utils/common_utils'; import { mockConfig } from './mock_data'; diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/store/actions_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/store/actions_spec.js index 4909c43bc96..3f11095cb04 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/store/actions_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/store/actions_spec.js @@ -1,11 +1,10 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; -import defaultState from '~/vue_shared/components/sidebar/labels_select_vue/store/state'; -import * as types from '~/vue_shared/components/sidebar/labels_select_vue/store/mutation_types'; -import * as actions from '~/vue_shared/components/sidebar/labels_select_vue/store/actions'; - import axios from '~/lib/utils/axios_utils'; +import * as actions from '~/vue_shared/components/sidebar/labels_select_vue/store/actions'; +import * as types from '~/vue_shared/components/sidebar/labels_select_vue/store/mutation_types'; +import defaultState from '~/vue_shared/components/sidebar/labels_select_vue/store/state'; describe('LabelsSelect Actions', () => { let state; diff --git a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/store/mutations_spec.js b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/store/mutations_spec.js index 208f2f2d42d..ab266ac8aed 100644 --- a/spec/frontend/vue_shared/components/sidebar/labels_select_vue/store/mutations_spec.js +++ b/spec/frontend/vue_shared/components/sidebar/labels_select_vue/store/mutations_spec.js @@ -1,5 +1,5 @@ -import mutations from '~/vue_shared/components/sidebar/labels_select_vue/store/mutations'; import * as types from '~/vue_shared/components/sidebar/labels_select_vue/store/mutation_types'; +import mutations from '~/vue_shared/components/sidebar/labels_select_vue/store/mutations'; describe('LabelsSelect Mutations', () => { describe(`${types.SET_INITIAL_STATE}`, () => { diff --git a/spec/frontend/vue_shared/components/smart_virtual_list_spec.js b/spec/frontend/vue_shared/components/smart_virtual_list_spec.js index e5f9b94128e..8802a832781 100644 --- a/spec/frontend/vue_shared/components/smart_virtual_list_spec.js +++ b/spec/frontend/vue_shared/components/smart_virtual_list_spec.js @@ -1,5 +1,5 @@ -import Vue from 'vue'; import { mount } from '@vue/test-utils'; +import Vue from 'vue'; import SmartVirtualScrollList from '~/vue_shared/components/smart_virtual_list.vue'; describe('Toggle Button', () => { diff --git a/spec/frontend/vue_shared/components/table_pagination_spec.js b/spec/frontend/vue_shared/components/table_pagination_spec.js index 12c47637358..ed23a47c328 100644 --- a/spec/frontend/vue_shared/components/table_pagination_spec.js +++ b/spec/frontend/vue_shared/components/table_pagination_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlPagination } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue'; describe('Pagination component', () => { diff --git a/spec/frontend/vue_shared/components/tabs/tabs_spec.js b/spec/frontend/vue_shared/components/tabs/tabs_spec.js index 49d92094b34..fe7be5be899 100644 --- a/spec/frontend/vue_shared/components/tabs/tabs_spec.js +++ b/spec/frontend/vue_shared/components/tabs/tabs_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import Tabs from '~/vue_shared/components/tabs/tabs'; import Tab from '~/vue_shared/components/tabs/tab.vue'; +import Tabs from '~/vue_shared/components/tabs/tabs'; describe('Tabs component', () => { let vm; diff --git a/spec/frontend/vue_shared/components/todo_button_spec.js b/spec/frontend/vue_shared/components/todo_button_spec.js index 2066c3bd671..8043bb7785b 100644 --- a/spec/frontend/vue_shared/components/todo_button_spec.js +++ b/spec/frontend/vue_shared/components/todo_button_spec.js @@ -1,5 +1,5 @@ -import { shallowMount, mount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount, mount } from '@vue/test-utils'; import TodoButton from '~/vue_shared/components/todo_button.vue'; describe('Todo Button', () => { diff --git a/spec/frontend/vue_shared/components/toggle_button_spec.js b/spec/frontend/vue_shared/components/toggle_button_spec.js index 2822b1999bc..632e648aadc 100644 --- a/spec/frontend/vue_shared/components/toggle_button_spec.js +++ b/spec/frontend/vue_shared/components/toggle_button_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import ToggleButton from '~/vue_shared/components/toggle_button.vue'; describe('Toggle Button component', () => { diff --git a/spec/frontend/vue_shared/components/upload_dropzone/upload_dropzone_spec.js b/spec/frontend/vue_shared/components/upload_dropzone/upload_dropzone_spec.js index 11982eb513d..ace486b1f32 100644 --- a/spec/frontend/vue_shared/components/upload_dropzone/upload_dropzone_spec.js +++ b/spec/frontend/vue_shared/components/upload_dropzone/upload_dropzone_spec.js @@ -1,5 +1,5 @@ -import { shallowMount } from '@vue/test-utils'; import { GlIcon } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import UploadDropzone from '~/vue_shared/components/upload_dropzone/upload_dropzone.vue'; jest.mock('~/flash'); diff --git a/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js b/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js index 3eae707daf8..d62c4a98b10 100644 --- a/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js +++ b/spec/frontend/vue_shared/components/user_avatar/user_avatar_link_spec.js @@ -1,10 +1,10 @@ -import { each } from 'lodash'; -import { shallowMount } from '@vue/test-utils'; import { GlLink } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; +import { each } from 'lodash'; import { trimText } from 'helpers/text_helper'; import { TEST_HOST } from 'spec/test_constants'; -import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; import UserAvatarImage from '~/vue_shared/components/user_avatar/user_avatar_image.vue'; +import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; describe('User Avatar Link Component', () => { let wrapper; diff --git a/spec/frontend/vue_shared/components/user_avatar/user_avatar_list_spec.js b/spec/frontend/vue_shared/components/user_avatar/user_avatar_list_spec.js index e3cd2bb9aaa..1d15da491cd 100644 --- a/spec/frontend/vue_shared/components/user_avatar/user_avatar_list_spec.js +++ b/spec/frontend/vue_shared/components/user_avatar/user_avatar_list_spec.js @@ -1,8 +1,8 @@ -import { shallowMount } from '@vue/test-utils'; import { GlButton } from '@gitlab/ui'; +import { shallowMount } from '@vue/test-utils'; import { TEST_HOST } from 'spec/test_constants'; -import UserAvatarList from '~/vue_shared/components/user_avatar/user_avatar_list.vue'; import UserAvatarLink from '~/vue_shared/components/user_avatar/user_avatar_link.vue'; +import UserAvatarList from '~/vue_shared/components/user_avatar/user_avatar_list.vue'; const TEST_IMAGE_SIZE = 7; const TEST_BREAKPOINT = 5; diff --git a/spec/frontend/vue_shared/components/user_popover/user_popover_spec.js b/spec/frontend/vue_shared/components/user_popover/user_popover_spec.js index 435c3a5406e..302f54257ab 100644 --- a/spec/frontend/vue_shared/components/user_popover/user_popover_spec.js +++ b/spec/frontend/vue_shared/components/user_popover/user_popover_spec.js @@ -1,8 +1,8 @@ import { GlDeprecatedSkeletonLoading as GlSkeletonLoading, GlSprintf, GlIcon } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; -import UserPopover from '~/vue_shared/components/user_popover/user_popover.vue'; import UserAvailabilityStatus from '~/set_status_modal/components/user_availability_status.vue'; import { AVAILABILITY_STATUS } from '~/set_status_modal/utils'; +import UserPopover from '~/vue_shared/components/user_popover/user_popover.vue'; const DEFAULT_PROPS = { user: { diff --git a/spec/frontend/vue_shared/components/web_ide_link_spec.js b/spec/frontend/vue_shared/components/web_ide_link_spec.js index 8ed072bed13..eb23a8ef457 100644 --- a/spec/frontend/vue_shared/components/web_ide_link_spec.js +++ b/spec/frontend/vue_shared/components/web_ide_link_spec.js @@ -1,7 +1,7 @@ import { shallowMount } from '@vue/test-utils'; +import ActionsButton from '~/vue_shared/components/actions_button.vue'; import LocalStorageSync from '~/vue_shared/components/local_storage_sync.vue'; import WebIdeLink from '~/vue_shared/components/web_ide_link.vue'; -import ActionsButton from '~/vue_shared/components/actions_button.vue'; const TEST_EDIT_URL = '/gitlab-test/test/-/edit/master/'; const TEST_WEB_IDE_URL = '/-/ide/project/gitlab-test/test/edit/master/-/'; diff --git a/spec/frontend/vue_shared/directives/tooltip_spec.js b/spec/frontend/vue_shared/directives/tooltip_spec.js index 28ec23ad4c1..99e8b5b552b 100644 --- a/spec/frontend/vue_shared/directives/tooltip_spec.js +++ b/spec/frontend/vue_shared/directives/tooltip_spec.js @@ -1,6 +1,6 @@ +import { mount } from '@vue/test-utils'; import $ from 'jquery'; import { escape } from 'lodash'; -import { mount } from '@vue/test-utils'; import tooltip from '~/vue_shared/directives/tooltip'; const DEFAULT_TOOLTIP_TEMPLATE = '
'; diff --git a/spec/frontend/vue_shared/directives/track_event_spec.js b/spec/frontend/vue_shared/directives/track_event_spec.js index c42169440ed..d7d7f4edc3f 100644 --- a/spec/frontend/vue_shared/directives/track_event_spec.js +++ b/spec/frontend/vue_shared/directives/track_event_spec.js @@ -1,5 +1,5 @@ -import Vue from 'vue'; import { shallowMount } from '@vue/test-utils'; +import Vue from 'vue'; import Tracking from '~/tracking'; import TrackEvent from '~/vue_shared/directives/track_event'; diff --git a/spec/frontend/vue_shared/security_reports/security_reports_app_spec.js b/spec/frontend/vue_shared/security_reports/security_reports_app_spec.js index bd66142ab9e..0b4816a951e 100644 --- a/spec/frontend/vue_shared/security_reports/security_reports_app_spec.js +++ b/spec/frontend/vue_shared/security_reports/security_reports_app_spec.js @@ -16,14 +16,14 @@ import { } from 'jest/vue_shared/security_reports/mock_data'; import createFlash from '~/flash'; import axios from '~/lib/utils/axios_utils'; +import HelpIcon from '~/vue_shared/security_reports/components/help_icon.vue'; +import SecurityReportDownloadDropdown from '~/vue_shared/security_reports/components/security_report_download_dropdown.vue'; import { REPORT_TYPE_SAST, REPORT_TYPE_SECRET_DETECTION, } from '~/vue_shared/security_reports/constants'; -import HelpIcon from '~/vue_shared/security_reports/components/help_icon.vue'; -import SecurityReportDownloadDropdown from '~/vue_shared/security_reports/components/security_report_download_dropdown.vue'; -import SecurityReportsApp from '~/vue_shared/security_reports/security_reports_app.vue'; import securityReportDownloadPathsQuery from '~/vue_shared/security_reports/queries/security_report_download_paths.query.graphql'; +import SecurityReportsApp from '~/vue_shared/security_reports/security_reports_app.vue'; jest.mock('~/flash'); diff --git a/spec/frontend/vue_shared/security_reports/store/getters_spec.js b/spec/frontend/vue_shared/security_reports/store/getters_spec.js index b146a281d7b..97746c7c38b 100644 --- a/spec/frontend/vue_shared/security_reports/store/getters_spec.js +++ b/spec/frontend/vue_shared/security_reports/store/getters_spec.js @@ -1,7 +1,3 @@ -import createState from '~/vue_shared/security_reports/store/state'; -import createSastState from '~/vue_shared/security_reports/store/modules/sast/state'; -import createSecretScanningState from '~/vue_shared/security_reports/store/modules/secret_detection/state'; -import { groupedTextBuilder } from '~/vue_shared/security_reports/store/utils'; import { groupedSummaryText, allReportsHaveError, @@ -11,6 +7,10 @@ import { anyReportHasIssues, summaryCounts, } from '~/vue_shared/security_reports/store/getters'; +import createSastState from '~/vue_shared/security_reports/store/modules/sast/state'; +import createSecretScanningState from '~/vue_shared/security_reports/store/modules/secret_detection/state'; +import createState from '~/vue_shared/security_reports/store/state'; +import { groupedTextBuilder } from '~/vue_shared/security_reports/store/utils'; import { CRITICAL, HIGH, LOW } from '~/vulnerabilities/constants'; const generateVuln = (severity) => ({ severity }); diff --git a/spec/frontend/vue_shared/security_reports/store/modules/sast/actions_spec.js b/spec/frontend/vue_shared/security_reports/store/modules/sast/actions_spec.js index c9d1db8a504..6af07273cf6 100644 --- a/spec/frontend/vue_shared/security_reports/store/modules/sast/actions_spec.js +++ b/spec/frontend/vue_shared/security_reports/store/modules/sast/actions_spec.js @@ -1,10 +1,10 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; -import createState from '~/vue_shared/security_reports/store/modules/sast/state'; -import * as types from '~/vue_shared/security_reports/store/modules/sast/mutation_types'; -import * as actions from '~/vue_shared/security_reports/store/modules/sast/actions'; import axios from '~/lib/utils/axios_utils'; +import * as actions from '~/vue_shared/security_reports/store/modules/sast/actions'; +import * as types from '~/vue_shared/security_reports/store/modules/sast/mutation_types'; +import createState from '~/vue_shared/security_reports/store/modules/sast/state'; const diffEndpoint = 'diff-endpoint.json'; const blobPath = 'blob-path.json'; diff --git a/spec/frontend/vue_shared/security_reports/store/modules/sast/mutations_spec.js b/spec/frontend/vue_shared/security_reports/store/modules/sast/mutations_spec.js index fd611f38a34..d6119f44619 100644 --- a/spec/frontend/vue_shared/security_reports/store/modules/sast/mutations_spec.js +++ b/spec/frontend/vue_shared/security_reports/store/modules/sast/mutations_spec.js @@ -1,6 +1,6 @@ import * as types from '~/vue_shared/security_reports/store/modules/sast/mutation_types'; -import createState from '~/vue_shared/security_reports/store/modules/sast/state'; import mutations from '~/vue_shared/security_reports/store/modules/sast/mutations'; +import createState from '~/vue_shared/security_reports/store/modules/sast/state'; const createIssue = ({ ...config }) => ({ changed: false, ...config }); diff --git a/spec/frontend/vue_shared/security_reports/store/modules/secret_detection/actions_spec.js b/spec/frontend/vue_shared/security_reports/store/modules/secret_detection/actions_spec.js index beda1a55438..d22fee864e7 100644 --- a/spec/frontend/vue_shared/security_reports/store/modules/secret_detection/actions_spec.js +++ b/spec/frontend/vue_shared/security_reports/store/modules/secret_detection/actions_spec.js @@ -1,10 +1,10 @@ import MockAdapter from 'axios-mock-adapter'; import testAction from 'helpers/vuex_action_helper'; -import createState from '~/vue_shared/security_reports/store/modules/secret_detection/state'; -import * as types from '~/vue_shared/security_reports/store/modules/secret_detection/mutation_types'; -import * as actions from '~/vue_shared/security_reports/store/modules/secret_detection/actions'; import axios from '~/lib/utils/axios_utils'; +import * as actions from '~/vue_shared/security_reports/store/modules/secret_detection/actions'; +import * as types from '~/vue_shared/security_reports/store/modules/secret_detection/mutation_types'; +import createState from '~/vue_shared/security_reports/store/modules/secret_detection/state'; const diffEndpoint = 'diff-endpoint.json'; const blobPath = 'blob-path.json'; diff --git a/spec/frontend/vue_shared/security_reports/store/modules/secret_detection/mutations_spec.js b/spec/frontend/vue_shared/security_reports/store/modules/secret_detection/mutations_spec.js index 13fcc0f47a3..42da7476a40 100644 --- a/spec/frontend/vue_shared/security_reports/store/modules/secret_detection/mutations_spec.js +++ b/spec/frontend/vue_shared/security_reports/store/modules/secret_detection/mutations_spec.js @@ -1,6 +1,6 @@ import * as types from '~/vue_shared/security_reports/store/modules/secret_detection/mutation_types'; -import createState from '~/vue_shared/security_reports/store/modules/secret_detection/state'; import mutations from '~/vue_shared/security_reports/store/modules/secret_detection/mutations'; +import createState from '~/vue_shared/security_reports/store/modules/secret_detection/state'; const createIssue = ({ ...config }) => ({ changed: false, ...config }); diff --git a/spec/frontend/vue_shared/security_reports/utils_spec.js b/spec/frontend/vue_shared/security_reports/utils_spec.js index 7e5a27694ef..aa9e54fa10c 100644 --- a/spec/frontend/vue_shared/security_reports/utils_spec.js +++ b/spec/frontend/vue_shared/security_reports/utils_spec.js @@ -1,9 +1,9 @@ -import { extractSecurityReportArtifacts } from '~/vue_shared/security_reports/utils'; import { REPORT_TYPE_SAST, REPORT_TYPE_SECRET_DETECTION, REPORT_FILE_TYPES, } from '~/vue_shared/security_reports/constants'; +import { extractSecurityReportArtifacts } from '~/vue_shared/security_reports/utils'; import { securityReportDownloadPathsQueryResponse, sastArtifacts, diff --git a/spec/frontend/vuex_shared/modules/modal/actions_spec.js b/spec/frontend/vuex_shared/modules/modal/actions_spec.js index a8269194c0b..c151049df2d 100644 --- a/spec/frontend/vuex_shared/modules/modal/actions_spec.js +++ b/spec/frontend/vuex_shared/modules/modal/actions_spec.js @@ -1,6 +1,6 @@ import testAction from 'helpers/vuex_action_helper'; -import * as types from '~/vuex_shared/modules/modal/mutation_types'; import * as actions from '~/vuex_shared/modules/modal/actions'; +import * as types from '~/vuex_shared/modules/modal/mutation_types'; describe('Vuex ModalModule actions', () => { describe('open', () => { diff --git a/spec/frontend/vuex_shared/modules/modal/mutations_spec.js b/spec/frontend/vuex_shared/modules/modal/mutations_spec.js index eaaf196d1ec..8e9ab6e6c86 100644 --- a/spec/frontend/vuex_shared/modules/modal/mutations_spec.js +++ b/spec/frontend/vuex_shared/modules/modal/mutations_spec.js @@ -1,5 +1,5 @@ -import mutations from '~/vuex_shared/modules/modal/mutations'; import * as types from '~/vuex_shared/modules/modal/mutation_types'; +import mutations from '~/vuex_shared/modules/modal/mutations'; describe('Vuex ModalModule mutations', () => { describe(`${types.SHOW}`, () => { diff --git a/spec/frontend/whats_new/components/app_spec.js b/spec/frontend/whats_new/components/app_spec.js index 13e6bec47ab..ad062d04140 100644 --- a/spec/frontend/whats_new/components/app_spec.js +++ b/spec/frontend/whats_new/components/app_spec.js @@ -1,6 +1,6 @@ +import { GlDrawer, GlInfiniteScroll, GlTabs } from '@gitlab/ui'; import { createLocalVue, mount } from '@vue/test-utils'; import Vuex from 'vuex'; -import { GlDrawer, GlInfiniteScroll, GlTabs } from '@gitlab/ui'; import { mockTracking, unmockTracking, triggerEvent } from 'helpers/tracking_helper'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import App from '~/whats_new/components/app.vue'; diff --git a/spec/frontend/whats_new/store/actions_spec.js b/spec/frontend/whats_new/store/actions_spec.js index b5e0b2a0364..c4125d28aba 100644 --- a/spec/frontend/whats_new/store/actions_spec.js +++ b/spec/frontend/whats_new/store/actions_spec.js @@ -1,10 +1,10 @@ import MockAdapter from 'axios-mock-adapter'; -import testAction from 'helpers/vuex_action_helper'; import { useLocalStorageSpy } from 'helpers/local_storage_helper'; +import testAction from 'helpers/vuex_action_helper'; import waitForPromises from 'helpers/wait_for_promises'; +import axios from '~/lib/utils/axios_utils'; import actions from '~/whats_new/store/actions'; import * as types from '~/whats_new/store/mutation_types'; -import axios from '~/lib/utils/axios_utils'; describe('whats new actions', () => { describe('openDrawer', () => { diff --git a/spec/frontend/whats_new/store/mutations_spec.js b/spec/frontend/whats_new/store/mutations_spec.js index 4967fb51d2b..a95c6885a77 100644 --- a/spec/frontend/whats_new/store/mutations_spec.js +++ b/spec/frontend/whats_new/store/mutations_spec.js @@ -1,6 +1,6 @@ +import * as types from '~/whats_new/store/mutation_types'; import mutations from '~/whats_new/store/mutations'; import createState from '~/whats_new/store/state'; -import * as types from '~/whats_new/store/mutation_types'; describe('whats new mutations', () => { let state; diff --git a/spec/frontend/whats_new/utils/get_drawer_body_height_spec.js b/spec/frontend/whats_new/utils/get_drawer_body_height_spec.js index d096a3cbdc6..b199f4f0c49 100644 --- a/spec/frontend/whats_new/utils/get_drawer_body_height_spec.js +++ b/spec/frontend/whats_new/utils/get_drawer_body_height_spec.js @@ -1,5 +1,5 @@ -import { mount } from '@vue/test-utils'; import { GlDrawer } from '@gitlab/ui'; +import { mount } from '@vue/test-utils'; import { getDrawerBodyHeight } from '~/whats_new/utils/get_drawer_body_height'; describe('~/whats_new/utils/get_drawer_body_height', () => { diff --git a/spec/frontend/zen_mode_spec.js b/spec/frontend/zen_mode_spec.js index e874d018e92..5cc1d2200d3 100644 --- a/spec/frontend/zen_mode_spec.js +++ b/spec/frontend/zen_mode_spec.js @@ -1,11 +1,11 @@ -import $ from 'jquery'; import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; import Dropzone from 'dropzone'; +import $ from 'jquery'; import Mousetrap from 'mousetrap'; +import initNotes from '~/init_notes'; import * as utils from '~/lib/utils/common_utils'; import ZenMode from '~/zen_mode'; -import initNotes from '~/init_notes'; describe('ZenMode', () => { let mock; -- cgit v1.2.1