diff options
author | Fatih Acet <acetfatih@gmail.com> | 2019-02-07 12:43:43 +0300 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2019-02-07 12:43:43 +0300 |
commit | 6e51960788f8a431f86b169d648c4cba68c717ae (patch) | |
tree | 57cda592fba01fa1c8e39819b263f32d600e1048 /spec/javascripts/monitoring | |
parent | 81597427d06e319e67eabd471313c90bb0f76300 (diff) | |
parent | b1257951daf8b35b61781fb3317d8adfe0356adb (diff) |
Merge branch 'ee-8346-hide-unlicensed-alerts' into 'master'
Backport to resolve conflicts for gitlab-ee!9224
See merge request gitlab-org/gitlab-ce!24889
Diffstat (limited to 'spec/javascripts/monitoring')
-rw-r--r-- | spec/javascripts/monitoring/dashboard_spec.js | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/spec/javascripts/monitoring/dashboard_spec.js b/spec/javascripts/monitoring/dashboard_spec.js index 97b9671c809..b1778029a77 100644 --- a/spec/javascripts/monitoring/dashboard_spec.js +++ b/spec/javascripts/monitoring/dashboard_spec.js @@ -25,15 +25,22 @@ export default propsData; describe('Dashboard', () => { let DashboardComponent; + let mock; beforeEach(() => { setFixtures(` <div class="prometheus-graphs"></div> <div class="layout-page"></div> `); + + mock = new MockAdapter(axios); DashboardComponent = Vue.extend(Dashboard); }); + afterEach(() => { + mock.restore(); + }); + describe('no metrics are available yet', () => { it('shows a getting started empty state when no metrics are present', () => { const component = new DashboardComponent({ @@ -47,16 +54,10 @@ describe('Dashboard', () => { }); describe('requests information to the server', () => { - let mock; beforeEach(() => { - mock = new MockAdapter(axios); mock.onGet(mockApiEndpoint).reply(200, metricsGroupsAPIResponse); }); - afterEach(() => { - mock.restore(); - }); - it('shows up a loading state', done => { const component = new DashboardComponent({ el: document.querySelector('.prometheus-graphs'), @@ -152,15 +153,12 @@ describe('Dashboard', () => { }); describe('when the window resizes', () => { - let mock; beforeEach(() => { - mock = new MockAdapter(axios); mock.onGet(mockApiEndpoint).reply(200, metricsGroupsAPIResponse); jasmine.clock().install(); }); afterEach(() => { - mock.restore(); jasmine.clock().uninstall(); }); |