better (?) mocha setup

department-of-veterans-affairs · May 19, 2020 · cdad817 · cdad817
1 parent a100b1a
commit cdad817
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 33 deletions.
diff --git a/src/applications/terms-and-conditions/tests/containers/MhvTermsAndConditions.unit.spec.jsx b/src/applications/terms-and-conditions/tests/containers/MhvTermsAndConditions.unit.spec.jsx
@@ -7,8 +7,6 @@ import sinon from 'sinon';
 import { MhvTermsAndConditions } from '../../containers/MhvTermsAndConditions';
 
 describe('<MhvTermsAndConditions>', () => {
-  let oldLocation;
-
   const props = {
     location: {
       pathname: '/health-care/medical-information-terms-conditions',
@@ -32,20 +30,14 @@ describe('<MhvTermsAndConditions>', () => {
   };
 
   const setup = () => {
-    oldLocation = global.window.location;
-    delete global.window.location;
-    global.window.location = { replace: sinon.spy() };
+    global.window.location.replace = sinon.spy();
     props.acceptTerms.reset();
     props.fetchLatestTerms.reset();
     props.fetchTermsAcceptance.reset();
   };
 
   beforeEach(setup);
 
-  afterEach(() => {
-    global.window.location = oldLocation;
-  });
-
   it('should show an error when there are errors', () => {
     const newProps = set('errors', { code: 404 }, props);
     const wrapper = shallow(<MhvTermsAndConditions {...newProps} />);

diff --git a/src/applications/vaos/tests/containers/VAOSApp.unit.spec.jsx b/src/applications/vaos/tests/containers/VAOSApp.unit.spec.jsx
@@ -136,15 +136,14 @@ describe('VAOS <VAOSApp>', () => {
       },
     };
 
-    const oldLocation = window.location;
-    delete window.location;
-    window.location = { replace: sinon.spy() };
+    const oldReplace = window.location.replace;
+    window.location.replace = sinon.spy();
     const tree = mount(<VAOSApp showApplication user={user} />);
 
     expect(window.location.replace.firstCall.args[0]).to.contain('verify');
     expect(tree.find('RequiredLoginView').exists()).to.be.true;
 
-    window.location.replace = oldLocation;
+    window.location.replace = oldReplace;
     tree.unmount();
   });
 });
diff --git a/src/platform/testing/unit/mocha-setup.js b/src/platform/testing/unit/mocha-setup.js
@@ -63,16 +63,13 @@ export default function setupJSDom() {
 
   win.dataLayer = [];
   win.scrollTo = () => {};
-  Object.defineProperty(win, 'sessionStorage', {
-    value: global.sessionStorage,
-    configurable: true,
-    enumerable: true,
+  Object.defineProperty(win, 'localStorage', {
     writable: true,
   });
-  Object.defineProperty(win, 'localStorage', {
-    value: global.localStorage,
-    configurable: true,
-    enumerable: true,
+  Object.defineProperty(win.location, 'replace', {
+    writable: true,
+  });
+  Object.defineProperty(win, 'sessionStorage', {
     writable: true,
   });
   win.requestAnimationFrame = func => func();

diff --git a/src/platform/user/tests/authorization/containers/MHVApp.unit.spec.jsx b/src/platform/user/tests/authorization/containers/MHVApp.unit.spec.jsx
@@ -4,12 +4,10 @@ import { shallow } from 'enzyme';
 import { merge, set } from 'lodash/fp';
 import sinon from 'sinon';
 
-import backendServices from '../../../../user/profile/constants/backendServices';
+import backendServices from 'platform/user/profile/constants/backendServices';
 import { MHVApp } from '../../../authorization/containers/MHVApp';
 
 describe('<MHVApp>', () => {
-  let oldLocation;
-
   const props = {
     location: { pathname: '/health-care/prescriptions', query: {} },
     mhvAccount: {
@@ -30,11 +28,7 @@ describe('<MHVApp>', () => {
   };
 
   const setup = () => {
-    oldLocation = global.window.location;
-    delete global.window.location;
-    global.window.location = {
-      replace: sinon.spy(),
-    };
+    global.window.location.replace = sinon.spy();
     props.createMHVAccount.reset();
     props.fetchMHVAccount.reset();
     props.upgradeMHVAccount.reset();
@@ -58,10 +52,6 @@ describe('<MHVApp>', () => {
 
   beforeEach(setup);
 
-  afterEach(() => {
-    global.window.location = oldLocation;
-  });
-
   it('should show a loading indicator when fetching an account', () => {
     const newProps = set('mhvAccount.loading', true, props);
     const wrapper = shallow(<MHVApp {...newProps} />, { context });