From 40b9d5de3b666f88b7fdeabe21746a4b553884a3 Mon Sep 17 00:00:00 2001 From: mbucknell <mbucknell@usgs.gov> Date: Mon, 13 Jan 2020 12:44:41 -0600 Subject: [PATCH] Refactored the last test suite as each suite should only have one beforeEach. Also eliminated one of the tests since it wasn't really testing anything. --- .../components/hydrograph/legend.spec.js | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/assets/src/scripts/components/hydrograph/legend.spec.js b/assets/src/scripts/components/hydrograph/legend.spec.js index 6eb29f548..d5f18ec89 100644 --- a/assets/src/scripts/components/hydrograph/legend.spec.js +++ b/assets/src/scripts/components/hydrograph/legend.spec.js @@ -32,10 +32,10 @@ describe('Legend module', () => { }] }, - '00065:compare': { + '00060:compare': { tsKey: 'compare:P7D', - startTime: new Date('2017-03-06T15:45:00.000Z'), - endTime: new Date('2017-03-13T13:45:00.000Z'), + startTime: new Date('2018-03-06T15:45:00.000Z'), + endTime: new Date('2018-03-06T15:45:00.000Z'), variable: '45807202', points: [{ value: 1, @@ -243,6 +243,7 @@ describe('Legend module', () => { describe('legends should render', () => { let graphNode; + let store; beforeEach(() => { let body = select('body'); @@ -255,6 +256,11 @@ describe('Legend module', () => { graphNode = document.getElementById('hydrograph'); + store = configureStore(TEST_DATA); + select(graphNode) + .call(provide(store)) + .call(drawTimeSeriesLegend); + jasmine.Ajax.install(); }); @@ -263,27 +269,13 @@ describe('Legend module', () => { select('#hydrograph').remove(); }); - let store; - - beforeEach(() => { - store = configureStore(TEST_DATA); - select(graphNode) - .call(provide(store)) - .call(drawTimeSeriesLegend); - }); it('Should have 6 legend markers', () => { expect(selectAll('.legend g').size()).toBe(6); expect(selectAll('.legend g line.median-step').size()).toBe(1); }); - it('Should have 6 legend markers after the compare time series is removed', () => { - store.dispatch(Actions.toggleTimeSeries('compare', false)); - expect(selectAll('.legend g').size()).toBe(6); - }); - - it('Should have 4 legend marker after the compare and median time series are removed', () => { - store.dispatch(Actions.toggleTimeSeries('compare', false)); + it('Should have 4 legend marker after the median time series are removed', () => { store.dispatch(Actions.toggleTimeSeries('median', false)); expect(selectAll('.legend g').size()).toBe(4); }); -- GitLab