Skip to content

Commit 672e56a

Browse files
chore: Fix merge conflict causing ProtocolSetupCamera.test.tsx unit test failure
This is part of an incremental mergeback of chore_release-8.9.0 into chore_release-9.0.0. It looks like commit c241a9c in chore_release-9.0.0 changed the way the mocks in this file are set up, while chore_release-8.9.0 added a new test to this file. The resolution is to modify the new test to have the new mock setup.
1 parent 75b804d commit 672e56a

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

app/src/organisms/ODD/ProtocolSetup/ProtocolSetupCamera/__tests__/ProtocolSetupCamera.test.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ describe('ProtocolSetupCamera', () => {
164164
recoveryEnabled: false,
165165
liveStreamEnabled: false,
166166
})
167+
mockConfirmCamera.mockResolvedValue(undefined)
167168
const propsWithCameraNotRequired = {
168169
...mockProps,
169170
isCameraRequired: false,

0 commit comments

Comments
 (0)