fix(app): clear lw calibration state if top level home is called (#4703)

Opentrons · Jan 8, 2020 · 8fe7120 · 8fe7120
1 parent 5d358f2
commit 8fe7120
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/app/src/robot/reducer/calibration.js b/app/src/robot/reducer/calibration.js
@@ -4,6 +4,7 @@
 import mapValues from 'lodash/mapValues'
 
 import type { Action, Error } from '../../types'
+import { HOME } from '../../robot-controls'
 import type { Mount, Slot } from '../types'
 import { actionTypes } from '../actions'
 import type {
@@ -84,6 +85,7 @@ export default function calibrationReducer(
       return INITIAL_STATE
 
     // reset calibration state on robot home
+    case HOME:
     case 'robot:CLEAR_CALIBRATION_REQUEST':
       return {
         ...state,

diff --git a/app/src/robot/test/calibration-reducer.test.js b/app/src/robot/test/calibration-reducer.test.js
@@ -1,4 +1,5 @@
 // calibration reducer tests
+import { HOME } from '../../robot-controls'
 import { robotReducer as reducer, actionTypes } from '../'
 
 const EXPECTED_INITIAL_STATE = {
@@ -681,4 +682,27 @@ describe('robot reducer - calibration', () => {
       confirmedBySlot: { 5: true },
     })
   })
+
+  test('handles CLEAR_CALIBRATION_REQUEST and robot home actions', () => {
+    const state = {
+      calibration: {
+        calibrationRequest: {
+          type: 'JOG',
+          inProgress: true,
+          error: null,
+          mount: 'right',
+        },
+      },
+    }
+
+    const clearAction = { type: 'robot:CLEAR_CALIBRATION_REQUEST' }
+    expect(reducer(state, clearAction).calibration).toEqual({
+      calibrationRequest: { type: '', inProgress: false, error: null },
+    })
+
+    const homeAction = { type: HOME }
+    expect(reducer(state, homeAction).calibration).toEqual({
+      calibrationRequest: { type: '', inProgress: false, error: null },
+    })
+  })
 })