diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-30 15:08:57 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-30 15:08:57 +0300 |
commit | 1e254d9f5a46a85c9bb6f24da8265a30fd388db4 (patch) | |
tree | 7f9d414ae2256d96ee3d3ced3305da9507561c0c /spec/javascripts | |
parent | e860bae967a4fa90213ff1980fac0bea8f894366 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts')
-rw-r--r-- | spec/javascripts/monitoring/components/dashboard_resize_browser_spec.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/javascripts/monitoring/components/dashboard_resize_browser_spec.js b/spec/javascripts/monitoring/components/dashboard_resize_browser_spec.js index 4416dbd014a..bbcdc0b879f 100644 --- a/spec/javascripts/monitoring/components/dashboard_resize_browser_spec.js +++ b/spec/javascripts/monitoring/components/dashboard_resize_browser_spec.js @@ -11,8 +11,8 @@ import MockAdapter from 'axios-mock-adapter'; import Dashboard from '~/monitoring/components/dashboard.vue'; import { createStore } from '~/monitoring/stores'; import axios from '~/lib/utils/axios_utils'; -import { mockApiEndpoint, propsData } from '../mock_data'; -import { metricsDashboardPayload } from '../fixture_data'; +import { mockApiEndpoint } from '../mock_data'; +import { metricsDashboardPayload, dashboardProps } from '../fixture_data'; import { setupStoreWithData } from '../store_utils'; const localVue = createLocalVue(); @@ -56,7 +56,7 @@ describe('Dashboard', () => { component = new DashboardComponent({ el: document.querySelector('.prometheus-graphs'), propsData: { - ...propsData, + ...dashboardProps, hasMetrics: true, showPanels: true, }, |