Commit 0d146c21 authored by Briggs, Aaron Shane's avatar Briggs, Aaron Shane
Browse files

fix merge

parent 8fc72ea1
......@@ -13,15 +13,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- The IV time series hydrograph is now implemented with a Vue component.
- The Daily Value graph's legend is now a Vue component.
- The Daily Value graph's brush is now a Vue component.
- All button elements now have their type explictly set to "button"
- All button elements now have their type explicitly set to "button"
- The WaterAlert subscribe link now points at the NextGen WaterAlert and is available for any parameter code that has IV data.
- Brush zoom option removed from mobile devices and replaced with touch zoom.
-
### Added
- Added accessibility testing the gitlab CI run when a merge request is made.
### Fixed
- There will no longer be a border next to the retrieve data button in the select actions component if the change time span button is not available.
- Some accessibilty issues have been fixed.
- Some accessibility issues have been fixed.
## [1.4.0](https://code.usgs.gov/wma/iow/waterdataui/-/compare/waterdataui-1.4.0...waterdataui-1.3.0) - 2022-07-21
### Fixed
......
......@@ -35,8 +35,8 @@ describe('monitoring-location/components/hydrograph/vue-components/graph-brush.v
selectedIVMethodID: '90649'
},
ui: {
windowWidth: 1000,
width: 900
windowWidth: 1300,
width: 1201
}
};
......@@ -95,13 +95,23 @@ describe('monitoring-location/components/hydrograph/vue-components/graph-brush.v
const captionTransform = wrapper.find('.brush-text-hint').attributes('transform');
const centerTransform = wrapper.find('.graph-brush-group').attributes('transform');
utils.mediaQuery.mockReturnValue(false);
store.dispatch(uiActions.resizeUI(400, 350));
store.dispatch(uiActions.resizeUI(1201, 900));
await wrapper.vm.$nextTick();
expect(wrapper.find('.brush-svg').attributes('viewBox')).not.toEqual(viewBox);
expect(wrapper.find('.brush-text-hint').attributes('transform')).not.toEqual(captionTransform);
expect(wrapper.find('.graph-brush-group').attributes('transform')).not.toEqual(centerTransform);
});
it('Expects that changing the ui width to less than desktop will remove brush', async() => {
store.dispatch(uiActions.resizeUI(900, 800));
await wrapper.vm.$nextTick();
expect(wrapper.find('.brush-svg').exists()).toBe(false);
expect(wrapper.find('.brush-text-hint').exists()).toBe(false);
expect(wrapper.find('.graph-brush-group').exists()).toBe(false);
store.dispatch(uiActions.resizeUI(1300, 1201));
});
});
it('Expects that if the store only contains IV data that the gwDataGroup is empty', async() => {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment