Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/PreJoinScreens/PreJoinScreens.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@ describe('the PreJoinScreens component', () => {
});

it('should capture errors from getAudioAndVideoTracks and pass them to the MediaErrorSnackbar component', async () => {
mockUseVideoContext.mockImplementation(() => ({ getAudioAndVideoTracks: () => Promise.reject('testError') }));
const mockGetAudioAndVideoTracks = jest.fn(() => Promise.reject('testError'));
mockUseVideoContext.mockImplementation(() => ({ getAudioAndVideoTracks: mockGetAudioAndVideoTracks }));

const wrapper = mount(<PreJoinScreens />);

Expand All @@ -155,5 +156,6 @@ describe('the PreJoinScreens component', () => {

const error = wrapper.children().prop('subContent').props.children[1].props.error;
expect(error).toBe('testError');
expect(mockGetAudioAndVideoTracks).toHaveBeenCalledTimes(1); // This makes sure that 'getAudioAndVideoTracks' isn't called repeatedly
});
});
4 changes: 2 additions & 2 deletions src/components/PreJoinScreens/PreJoinScreens.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ export default function PreJoinScreens() {
}, [user, URLRoomName]);

useEffect(() => {
if (step === Steps.deviceSelectionStep) {
if (step === Steps.deviceSelectionStep && !mediaError) {
getAudioAndVideoTracks().catch(error => {
console.log('Error acquiring local media:');
console.dir(error);
setMediaError(error);
});
}
}, [getAudioAndVideoTracks, step]);
}, [getAudioAndVideoTracks, step, mediaError]);

const handleSubmit = (event: FormEvent<HTMLFormElement>) => {
event.preventDefault();
Expand Down