Merge pull request #80 from Arquisoft/Uo277382

Uo277382
Arquisoft · Mar 27, 2024 · aafedc1 · aafedc1
2 parents 5a4d887 + 6aa0550
commit aafedc1
Show file tree

Hide file tree

Showing 8 changed files with 21,020 additions and 21 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
diff --git a/webapp/src/App.js b/webapp/src/App.js
@@ -12,7 +12,6 @@ function App() {
       <Routes />
     </AuthProvider>
     </main> 
-
   );
 }
 

diff --git a/webapp/src/App.test.js b/webapp/src/App.test.js
@@ -5,7 +5,6 @@ import { render, waitFor, screen } from '@testing-library/react';
 test('renders primera', async() => {
   render(<App />);
 
-  await waitFor(() => {
-    expect(true);
-  });
+  const linkElement = screen.getByText(/Saber y Ganar: El Juego/i);
+  expect(linkElement).toBeInTheDocument();
 });
diff --git a/webapp/src/components/Primera.js b/webapp/src/components/Primera.js
@@ -8,7 +8,7 @@ function Primera() {
 
 
   return (
-  <div class="box">
+  <div className="box">
     <Container>      
         <CssBaseline />
       <Typography component="h1" variant="h5" align="center" sx={{ marginTop: 20 }}>

diff --git a/webapp/src/components/login/Login.js b/webapp/src/components/login/Login.js
@@ -22,8 +22,16 @@ const Login = () => {
 
   const loginUser = async () => {
     try {
+
+      if(username.trim().length ===0 || password.trim().length===0)
+      {
+        setError("No se permite dejar espacios en blanco");
+        return;  
+      }
+
       let res= await axios.post(`${apiEndpoint}/login`, { username, password });
 
+
       // Extract data from the response
       setToken(res.data.token);
       console.log(res);
@@ -36,6 +44,15 @@ const Login = () => {
     }
   };
 
+  const checkForm = () =>
+  {
+    if(username.trim().length ===0 || password.trim().length===0)
+    {
+      setError("No se permite dejar espacios en blanco");
+      return;  
+    }
+  };
+
   const handleCloseSnackbar = () => {
     setOpenSnackbar(false);
   };

diff --git a/webapp/src/components/register/AddUser.js b/webapp/src/components/register/AddUser.js
@@ -32,6 +32,22 @@ const AddUser = () => {
     }
   };
 
+  const checkForm = () =>
+  {
+    if(name.trim().length === 0 || surname.trim().length === 0 || username.trim().length === 0
+    || password.trim().length === 0 || passwordRepeat.trim().length === 0)
+    {
+      setError("No se permite dejar espacios en blanco");
+      return;
+    }
+    if(password != passwordRepeat)
+    {
+      setError("Repita correctamente la contraseña que quiera usar");
+      return;   
+    }
+    addUser();
+  };
+
   const handleCloseSnackbar = () => {
     setOpenSnackbar(false);
   };
@@ -55,7 +71,7 @@ const AddUser = () => {
           label="Nombre"
           value={name}
           onChange={(e) => setName(e.target.value)}
-          id = "input"
+          id = "name"
         />
         </div>
         <div className='input'>
@@ -66,7 +82,7 @@ const AddUser = () => {
           label="Apellidos"
           value={surname}
           onChange={(e) => setSurName(e.target.value)}
-          id = "input"
+          id = "surname"
         />
         </div>
         <div className='input'>
@@ -77,7 +93,7 @@ const AddUser = () => {
           label="Nombre de usuario"
           value={username}
           onChange={(e) => setUsername(e.target.value)}
-          id = "input"
+          id = "username"
         />
         </div>
 
@@ -90,7 +106,7 @@ const AddUser = () => {
           type="password"
           value={password}
           onChange={(e) => setPassword(e.target.value)}
-          id = "input"
+          id = "password"
         />
         </div>
 
@@ -103,12 +119,12 @@ const AddUser = () => {
           type="password"
           value={passwordRepeat}
           onChange={(e) => setPasswordRepeat(e.target.value)}
-          id = "input"
+          id = "password2"
         />
         </div>
         <div className="underline"></div>
         <div className='button'>
-        <Button variant="contained" onClick={addUser}>
+        <Button variant="contained" onClick={checkForm}>
           Registrarse
         </Button>
         </div>

diff --git a/webapp/src/components/register/AddUser.test.js b/webapp/src/components/register/AddUser.test.js
@@ -13,17 +13,31 @@ describe('AddUser component', () => {
 
   it('should add user successfully', async () => {
     render(<AddUser />);
+
+    /*const usernameInput = screen.getByLabelText(/Nombre de Usuario/i);    
+    const nameInput = screen.getByLabelText(/Nombre/i);
+    const surnameInput = screen.getByLabelText(/Apellidos/i);
+    const passwordInput = screen.getByLabelText(/Contraseña/i);    
+    const password2Input = screen.getByLabelText(/Repetir contraseña/i);*/
+
+
+    const usernameInput = document.getElementById("username");    
+    const nameInput = document.getElementById("name"); 
+    const surnameInput = document.getElementById("surname"); 
+    const passwordInput = document.getElementById("password");   
+    const password2Input = document.getElementById("password2"); 
 
-    const usernameInput = screen.getByLabelText(/Nombre de usuario/i);
-    const passwordInput = screen.getByLabelText(/Contraseña/i);
     const addUserButton = screen.getByRole('button', { name: /Registrarse/i });
 
     // Mock the axios.post request to simulate a successful response
     mockAxios.onPost('http://localhost:8000/adduser').reply(200);
 
     // Simulate user input
-    fireEvent.change(usernameInput, { target: { value: 'testUser' } });
-    fireEvent.change(passwordInput, { target: { value: 'testPassword' } });
+    fireEvent.change(usernameInput, { target: { value: 'testUser' } });  
+    fireEvent.change(nameInput, { target: { value: 'testUser' } });      
+    fireEvent.change(surnameInput, { target: { value: 'testUser' } });
+    fireEvent.change(passwordInput, { target: { value: 'testPassword' } });  
+    fireEvent.change(password2Input, { target: { value: 'testPassword' } });
 
     // Trigger the add user button click
     fireEvent.click(addUserButton);
@@ -37,8 +51,8 @@ describe('AddUser component', () => {
   it('should handle error when adding user', async () => {
     render(<AddUser />);
 
-    const usernameInput = screen.getByLabelText(/Nombre de usuario/i);
-    const passwordInput = screen.getByLabelText(/Contraseña/i);
+    const usernameInput = document.getElementById("username");    
+    fireEvent.change(passwordInput, { target: { value: 'testPassword' } });
     const addUserButton = screen.getByRole('button', { name: /Registrarse/i });
 
     // Mock the axios.post request to simulate an error response
@@ -53,7 +67,7 @@ describe('AddUser component', () => {
 
     // Wait for the error Snackbar to be open
     await waitFor(() => {
-      expect(screen.getByText(/Error: Internal Server Error/i)).toBeInTheDocument();
+      expect(screen.getByText(/Error: No se permite dejar espacios en blanco/i)).toBeInTheDocument();
     });
   });
 });
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,6 @@ function App() { @@
           <Routes />
         </AuthProvider>
         </main>
       );
     }
@@ Expand Down @@