serconde · serconde · commit fbda3dbaa3a8 · 2020-11-13T16:09:48.000+01:00
PR fixes
diff --git a/front/config/test/jest.js b/front/config/test/jest.js
@@ -4,8 +4,5 @@ module.exports = {
   restoreMocks: true,
   moduleDirectories: ['<rootDir>/src', 'node_modules'],
   setupFilesAfterEnv: ['<rootDir>/config/test/setup.ts'],
-  modulePathIgnorePatterns: ['cypress'],
-  transform: {
-    '^.+\\.svg$': 'jest-svg-transformer',
-  },
+  modulePathIgnorePatterns: ['cypress']
 };
diff --git a/front/package.json b/front/package.json
@@ -68,7 +68,6 @@
     "file-loader": "^5.0.2",
     "html-webpack-plugin": "^3.2.0",
     "jest": "^24.9.0",
-    "jest-svg-transformer": "^1.0.0",
     "lint-staged": "^9.5.0",
     "mini-css-extract-plugin": "^0.8.0",
     "npm-run-all": "^4.1.5",
diff --git a/front/src/core/api.ts b/front/src/core/api.ts
@@ -1,4 +1,4 @@
-import io from 'socket.io-client';
+import * as ioClient from 'socket.io-client';
 import { Socket } from 'socket.io';
 import { baseSocketUrl } from './const';
 
@@ -18,5 +18,5 @@ export const createSocket = (connectionSetup: ConnectionSetup): Socket => {
   };
 
   // TODO Add channel (room)
-  return io(socketParams.url, socketParams.options);
+  return ioClient(socketParams.url, socketParams.options);
 };
diff --git a/front/src/pods/student/student.component.spec.tsx b/front/src/pods/student/student.component.spec.tsx
@@ -3,7 +3,7 @@ import { render, screen } from '@testing-library/react';
 import { StudentComponent } from './student.component';
 
 describe('StudentComponent tests', () => {
-  it('It should show the session name and the text', () => {
+  it('It should show the session name and the text when passing valid parameters', () => {
     // Arrange
     const props = {
       room: 'Room I',
@@ -40,7 +40,7 @@ describe('StudentComponent tests', () => {
     expect(sessionName).toHaveTextContent(expectedSessionNameText);
   });
 
-  it('It should show an empty session name when passing null', () => {
+  it('It should show an empty session name when passing a null room value', () => {
     // Arrange
     const props = {
       room: null,
@@ -58,15 +58,13 @@ describe('StudentComponent tests', () => {
     expect(sessionName).toHaveTextContent(expectedSessionNameText);
   });
 
-  it('It should empty text when passing undefined', () => {
+  it('It should show an empty text when passing an undefined log value', () => {
     // Arrange
     const props = {
       room: 'Room I',
       log: undefined,
     };
 
-    const expectedSessionNameText = `Session name: ${props.room}`;
-
     // Act
     render(<StudentComponent {...props} />);
 
@@ -75,15 +73,13 @@ describe('StudentComponent tests', () => {
     expect(textArea).toHaveTextContent('');
   });
 
-  it('It should empty text when passing null', () => {
+  it('It should show an empty text when passing a null log value', () => {
     // Arrange
     const props = {
       room: 'Room I',
-      log: undefined,
+      log: null,
     };
 
-    const expectedSessionNameText = `Session name: ${props.room}`;
-
     // Act
     render(<StudentComponent {...props} />);
 
diff --git a/front/src/pods/student/student.component.tsx b/front/src/pods/student/student.component.tsx
@@ -17,7 +17,7 @@ export const StudentComponent: React.FC<Props> = props => {
     <>
       <main className={mainContainer}>
         <Typography className={sessionName} variant="body1" role="heading">
-          Session name: {room}
+          Session name: {room ?? ''}
         </Typography>
         <label className={labelTextarea} htmlFor="session">
           Content
@@ -27,7 +27,7 @@ export const StudentComponent: React.FC<Props> = props => {
           rowsMax={30}
           rowsMin={30}
           className={studentBoard}
-          value={log}
+          value={log ?? ''}
         />
       </main>
     </>
diff --git a/front/src/pods/student/student.container.spec.tsx b/front/src/pods/student/student.container.spec.tsx
diff --git a/front/src/pods/student/student.container.tsx b/front/src/pods/student/student.container.tsx
@@ -9,12 +9,14 @@ import { useLog } from 'core';
 import { StudentComponent } from './student.component';
 import { useWithRef } from 'common';
 import { getPreviousSessionContent } from 'common-app';
+import { useParams } from 'react-router-dom';
 
-interface Props {
+interface Params {
   room: string;
 }
 
-export const StudentContainer: React.FC<Props> = ({ room }) => {
+export const StudentContainer = () => {
+  const { room } = useParams<Params>();
   const { log, appendToLog, setLog } = useLog();
   const [socket, setSocket, socketRef] = useWithRef<SocketIO.Socket>(null);
 
diff --git a/front/src/scenes/student.scene.tsx b/front/src/scenes/student.scene.tsx
@@ -11,10 +11,9 @@ export const StudentScene = () => {
   React.useEffect(() => {
     document.title = `Student - Code Paster`;
   }, []);
-  const { room } = useParams<Params>();
   return (
     <SessionLayout>
-      <StudentContainer room={room}/>
+      <StudentContainer />
     </SessionLayout>
   );
 };
