diff options
Diffstat (limited to 'spec/frontend/monitoring')
46 files changed, 150 insertions, 150 deletions
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 dad3003d536..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 MonitorTimeSeriesChart from '~/monitoring/components/charts/time_series.vue'; import { colorValues } from '~/monitoring/constants'; -import { anomalyDeploymentData, mockProjectDir } from '../../mock_data'; import { anomalyGraphData } from '../../graph_data'; -import MonitorTimeSeriesChart from '~/monitoring/components/charts/time_series.vue'; +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 37712eb3012..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'; @@ -27,8 +27,12 @@ describe('Single Stat Chart component', () => { describe('computed', () => { describe('statValue', () => { - it('should interpolate the value and unit props', () => { - expect(findChart().props('value')).toBe('1.00MB'); + it('should display the correct value', () => { + expect(findChart().props('value')).toBe('1.00'); + }); + + it('should display the correct value unit', () => { + expect(findChart().props('unit')).toBe('MB'); }); it('should change the value representation to a percentile one', () => { @@ -36,7 +40,8 @@ describe('Single Stat Chart component', () => { graphData: singleStatGraphData({ max_value: 120 }, { value: 91 }), }); - expect(findChart().props('value')).toContain('75.83%'); + expect(findChart().props('value')).toBe('75.83'); + expect(findChart().props('unit')).toBe('%'); }); it('should display NaN for non numeric maxValue values', () => { 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 b7e1cb91987..afa63bcff29 100644 --- a/spec/frontend/monitoring/components/charts/time_series_spec.js +++ b/spec/frontend/monitoring/components/charts/time_series_spec.js @@ -1,17 +1,18 @@ -import { mount, shallowMount } from '@vue/test-utils'; -import { setTestTimeout } from 'helpers/timeout'; -import timezoneMock from 'timezone-mock'; import { GlLink } from '@gitlab/ui'; -import { TEST_HOST } from 'helpers/test_constants'; import { GlAreaChart, GlLineChart, 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 43d5937a3a1..6e98ca28071 100644 --- a/spec/frontend/monitoring/components/dashboard_actions_menu_spec.js +++ b/spec/frontend/monitoring/components/dashboard_actions_menu_spec.js @@ -1,14 +1,14 @@ -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 { setupAllDashboards, setupStoreWithData } from '../store_utils'; +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 { dashboardActionsMenuProps, dashboardGitResponse } from '../mock_data'; +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'; jest.mock('~/lib/utils/url_utility', () => ({ redirectTo: jest.fn(), diff --git a/spec/frontend/monitoring/components/dashboard_header_spec.js b/spec/frontend/monitoring/components/dashboard_header_spec.js index 32fd9c45e8d..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 { setupAllDashboards, setupStoreWithDashboard, setupStoreWithData } from '../store_utils'; import { environmentData, dashboardGitResponse, selfMonitoringDashboardGitResponse, dashboardHeaderProps, } from '../mock_data'; -import { redirectTo } from '~/lib/utils/url_utility'; +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 08c69701bd2..b794d0c571e 100644 --- a/spec/frontend/monitoring/components/dashboard_panel_builder_spec.js +++ b/spec/frontend/monitoring/components/dashboard_panel_builder_spec.js @@ -1,14 +1,13 @@ -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 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'; -import DashboardPanelBuilder from '~/monitoring/components/dashboard_panel_builder.vue'; -import DateTimePicker from '~/vue_shared/components/date_time_picker/date_time_picker.vue'; - const mockPanel = metricsDashboardResponse.dashboard.panel_groups[0].panels[0]; describe('dashboard invalid url parameters', () => { diff --git a/spec/frontend/monitoring/components/dashboard_panel_spec.js b/spec/frontend/monitoring/components/dashboard_panel_spec.js index f64e05d3a2c..a72dbbd0f41 100644 --- a/spec/frontend/monitoring/components/dashboard_panel_spec.js +++ b/spec/frontend/monitoring/components/dashboard_panel_spec.js @@ -1,13 +1,32 @@ -import Vuex from 'vuex'; +import { GlDropdownItem } from '@gitlab/ui'; import { shallowMount } from '@vue/test-utils'; import AxiosMockAdapter from 'axios-mock-adapter'; +import Vuex from 'vuex'; import { setTestTimeout } from 'helpers/timeout'; -import { GlDropdownItem } from '@gitlab/ui'; -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 MonitorAnomalyChart from '~/monitoring/components/charts/anomaly.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 { mockAlert, mockLogsHref, @@ -16,27 +35,6 @@ import { mockNamespacedData, mockTimeRange, } from '../mock_data'; -import { dashboardProps, graphData, graphDataEmpty } from '../fixture_data'; -import { - anomalyGraphData, - singleStatGraphData, - heatmapGraphData, - barGraphData, -} from '../graph_data'; - -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 MonitorStackedColumnChart from '~/monitoring/components/charts/stacked_column.vue'; - -import { createStore, monitoringDashboard } from '~/monitoring/stores'; -import { createStore as createEmbedGroupStore } from '~/monitoring/stores/embed_group'; const mocks = { $toast: { diff --git a/spec/frontend/monitoring/components/dashboard_spec.js b/spec/frontend/monitoring/components/dashboard_spec.js index db35f1cdde3..5c7042d4cb5 100644 --- a/spec/frontend/monitoring/components/dashboard_spec.js +++ b/spec/frontend/monitoring/components/dashboard_spec.js @@ -1,22 +1,29 @@ 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 { + metricsDashboardViewModel, + metricsDashboardPanelCount, + dashboardProps, +} from '../fixture_data'; +import { dashboardGitResponse, storeVariables } from '../mock_data'; +import { setupAllDashboards, setupStoreWithDashboard, setMetricResult, @@ -24,13 +31,6 @@ import { setupStoreWithDataForPanelCount, setupStoreWithLinks, } from '../store_utils'; -import { dashboardGitResponse, storeVariables } from '../mock_data'; -import { - metricsDashboardViewModel, - metricsDashboardPanelCount, - dashboardProps, -} from '../fixture_data'; -import { deprecatedCreateFlash as createFlash } from '~/flash'; 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 c4630bde32f..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,14 +9,13 @@ import { mergeUrlParams, updateHistory, } from '~/lib/utils/url_utility'; -import axios from '~/lib/utils/axios_utils'; -import { mockProjectDir } from '../mock_data'; -import { dashboardProps } from '../fixture_data'; import Dashboard from '~/monitoring/components/dashboard.vue'; import DashboardHeader from '~/monitoring/components/dashboard_header.vue'; import { createStore } from '~/monitoring/stores'; import { defaultTimeRange } from '~/vue_shared/constants'; +import { dashboardProps } from '../fixture_data'; +import { mockProjectDir } from '../mock_data'; jest.mock('~/flash'); jest.mock('~/lib/utils/url_utility'); 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/csv_export_spec.js b/spec/frontend/monitoring/csv_export_spec.js index eb2a6e40243..42d19c21a7b 100644 --- a/spec/frontend/monitoring/csv_export_spec.js +++ b/spec/frontend/monitoring/csv_export_spec.js @@ -1,5 +1,5 @@ -import { timeSeriesGraphData } from './graph_data'; import { graphDataToCsv } from '~/monitoring/csv_export'; +import { timeSeriesGraphData } from './graph_data'; describe('monitoring export_csv', () => { describe('graphDataToCsv', () => { 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/mock_data.js b/spec/frontend/monitoring/mock_data.js index ca06c96c7d6..29a7c86491d 100644 --- a/spec/frontend/monitoring/mock_data.js +++ b/spec/frontend/monitoring/mock_data.js @@ -1,6 +1,6 @@ // The path below needs to be relative because we import the mock-data to karma -import { TEST_HOST } from '../__helpers__/test_constants'; import invalidUrl from '~/lib/utils/invalid_url'; +import { TEST_HOST } from '../__helpers__/test_constants'; // This import path needs to be relative for now because this mock data is used in // Karma specs too, where the helpers/test_constants alias can not be resolved 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 078de5f15d1..b30b1e60575 100644 --- a/spec/frontend/monitoring/requests/index_spec.js +++ b/spec/frontend/monitoring/requests/index_spec.js @@ -1,10 +1,10 @@ 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 { metricsDashboardResponse } from '../fixture_data'; +import statusCodes from '~/lib/utils/http_status'; import { getDashboard, getPrometheusQueryData } from '~/monitoring/requests'; +import { metricsDashboardResponse } from '../fixture_data'; describe('monitoring metrics_requests', () => { let mock; 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 58bb87cb332..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,9 +12,7 @@ import { addDashboardMetaDataToLink, normalizeCustomDashboardPath, } from '~/monitoring/stores/utils'; -import * as urlUtils from '~/lib/utils/url_utility'; import { annotationsData } from '../mock_data'; -import { NOT_IN_DB_PREFIX } from '~/monitoring/constants'; 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 de124b0313c..58e7175c04c 100644 --- a/spec/frontend/monitoring/store/variable_mapping_spec.js +++ b/spec/frontend/monitoring/store/variable_mapping_spec.js @@ -1,3 +1,4 @@ +import * as urlUtils from '~/lib/utils/url_utility'; import { parseTemplatingVariables, mergeURLVariables, @@ -9,7 +10,6 @@ import { storeCustomVariables, storeMetricLabelValuesVariables, } from '../mock_data'; -import * as urlUtils from '~/lib/utils/url_utility'; describe('Monitoring variable mapping', () => { describe('parseTemplatingVariables', () => { 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`; |