Merge remote-tracking branch 'upstream/main' into test/client-component

client/src/components/__test__/layout/Layout.spec.tsx

@@ -1,6 +1,8 @@
 import { render, unmountComponentAtNode } from 'react-dom';
 import { act } from 'react-dom/test-utils';
 import Layout from '../../layout/Layout';
+import { MuiThemeProvider } from '@material-ui/core/styles';
+import { theme } from '../../../styles/theme';
 
 let container: any = null;
 
@@ -28,7 +30,7 @@ jest.mock('react-router-dom', () => ({
 
 jest.mock('../../layout/GlobalEffect', () => {
   return () => {
-    return <div id="global">{}</div>;
+    return <div id="global">{ }</div>;
   };
 });
 
@@ -46,7 +48,7 @@ describe('Test Layout', () => {
 
   it('Test Render', () => {
     act(() => {
-      render(<Layout />, container);
+      render(<MuiThemeProvider theme={theme}><Layout /></MuiThemeProvider>, container);
     });
 
     expect(container.querySelectorAll('#global').length).toEqual(1);