add unit tests to localStorage helper and API.js -> api.js

package.json

@@ -82,7 +82,8 @@
     "axios-mock-adapter": "^1.15.0",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
-    "jest": "20.0.4",
+    "jest": "^21.2.1",
+    "jest-localstorage-mock": "^2.2.0",
     "puppeteer": "^1.5.0"
   },
   "scripts": {
@@ -102,6 +103,7 @@
       "!src/registerServiceWorker.js"
     ],
     "setupFiles": [
+      "jest-localstorage-mock",
       "<rootDir>/config/polyfills.js",
       "<rootDir>/config/setupTests.js"
     ],

src/actionCreators/commonActionCreator.js

@@ -1,6 +1,6 @@
 import { normalize } from 'normalizr';
 import { axios, createConfigWithHeader, saveReferencesInLocalStorage } from '../utils';
-import * as API from '../constants/API';
+import * as API from '../constants/api';
 import { storeUsers, storeReferences, storeZones } from '../actions';
 import * as schema from './schema';
 

src/actionCreators/index.js

@@ -21,7 +21,7 @@ import { normalize } from 'normalizr';
 import * as schema from './schema';
 import * as actions from '../actions';
 import * as reducerTypes from '../constants/reducerTypes';
-import * as API from '../constants/API';
+import * as API from '../constants/api';
 import { getIsFetchingAgreements } from '../reducers/rootReducer';
 import { axios, saveUserProfileInLocal, createConfigWithHeader } from '../utils';
 import { toastSuccessMessage, toastErrorMessage } from './toastActionCreator';

src/actionCreators/planActionCreator.js

@@ -4,7 +4,7 @@ import { success, request, error, storePlan } from '../actions';
 import { UPDATE_PLAN_STATUS_SUCCESS, UPDATE_AGREEMENT_ZONE_SUCCESS } from '../constants/strings';
 import { toastSuccessMessage, toastErrorMessage } from './toastActionCreator';
 import * as reducerTypes from '../constants/reducerTypes';
-import * as API from '../constants/API';
+import * as API from '../constants/api';
 import * as schema from './schema';
 import { getPasturesMap, getGrazingSchedulesMap, getMinisterIssuesMap, getReferences } from '../reducers/rootReducer';
 import { REFERENCE_KEY, PLAN_STATUS, AMENDMENT_TYPE } from '../constants/variables';

src/components/Login.js

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import { Button, Segment } from 'semantic-ui-react';
 import { Loading } from './common';
-import { SSO_LOGIN_ENDPOINT, SSO_IDIR_LOGIN_ENDPOINT, SSO_BCEID_LOGIN_ENDPOINT } from '../constants/API';
+import { SSO_LOGIN_ENDPOINT, SSO_IDIR_LOGIN_ENDPOINT, SSO_BCEID_LOGIN_ENDPOINT } from '../constants/api';
 import { ELEMENT_ID, IMAGE_SRC } from '../constants/variables';
 import { storeAuthData } from '../actions';
 import { fetchUser } from '../actionCreators';

src/components/Navbar.js

@@ -6,7 +6,7 @@ import { Dropdown } from 'semantic-ui-react';
 import { Avatar } from './common';
 import * as Routes from '../constants/routes';
 import { IMAGE_SRC, ELEMENT_ID } from '../constants/variables';
-import { SITEMINDER_LOGOUT_ENDPOINT } from '../constants/API';
+import { SITEMINDER_LOGOUT_ENDPOINT } from '../constants/api';
 import { getUser } from '../reducers/rootReducer';
 import { isUserAdmin, isUserActive } from '../utils';
 import { signOut } from '../actionCreators';

