From 243bf1fc60abec1c6ef59c501c41c1afb55660f1 Mon Sep 17 00:00:00 2001
From: coral2742 <coral2742@gmail.com>
Date: Thu, 9 May 2024 02:44:02 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=AA:=20Tests=20finales=20a=C3=B1adidos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webapp/src/components/AddUser.js              |  1 -
 webapp/src/components/AddUser.test.js         |  7 ----
 webapp/src/components/Login.js                |  4 +-
 webapp/src/components/Login.test.js           | 11 +----
 webapp/src/components/RegisteredUsers.js      | 23 +++++++----
 webapp/src/components/RegisteredUsers.test.js | 41 ++++++++++++++++++-
 webapp/src/components/ScoreBoard.js           |  2 +
 webapp/src/components/ScoreBoard.test.js      | 13 ++++++
 8 files changed, 72 insertions(+), 30 deletions(-)

diff --git a/webapp/src/components/AddUser.js b/webapp/src/components/AddUser.js
index cf508b50..a70792bc 100644
--- a/webapp/src/components/AddUser.js
+++ b/webapp/src/components/AddUser.js
@@ -59,7 +59,6 @@ const AddUser = ({ onCloseSnackbar }) => {
       {error && (
         <Snackbar open={!!error} autoHideDuration={6000} onClose={() => setError('')} message={`Error: ${error}`} />
       )}
-      <Footer />
     </Container>
   );
 };
diff --git a/webapp/src/components/AddUser.test.js b/webapp/src/components/AddUser.test.js
index 299dbf24..38fb01c8 100644
--- a/webapp/src/components/AddUser.test.js
+++ b/webapp/src/components/AddUser.test.js
@@ -103,11 +103,4 @@ describe('AddUser component', () => {
   });
 
 
-  it('comprobar footer', async () => {
-    renderAddUserComponent();
-  
-    const footerText = screen.getByText(/© \d{4} Hecho con ❤️ por/);
-  
-    expect(footerText).toBeInTheDocument();
-  });
 });
diff --git a/webapp/src/components/Login.js b/webapp/src/components/Login.js
index f5deab23..238a6ca3 100644
--- a/webapp/src/components/Login.js
+++ b/webapp/src/components/Login.js
@@ -51,7 +51,7 @@ const Login = () => {
         </Button>
         <Snackbar open={openSnackbar} autoHideDuration={6000} onClose={() => {setOpenSnackbar(false);}} message="Inicio de sesión exitoso" />
         {error && (
-          <Snackbar 
+          <Snackbar data-testid="closeButton"
             open={!!error} 
             autoHideDuration={6000} 
             onClose={() => { setOpenSnackbar(true); setError('Error: Credenciales inválidas'); }} 
@@ -61,7 +61,7 @@ const Login = () => {
 
       </div>
 
-      <Footer />
+      
     </Container>
   );
 };
diff --git a/webapp/src/components/Login.test.js b/webapp/src/components/Login.test.js
index e6168326..c4c4d257 100644
--- a/webapp/src/components/Login.test.js
+++ b/webapp/src/components/Login.test.js
@@ -86,15 +86,6 @@ describe('Login component', () => {
     expect(history.location.pathname).toBe('/');
   });
 
-  it('comprobar footer', async () => {  
-    render(
-      <Router>
-        <Login />
-      </Router>);
-      
-    const footerText = screen.getByText(/© \d{4} Hecho con ❤️ por/);
-  
-    expect(footerText).toBeInTheDocument();
-  });
+
 
 });
diff --git a/webapp/src/components/RegisteredUsers.js b/webapp/src/components/RegisteredUsers.js
index 13e800f9..0e72c5b7 100644
--- a/webapp/src/components/RegisteredUsers.js
+++ b/webapp/src/components/RegisteredUsers.js
@@ -2,6 +2,7 @@ import axios from 'axios';
 import React, { useState, useEffect } from 'react';
 import { Container, Typography } from '@mui/material';
 import Navbar from './Navbar';
