Video 4673 remove preflight test (#489)

src/__mocks__/twilio-video.ts

@@ -21,18 +21,11 @@ class MockTrack extends EventEmitter {
   }
 }
 
-class MockPreflightTest extends EventEmitter {
-  stop = jest.fn();
-}
-
-const mockPreflightTest = new MockPreflightTest();
-
 const twilioVideo = {
   connect: jest.fn(() => Promise.resolve(mockRoom)),
   createLocalTracks: jest.fn(() => Promise.resolve([new MockTrack('video'), new MockTrack('audio')])),
   createLocalVideoTrack: jest.fn(() => Promise.resolve(new MockTrack('video'))),
-  testPreflight: jest.fn(() => mockPreflightTest),
 };
 
-export { mockRoom, mockPreflightTest };
+export { mockRoom };
 export default twilioVideo;

src/components/IntroContainer/IntroContainer.test.tsx

@@ -67,14 +67,4 @@ describe('the IntroContainer component', () => {
 
     expect(wrapper.find('span').text()).toBe('Test Content');
   });
-
-  it('should render subcontent when provided', () => {
-    const wrapper = shallow(
-      <IntroContainer subContent={<h1>Test Sub Content</h1>}>
-        <span>Test Content</span>
-      </IntroContainer>
-    );
-
-    expect(wrapper.find('h1').text()).toBe('Test Sub Content');
-  });
 });

src/components/IntroContainer/IntroContainer.tsx

@@ -87,16 +87,10 @@ const useStyles = makeStyles((theme: Theme) => ({
       fontSize: '1.1rem',
     },
   },
-  subContentContainer: {
-    position: 'absolute',
-    marginTop: '1em',
-    width: '100%',
-  },
 }));
 
 interface IntroContainerProps {
   children: React.ReactNode;
-  subContent?: React.ReactNode;
 }
 
 const IntroContainer = (props: IntroContainerProps) => {
@@ -120,7 +114,6 @@ const IntroContainer = (props: IntroContainerProps) => {
           </div>
           <div className={classes.content}>{props.children}</div>
         </div>
-        {props.subContent && <div className={classes.subContentContainer}>{props.subContent}</div>}
       </div>
     </div>
   );

src/components/PreJoinScreens/PreJoinScreens.test.tsx

@@ -3,13 +3,11 @@ import { act } from 'react-dom/test-utils';
 import DeviceSelectionScreen from './DeviceSelectionScreen/DeviceSelectionScreen';
 import MediaErrorSnackbar from './MediaErrorSnackbar/MediaErrorSnackbar';
 import { mount, shallow } from 'enzyme';
-import PreflightTest from './PreflightTest/PreflightTest';
 import PreJoinScreens from './PreJoinScreens';
 import RoomNameScreen from './RoomNameScreen/RoomNameScreen';
 import { useParams } from 'react-router-dom';
 import { useAppState } from '../../state';
 import useVideoContext from '../../hooks/useVideoContext/useVideoContext';
-import Video from 'twilio-video';
 
 delete window.location;
 // @ts-ignore
@@ -25,6 +23,7 @@ Object.defineProperty(window.history, 'replaceState', { value: mockReplaceState
 jest.mock('../../state');
 jest.mock('react-router-dom', () => ({ useParams: jest.fn() }));
 jest.mock('../../hooks/useVideoContext/useVideoContext');
+jest.mock('./MediaErrorSnackbar/MediaErrorSnackbar', () => () => null);
 const mockUseAppState = useAppState as jest.Mock<any>;
 const mockUseParams = useParams as jest.Mock<any>;
 const mockUseVideoContext = useVideoContext as jest.Mock<any>;
@@ -80,49 +79,6 @@ describe('the PreJoinScreens component', () => {
     expect(wrapper.find(DeviceSelectionScreen).exists()).toBe(true);
   });
 
-  it('should render the PreflightTest component only while on the DeviceSelection step', () => {
-    const wrapper = shallow(<PreJoinScreens />);
-
-    expect(wrapper.prop('subContent')).toBe(false);
-    expect(wrapper.find(DeviceSelectionScreen).exists()).toBe(false);
-
-    const handleSubmit = wrapper.find(RoomNameScreen).prop('handleSubmit');
-    handleSubmit({ preventDefault: () => {} } as any);
-
-    expect(wrapper.prop('subContent')).toEqual(
-      <>
-        <PreflightTest />
-        <MediaErrorSnackbar />
-      </>
-    );
-    expect(wrapper.find(DeviceSelectionScreen).exists()).toBe(true);
-  });
-
-  it('should not render the PreflightTest component when the Video.testPreflight function does not exist', () => {
-    // Save the testPreflight function
-    const testPreflightFunction = Video.testPreflight;
-
-    // @ts-ignore
-    delete Video.testPreflight;
-    const wrapper = shallow(<PreJoinScreens />);
-
-    expect(wrapper.prop('subContent')).toBe(false);
-    expect(wrapper.find(DeviceSelectionScreen).exists()).toBe(false);
-
-    const handleSubmit = wrapper.find(RoomNameScreen).prop('handleSubmit');
-    handleSubmit({ preventDefault: () => {} } as any);
-
-    expect(wrapper.prop('subContent')).toEqual(
-      <>
-        {undefined}
-        <MediaErrorSnackbar />
-      </>
-    );
-
-    // Restore the testPreflight function to the mock
-    Video.testPreflight = testPreflightFunction;
-  });
-
   it('should populate the room name from the URL and switch to the DeviceSelectionScreen when the displayName is present for the user', () => {
     const wrapper = mount(<PreJoinScreens />);
     const roomName = wrapper.find(DeviceSelectionScreen).prop('roomName');
@@ -154,7 +110,7 @@ describe('the PreJoinScreens component', () => {
       wrapper.update();
     });
 
-    const error = wrapper.children().prop('subContent').props.children[1].props.error;
+    const error = wrapper.find(MediaErrorSnackbar).prop('error');
     expect(error).toBe('testError');
     expect(mockGetAudioAndVideoTracks).toHaveBeenCalledTimes(1); // This makes sure that 'getAudioAndVideoTracks' isn't called repeatedly
   });

src/components/PreJoinScreens/PreJoinScreens.tsx

@@ -2,12 +2,10 @@ import React, { useState, useEffect, FormEvent } from 'react';
 import DeviceSelectionScreen from './DeviceSelectionScreen/DeviceSelectionScreen';
 import IntroContainer from '../IntroContainer/IntroContainer';
 import MediaErrorSnackbar from './MediaErrorSnackbar/MediaErrorSnackbar';
-import PreflightTest from './PreflightTest/PreflightTest';
 import RoomNameScreen from './RoomNameScreen/RoomNameScreen';
 import { useAppState } from '../../state';
 import { useParams } from 'react-router-dom';
 import useVideoContext from '../../hooks/useVideoContext/useVideoContext';
-import Video from 'twilio-video';
 
 export enum Steps {
   roomNameStep,
@@ -53,15 +51,9 @@ export default function PreJoinScreens() {
     setStep(Steps.deviceSelectionStep);
   };
 
-  const SubContent = (
-    <>
-      {Video.testPreflight && <PreflightTest />}
-      <MediaErrorSnackbar error={mediaError} />
-    </>
-  );
-
   return (
-    <IntroContainer subContent={step === Steps.deviceSelectionStep && SubContent}>
+    <IntroContainer>
+      <MediaErrorSnackbar error={mediaError} />
       {step === Steps.roomNameStep && (
         <RoomNameScreen
           name={name}