src/components/ReturnPage.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { parseQuery, getTokenFromSSO, saveAuthDataInLocal } from '../utils';
-import { SSO_LOGOUT_ENDPOINT } from '../constants/API';
+import { SSO_LOGOUT_ENDPOINT } from '../constants/api';
 import { REDIRECTING } from '../constants/strings';
 
 const propTypes = {

src/components/rangeUsePlan/amendment/AmendmentSubmissionModal.js

@@ -12,8 +12,7 @@ import MinorTabsForMultiple from './MinorTabsForMultiple';
 import MandatoryTabsForSingle from './MandatoryTabsForSingle';
 import { isSingleClient, isMinorAmendment, isMandatoryAmendment } from '../../../utils';
 
-/* eslint-disable jsx-a11y/label-has-for */
-/* eslint-disable jsx-a11y/label-has-associated-control */
+/* eslint-disable jsx-a11y/label-has-for, jsx-a11y/label-has-associated-control */
 const propTypes = {
   user: PropTypes.shape({}).isRequired,
   open: PropTypes.bool.isRequired,

src/components/rangeUsePlan/amendment/MandatoryTabsForMultiple.js

@@ -4,8 +4,7 @@ import React, { Component } from 'react';
 // import { Button, Radio, Form, Icon, Checkbox } from 'semantic-ui-react';
 // import { PLAN_STATUS } from '../../../constants/variables';
 
-/* eslint-disable jsx-a11y/label-has-for */
-/* eslint-disable jsx-a11y/label-has-associated-control */
+/* eslint-disable jsx-a11y/label-has-for, jsx-a11y/label-has-associated-control */
 const propTypes = {
   // clients: PropTypes.arrayOf(PropTypes.object),
   // activeTab: PropTypes.number.isRequired,

src/components/rangeUsePlan/amendment/MandatoryTabsForSingle.js

@@ -4,8 +4,7 @@ import PropTypes from 'prop-types';
 import { Button, Radio, Form, Icon, Checkbox } from 'semantic-ui-react';
 import { PLAN_STATUS } from '../../../constants/variables';
 
-/* eslint-disable jsx-a11y/label-has-for */
-/* eslint-disable jsx-a11y/label-has-associated-control */
+/* eslint-disable jsx-a11y/label-has-for, jsx-a11y/label-has-associated-control */
 const propTypes = {
   activeTab: PropTypes.number.isRequired,
   isAgreed: PropTypes.bool.isRequired,

src/constants/API.js

@@ -2,6 +2,7 @@
 // export const SSO_BASE_URL = 'https://dev-sso.pathfinder.gov.bc.ca';
 // export const SSO_REALM_NAME = 'mobile';
 // export const SSO_CLIENT_ID = 'range-test';
+
 export const SSO_BASE_URL = 'https://sso-dev.pathfinder.gov.bc.ca';
 export const SSO_REALM_NAME = 'range';
 export const SSO_CLIENT_ID = 'myrangebc';

src/tests/intergration/Home.test.js

@@ -11,7 +11,7 @@ import { getAgreements } from '../../reducers/rootReducer';
 import { configureMockStore, flushAllPromises } from '../helpers/utils';
 import { ELEMENT_ID } from '../../constants/variables';
 import { mockRequestHeader, mockAgreements, mockAgreement, mockReference } from './mockData';
-import * as API from '../../constants/API';
+import * as API from '../../constants/api';
 
 jest.mock('lodash.debounce');
 

src/tests/reducers/planReducer.test.js

@@ -11,6 +11,7 @@ const initialState = {
   pastures: {},
   grazingSchedules: {},
   ministerIssues: {},
+  confirmations: {},
 };
 
 const mockState = {
@@ -22,6 +23,7 @@ const mockState = {
         pastures: ['pasture_id'],
         grazingSchedules: ['grazing_schedule_id'],
         ministerIssues: ['minister_issue_id'],
+        confirmations: ['confirmation_id'],
       },
     },
     allIds: ['plan_id'],
@@ -50,6 +52,12 @@ const mockState = {
       detail: 'detail',
     },
   },
+  confirmations: {
+    'confirmation_id': {
+      id: 'confirmation_id',
+      clientId: '00000000',
+    },
+  },
 };
 const mockPlanData = {
   id: 'plan_id',
@@ -78,6 +86,12 @@ const mockPlanData = {
       detail: 'detail',
     },
   ],
+  confirmations: [
+    {
+      id: 'confirmation_id',
+      clientId: '00000000',
+    },
+  ],
 };
 describe('Plan reducer', () => {
   it('Initialized with the initial state', () => {

src/tests/unit/localStorage.test.js

@@ -0,0 +1,36 @@
+/* eslint-disable no-underscore-dangle, dot-notation */
+
+import {
+  saveDataInLocalStorage,
+  getDataFromLocalStorage,
+  deleteDataFromLocalStorage,
+} from '../../utils';
+// Please view https://www.npmjs.com/package/jest-localstorage-mock for usage of the local storage mock
+beforeEach(() => {
+  localStorage.clear();
+  saveDataInLocalStorage('validKey', { a: 123 });
+  saveDataInLocalStorage('anotherKey', 'a random string');
+});
+
+describe('Local Storage Helper Methods', () => {
+  test('saveDataInLocalStorage stores data that is passed in', () => {
+    expect(localStorage.__STORE__['validKey']).toBe(JSON.stringify({ a: 123 }));
+    expect(localStorage.__STORE__['anotherKey']).toBe('a random string');
+  });
+
+  test('getDataInLocalStorage gets data when passed a valid key', () => {
+    expect(getDataFromLocalStorage('validKey')).toEqual({ a: 123 });
+    expect(getDataFromLocalStorage('anotherKey')).toBe('a random string');
+  });
+
+  test('getDataFromLocalStorage returns undefined when an invalid key is passed in', () => {
+    expect(getDataFromLocalStorage('asdlkjf;asd')).toBe(undefined);
+    expect(getDataFromLocalStorage(123123)).toBe(undefined);
+    expect(getDataFromLocalStorage({ a: true })).toBe(undefined);
+  });
+
+  test('deleteDataFromLocalStorage deletes data from storage when key is passed in', () => {
+    deleteDataFromLocalStorage('validKey');
+    expect(getDataFromLocalStorage('validKey')).toBe(undefined);
+  });
+});

src/utils/authentication.js

@@ -26,7 +26,7 @@ import {
   SSO_CLIENT_ID,
   GET_TOKEN_FROM_SSO,
   REFRESH_TOKEN_FROM_SSO,
-} from '../constants/API';
+} from '../constants/api';
 import { saveDataInLocalStorage, getDataFromLocalStorage } from './localStorage';
 import { stringifyQuery } from './index';
 import { LOCAL_STORAGE_KEY } from '../constants/variables';
@@ -160,8 +160,9 @@ export const registerAxiosInterceptors = (logout) => {
   axios.interceptors.request.use((c) => {
     const config = { ...c };
     if (isTokenExpired() && !config.isRetry && isRangeAPIs()) {
-      const refreshToken = getRefreshTokenFromLocal();
       if (process.env.NODE_ENV !== 'production') console.log('Access token is expired. Trying to refresh it');
+
+      const refreshToken = getRefreshTokenFromLocal();
       return refreshAccessToken(refreshToken).then(
         (response) => {
           saveAuthDataInLocal(response);
@@ -173,8 +174,9 @@ export const registerAxiosInterceptors = (logout) => {
           return config;
         },
         (err) => {
-          logout();
           if (process.env.NODE_ENV !== 'production') console.log('Refresh token is also expired. Signing out.');
+
+          logout();
           return err;
         },
       );

src/utils/axios.js

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { API_BASE_URL } from '../constants/API';
+import { API_BASE_URL } from '../constants/api';
 
 const instance = axios.create({
   baseURL: API_BASE_URL,