diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-10 15:09:12 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-10 15:09:12 +0300 |
commit | 0e0df204c1a0d859ccbbe1be83a5e09a53381f17 (patch) | |
tree | e7bf6fed5fa2b74caf31957c468b0cbc303f4c45 /spec/frontend/monitoring | |
parent | a2344dbf1942dc3919c55b0684d2566368e03852 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/monitoring')
-rw-r--r-- | spec/frontend/monitoring/components/dashboard_header_spec.js | 17 | ||||
-rw-r--r-- | spec/frontend/monitoring/mock_data.js | 26 |
2 files changed, 3 insertions, 40 deletions
diff --git a/spec/frontend/monitoring/components/dashboard_header_spec.js b/spec/frontend/monitoring/components/dashboard_header_spec.js index ab259249772..e54b87c307c 100644 --- a/spec/frontend/monitoring/components/dashboard_header_spec.js +++ b/spec/frontend/monitoring/components/dashboard_header_spec.js @@ -9,12 +9,7 @@ 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 { - environmentData, - dashboardGitResponse, - selfMonitoringDashboardGitResponse, - dashboardHeaderProps, -} from '../mock_data'; +import { environmentData, dashboardGitResponse, dashboardHeaderProps } from '../mock_data'; import { setupAllDashboards, setupStoreWithDashboard, setupStoreWithData } from '../store_utils'; const mockProjectPath = 'https://path/to/project'; @@ -267,14 +262,8 @@ describe('Dashboard header', () => { }); describe('actions menu', () => { - const ootbDashboards = [ - dashboardGitResponse[0].path, - selfMonitoringDashboardGitResponse[0].path, - ]; - const customDashboards = [ - dashboardGitResponse[1].path, - selfMonitoringDashboardGitResponse[1].path, - ]; + const ootbDashboards = [dashboardGitResponse[0].path]; + const customDashboards = [dashboardGitResponse[1].path]; it('is rendered', () => { createShallowWrapper(); diff --git a/spec/frontend/monitoring/mock_data.js b/spec/frontend/monitoring/mock_data.js index 00be5868ba3..1d23190e586 100644 --- a/spec/frontend/monitoring/mock_data.js +++ b/spec/frontend/monitoring/mock_data.js @@ -206,32 +206,6 @@ export const dashboardGitResponse = [ ...customDashboardsData, ]; -export const selfMonitoringDashboardGitResponse = [ - { - default: true, - display_name: 'Default', - can_edit: false, - system_dashboard: true, - out_of_the_box_dashboard: true, - project_blob_path: null, - path: 'config/prometheus/self_monitoring_default.yml', - starred: false, - user_starred_path: `${mockProjectDir}/metrics_user_starred_dashboards?dashboard_path=config/prometheus/self_monitoring_default.yml`, - }, - { - default: false, - display_name: 'dashboard.yml', - can_edit: true, - system_dashboard: false, - out_of_the_box_dashboard: false, - project_blob_path: `${mockProjectDir}/-/blob/main/.gitlab/dashboards/dashboard.yml`, - path: '.gitlab/dashboards/dashboard.yml', - starred: true, - user_starred_path: `${mockProjectDir}/metrics_user_starred_dashboards?dashboard_path=.gitlab/dashboards/dashboard.yml`, - }, - ...customDashboardsData, -]; - // Metrics mocks export const metricsResult = [ |