+import Footer from './Footer';
 
 const RegisteredUsers = () => {
   const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
@@ -14,6 +15,18 @@ const RegisteredUsers = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+
+  const formatDate = (dateString) => {
+    const date = new Date(dateString);
+    const day = date.getDate().toString().padStart(2, '0');
+    const month = (date.getMonth() + 1).toString().padStart(2, '0');
+    const year = date.getFullYear();
+    const hours = date.getHours().toString().padStart(2, '0');
+    const minutes = date.getMinutes().toString().padStart(2, '0');
+
+    return `${day}/${month}/${year} ${hours}:${minutes}`;
+  };
+
   const handleShowHistory = async () => {
     try {
       const response = await axios.get(`${apiEndpoint}/getregisteredusers`, {});
@@ -43,17 +56,10 @@ const RegisteredUsers = () => {
             </tr>
           </thead>
           <tbody>
-            {/* {registeredUsers.map((row, rowIndex) => (
-              <tr key={rowIndex}>
-                {row.map((cell, cellIndex) => (
-                  <td key={cellIndex}>{cell}</td>
-                ))}
-              </tr>
-            ))} */}
             {registeredUsers.map((row, rowIndex) => (
               <tr key={rowIndex}>
                 <td>{row[0]}</td>
-                <td>{row[1]}</td>
+                <td>{formatDate(row[1])}</td>
               </tr>
             ))}
             
@@ -61,6 +67,7 @@ const RegisteredUsers = () => {
         </table>
       </div>
   </Container>
+  <Footer />
   </>
 
   );
diff --git a/webapp/src/components/RegisteredUsers.test.js b/webapp/src/components/RegisteredUsers.test.js
index 76e49bde..ca3d7a7f 100644
--- a/webapp/src/components/RegisteredUsers.test.js
+++ b/webapp/src/components/RegisteredUsers.test.js
@@ -13,7 +13,7 @@ describe('Registered Users component', () => {
   });
 
   it('muestra todos los usuarios registrados', async () => {
-    const user1 = ['pablo', '4/23/2024'];
+    const user1 = ['pablo', '2024-04-03T12:34:56Z'];
     const mockUsers = [user1];
     mockAxios.onGet("http://localhost:8000/getregisteredusers").reply(200, mockUsers);
 
@@ -25,8 +25,45 @@ describe('Registered Users component', () => {
   await waitFor(() => {
 
     expect(screen.getByText('pablo')).toBeInTheDocument();
-    expect(screen.getByText('4/23/2024')).toBeInTheDocument();
+    expect(screen.getByText('03/04/2024 14:34')).toBeInTheDocument();
     });
 
   });
+
+
+
+
+  it('should format dates correctly', async () => {
+    const mockRegisteredUsers = [
+      ['username1', '2024-01-01T12:34:56Z'],
+      ['username2', '2024-02-15T09:30:00Z'],
+    ];
+
+    mockAxios.onGet('http://localhost:8000/getregisteredusers').reply(200, mockRegisteredUsers);
+
+    render(
+      <Router>
+        <RegisteredUsers />
+      </Router>);
+
+
+    await waitFor(() => {
+        // Check if dates are formatted correctly
+        expect(screen.getByText('01/01/2024 13:34')).toBeInTheDocument();
+        expect(screen.getByText('15/02/2024 10:30')).toBeInTheDocument();
+      });
+
+  });
+
+
+  it('comprobar footer', async () => {
+    render(
+      <Router>
+        <RegisteredUsers />
+      </Router>);
+  
+    const footerText = screen.getByText(/© \d{4} Hecho con ❤️ por/);
+  
+    expect(footerText).toBeInTheDocument();
+  });
 });
\ No newline at end of file
diff --git a/webapp/src/components/ScoreBoard.js b/webapp/src/components/ScoreBoard.js
index ebb74da0..9c73a404 100644
--- a/webapp/src/components/ScoreBoard.js
+++ b/webapp/src/components/ScoreBoard.js
@@ -3,6 +3,7 @@ import axios from 'axios';
 import { Container, Typography, Table, TableBody, TableCell, TableContainer, TableHead, TableRow, TablePagination } from '@mui/material';
 import Navbar from './Navbar';
 import './ScoreBoard.css';
+import Footer from './Footer';
 
 const ScoreBoard = () => {
   const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
@@ -86,6 +87,7 @@ const ScoreBoard = () => {
           />
         </div>
       </Container>
+      <Footer />
     </>
   );
 };
diff --git a/webapp/src/components/ScoreBoard.test.js b/webapp/src/components/ScoreBoard.test.js
index 4f8e7ad7..deb15965 100644
--- a/webapp/src/components/ScoreBoard.test.js
+++ b/webapp/src/components/ScoreBoard.test.js
@@ -57,4 +57,17 @@ describe('ScoreBoard component', () => {
     expect(screen.getByText('Ranking de Puntuaciones')).toBeInTheDocument();
   });
 
+
+  it('comprobar footer', async () => {
+    render(
+      <Router>
+        <ScoreBoard />
+      </Router>
+    );
+  
+    const footerText = screen.getByText(/© \d{4} Hecho con ❤️ por/);
+  
+    expect(footerText).toBeInTheDocument();
+  });
+
 });