diff options
Diffstat (limited to 'spec/frontend/monitoring')
5 files changed, 19 insertions, 30 deletions
diff --git a/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap b/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap index 263d6225a9f..3b4554700b4 100644 --- a/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap +++ b/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap @@ -3,7 +3,6 @@ exports[`Dashboard template matches the default snapshot 1`] = ` <div class="prometheus-graphs" - data-qa-selector="prometheus_graphs_content" data-testid="prometheus-graphs" environmentstate="available" metricsdashboardbasepath="/monitoring/monitor-project/-/metrics?environment=1" @@ -40,7 +39,6 @@ exports[`Dashboard template matches the default snapshot 1`] = ` > <dashboards-dropdown-stub class="flex-grow-1" - data-qa-selector="dashboards_filter_dropdown" defaultbranch="master" id="monitor-dashboards-dropdown" toggle-class="dropdown-menu-toggle" @@ -60,7 +58,6 @@ exports[`Dashboard template matches the default snapshot 1`] = ` class="flex-grow-1" clearalltext="Clear all" clearalltextclass="gl-px-5" - data-qa-selector="environments_dropdown" data-testid="environments-dropdown" headertext="" hideheaderborder="true" @@ -106,7 +103,6 @@ exports[`Dashboard template matches the default snapshot 1`] = ` <date-time-picker-stub class="flex-grow-1 show-last-dropdown" customenabled="true" - data-qa-selector="range_picker_dropdown" options="[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]" value="[object Object]" /> diff --git a/spec/frontend/monitoring/components/refresh_button_spec.js b/spec/frontend/monitoring/components/refresh_button_spec.js index e00736954a9..cb300870689 100644 --- a/spec/frontend/monitoring/components/refresh_button_spec.js +++ b/spec/frontend/monitoring/components/refresh_button_spec.js @@ -52,20 +52,6 @@ describe('RefreshButton', () => { expect(findDropdown().props('text')).toBe('Off'); }); - describe('when feature flag disable_metric_dashboard_refresh_rate is on', () => { - beforeEach(() => { - createWrapper({ - provide: { - glFeatures: { disableMetricDashboardRefreshRate: true }, - }, - }); - }); - - it('refresh rate is not available', () => { - expect(findDropdown().exists()).toBe(false); - }); - }); - describe('refresh rate options', () => { it('presents multiple options', () => { expect(findOptions().length).toBeGreaterThan(1); diff --git a/spec/frontend/monitoring/requests/index_spec.js b/spec/frontend/monitoring/requests/index_spec.js index 6f9af911a9f..def4bfe9443 100644 --- a/spec/frontend/monitoring/requests/index_spec.js +++ b/spec/frontend/monitoring/requests/index_spec.js @@ -2,7 +2,10 @@ import MockAdapter from 'axios-mock-adapter'; import { backoffMockImplementation } from 'helpers/backoff_helper'; import axios from '~/lib/utils/axios_utils'; import * as commonUtils from '~/lib/utils/common_utils'; -import statusCodes from '~/lib/utils/http_status'; +import statusCodes, { + HTTP_STATUS_NO_CONTENT, + HTTP_STATUS_UNPROCESSABLE_ENTITY, +} from '~/lib/utils/http_status'; import { getDashboard, getPrometheusQueryData } from '~/monitoring/requests'; import { metricsDashboardResponse } from '../fixture_data'; @@ -37,8 +40,8 @@ describe('monitoring metrics_requests', () => { }); it('returns a dashboard response after retrying twice', () => { - mock.onGet(dashboardEndpoint).replyOnce(statusCodes.NO_CONTENT); - mock.onGet(dashboardEndpoint).replyOnce(statusCodes.NO_CONTENT); + mock.onGet(dashboardEndpoint).replyOnce(HTTP_STATUS_NO_CONTENT); + mock.onGet(dashboardEndpoint).replyOnce(HTTP_STATUS_NO_CONTENT); mock.onGet(dashboardEndpoint).reply(statusCodes.OK, response); return getDashboard(dashboardEndpoint, params).then((data) => { @@ -81,8 +84,8 @@ describe('monitoring metrics_requests', () => { it('returns a dashboard response after retrying twice', () => { // Mock multiple attempts while the cache is filling up - mock.onGet(prometheusEndpoint).replyOnce(statusCodes.NO_CONTENT); - mock.onGet(prometheusEndpoint).replyOnce(statusCodes.NO_CONTENT); + mock.onGet(prometheusEndpoint).replyOnce(HTTP_STATUS_NO_CONTENT); + mock.onGet(prometheusEndpoint).replyOnce(HTTP_STATUS_NO_CONTENT); mock.onGet(prometheusEndpoint).reply(statusCodes.OK, response); // 3rd attempt return getPrometheusQueryData(prometheusEndpoint, params).then((data) => { @@ -116,8 +119,8 @@ describe('monitoring metrics_requests', () => { it('rejects after retrying twice and getting an HTTP 500 error', () => { // Mock multiple attempts while the cache is filling up and fails - mock.onGet(prometheusEndpoint).replyOnce(statusCodes.NO_CONTENT); - mock.onGet(prometheusEndpoint).replyOnce(statusCodes.NO_CONTENT); + mock.onGet(prometheusEndpoint).replyOnce(HTTP_STATUS_NO_CONTENT); + mock.onGet(prometheusEndpoint).replyOnce(HTTP_STATUS_NO_CONTENT); mock.onGet(prometheusEndpoint).reply(500, { status: 'error', error: 'An error occurred', @@ -132,7 +135,7 @@ describe('monitoring metrics_requests', () => { it.each` code | reason ${statusCodes.BAD_REQUEST} | ${'Parameters are missing or incorrect'} - ${statusCodes.UNPROCESSABLE_ENTITY} | ${"Expression can't be executed"} + ${HTTP_STATUS_UNPROCESSABLE_ENTITY} | ${"Expression can't be executed"} ${statusCodes.SERVICE_UNAVAILABLE} | ${'Query timed out or aborted'} `('rejects with details: "$reason" after getting an HTTP $code error', ({ code, reason }) => { mock.onGet(prometheusEndpoint).reply(code, { diff --git a/spec/frontend/monitoring/store/actions_spec.js b/spec/frontend/monitoring/store/actions_spec.js index ca66768c3cc..93af6526c67 100644 --- a/spec/frontend/monitoring/store/actions_spec.js +++ b/spec/frontend/monitoring/store/actions_spec.js @@ -4,7 +4,10 @@ import testAction from 'helpers/vuex_action_helper'; import { createAlert } from '~/flash'; import axios from '~/lib/utils/axios_utils'; import * as commonUtils from '~/lib/utils/common_utils'; -import statusCodes from '~/lib/utils/http_status'; +import statusCodes, { + HTTP_STATUS_CREATED, + HTTP_STATUS_UNPROCESSABLE_ENTITY, +} from '~/lib/utils/http_status'; import { ENVIRONMENT_AVAILABLE_STATE } from '~/monitoring/constants'; import getAnnotations from '~/monitoring/queries/get_annotations.query.graphql'; @@ -944,7 +947,7 @@ describe('Monitoring store actions', () => { }); it('Succesful POST request resolves', async () => { - mock.onPost(state.dashboardsEndpoint).reply(statusCodes.CREATED, { + mock.onPost(state.dashboardsEndpoint).reply(HTTP_STATUS_CREATED, { dashboard: dashboardGitResponse[1], }); @@ -969,7 +972,7 @@ describe('Monitoring store actions', () => { commit_message: 'A new commit message', }); - mock.onPost(state.dashboardsEndpoint).reply(statusCodes.CREATED, { + mock.onPost(state.dashboardsEndpoint).reply(HTTP_STATUS_CREATED, { dashboard: mockCreatedDashboard, }); @@ -1133,7 +1136,7 @@ describe('Monitoring store actions', () => { mock .onPost(panelPreviewEndpoint, { panel_yaml: mockYmlContent }) - .reply(statusCodes.UNPROCESSABLE_ENTITY, { + .reply(HTTP_STATUS_UNPROCESSABLE_ENTITY, { message: mockErrorMsg, }); diff --git a/spec/frontend/monitoring/utils_spec.js b/spec/frontend/monitoring/utils_spec.js index 6c6c3d6b90f..348825c334a 100644 --- a/spec/frontend/monitoring/utils_spec.js +++ b/spec/frontend/monitoring/utils_spec.js @@ -435,6 +435,7 @@ describe('monitoring/utils', () => { describe('setCustomVariablesFromUrl', () => { beforeEach(() => { + window.history.pushState = jest.fn(); jest.spyOn(urlUtils, 'updateHistory'); }); |