Updated the tests and added some extra coverage

Author: ray-millward-tessella

src/layout/__snapshots__/layout.test.js.snap

@@ -132,7 +132,7 @@ exports[`Layout renders correctly 1`] = `
     }
   }
   inverseZoom={false}
-  maxNumberPointsPerLink={Infinity}
+  maxNumberPointsPerLink={0}
   smartRouting={false}
 />
 `;

src/layout/block/__snapshots__/blockWidget.component.test.js.snap

@@ -148,13 +148,21 @@ exports[`BlockWidget block renders correctly 1`] = `
     <div
       className="BlockWidget-iconContents-7"
     >
-      <span
-        dangerouslySetInnerHTML={
-          Object {
-            "__html": "<svg height=\\"100\\" width=\\"100\\"><circle cx=\\"50\\" cy=\\"50\\" r=\\"40\\" stroke=\\"black\\" stroke-width=\\"3\\" fill=\\"red\\" /></svg>",
-          }
-        }
-      />
+      <svg
+        height="100"
+        key="0"
+        width="100"
+      >
+        <circle
+          cx="50"
+          cy="50"
+          fill="red"
+          key="0"
+          r="40"
+          stroke="black"
+          strokeWidth="3"
+        />
+      </svg>
     </div>
     <div
       className="BlockWidget-outputPortsContainer-5"

src/malcolm/malcolmSocketHandler.test.js

@@ -138,14 +138,6 @@ describe('malcolm socket handler', () => {
     configureMalcolmSocketHandlers(socketContainer, store);
   });
 
-  it('calls connect on reconnecting socket at configure', () => {
-    configureMalcolmSocketHandlers(reconnectingSocketContainer, store);
-    jest.runTimersToTime(100);
-    expect(
-      reconnectingSocketContainer.socket.mockConnect.mock.calls.length
-    ).toEqual(1);
-  });
-
   it('sets flag and flushes on open', () => {
     socketContainer.queue.push('flushed test');
     socketContainer.socket.onopen();

src/navbar/navcontrol.test.js

@@ -48,4 +48,12 @@ describe('NavControl', () => {
 
     expect(navigateFunction.mock.calls.length).toEqual(1);
   });
+
+  it('handles the nav drop down being clicked', () => {
+    const wrapper = mount(<NavControl nav={nav} navigateToChild={() => {}} />);
+
+    wrapper.find('IconButton').simulate('click');
+
+    expect(wrapper.state.anchorEl).toEqual('werwer');
+  });
 });

src/viewState/viewState.actions.js

@@ -3,7 +3,6 @@ import { push } from 'react-router-redux';
 export const openParentPanelType = 'OPEN_PARENT_PANEL';
 export const openChildPanelType = 'OPEN_CHILD_PANEL';
 export const updateVersionNumerType = 'UPDATE_VERSION';
-export const siteLoadingType = 'SITE_LOADING';
 
 export const openParentPanel = open => ({
   type: openParentPanelType,
@@ -36,16 +35,8 @@ export const updateVersionNumber = version => ({
   },
 });
 
-export const siteLoading = loading => ({
-  type: siteLoadingType,
-  payload: {
-    siteLoading: loading,
-  },
-});
-
 export default {
   openParentPanel,
   closeChildPanel,
   updateChildPanel,
-  siteLoading,
 };

src/viewState/viewState.actions.test.js

@@ -1,4 +1,9 @@
-import { openParentPanel, closeChildPanel } from './viewState.actions';
+import {
+  openParentPanel,
+  closeChildPanel,
+  updateVersionNumber,
+  updateChildPanel,
+} from './viewState.actions';
 
 it('openParentPanel signals the open state of the parent panel', () => {
   const action = openParentPanel(true);
@@ -13,3 +18,24 @@ it('closeChildPanel updates the route to remove the child', () => {
   expect(action.type).toEqual('@@router/CALL_HISTORY_METHOD');
   expect(action.payload.args[0]).toEqual('/gui/PANDA/layout');
 });
+
+it('updateVersionNumber signals the version number', () => {
+  const action = updateVersionNumber('1.2.3');
+
+  expect(action.type).toEqual('UPDATE_VERSION');
+  expect(action.payload.version).toEqual('1.2.3');
+});
+
+it('updateChildPanel adds to the end of the route if it ends in layout', () => {
+  const action = updateChildPanel('/gui/PANDA/layout', 'PANDA:SEQ1');
+
+  expect(action.type).toEqual('@@router/CALL_HISTORY_METHOD');
+  expect(action.payload.args[0]).toEqual('/gui/PANDA/layout/PANDA:SEQ1');
+});
+
+it('updateChildPanel replaces the end of the route if it does not end in layout', () => {
+  const action = updateChildPanel('/gui/PANDA/layout/TTLIN1', 'PANDA:SEQ1');
+
+  expect(action.type).toEqual('@@router/CALL_HISTORY_METHOD');
+  expect(action.payload.args[0]).toEqual('/gui/PANDA/layout/PANDA:SEQ1');
+});

src/viewState/viewState.reducer.js

@@ -1,13 +1,11 @@
 import {
   openParentPanelType,
   updateVersionNumerType,
-  siteLoadingType,
 } from './viewState.actions';
 
 const initialViewState = {
   openParentPanel: true,
   openChildPanel: true,
-  siteLoading: true,
 };
 
 const viewStateReducer = (state = initialViewState, action) => {
@@ -21,12 +19,6 @@ const viewStateReducer = (state = initialViewState, action) => {
       }
       return state;
 
-    case siteLoadingType:
-      return {
-        ...state,
-        siteLoading: action.payload.siteLoading,
-      };
-
     default:
       return state;
   }

src/viewState/viewState.reducer.test.js

@@ -1,5 +1,5 @@
 import ViewStateReducer from './viewState.reducer';
-import { openParentPanel } from './viewState.actions';
+import { openParentPanel, updateVersionNumber } from './viewState.actions';
 
 describe('view state reducer', () => {
   let state = {};
@@ -11,9 +11,21 @@ describe('view state reducer', () => {
     };
   });
 
+  it('returns state if not a recognised type', () => {
+    const newState = ViewStateReducer(state, { type: 'TEST' });
+    expect(newState).toBe(state);
+  });
+
   it('openParentPanelType messages update the parent panel state', () => {
     const newState = ViewStateReducer(state, openParentPanel(false));
     expect(newState.openParentPanel).toEqual(false);
     expect(newState.openChildPanel).toEqual(true);
   });
+
+  it('updateVersionNumerType messages updates the document title', () => {
+    const newState = ViewStateReducer(state, updateVersionNumber('1.2.3'));
+
+    expect(newState).toBe(state);
+    expect(document.title).toEqual('MalcolmJS 1.2.3');
+  });
 });