Merge pull request #116 from Arquisoft/jota

Jota

.github/workflows/build.yml

@@ -6,6 +6,7 @@ on:
       - develop
       - LaraFMz
       - Pablo-Arreglos
+      - Jota
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:

webapp/Dockerfile

@@ -15,4 +15,4 @@ RUN npm install serve
 
 #Execute npm run prod to run the server
 CMD [ "npm", "run", "prod" ]
-#CMD ["npm", "start"]
+#CMD ["npm", "start"]

webapp/src/App.test.js

@@ -0,0 +1,68 @@
+import { render, screen } from '@testing-library/react';
+import App from './App';
+
+/*test('renders learn react link', () => {
+  render(<App />);
+  const linkElement = screen.getByText(/Welcome to the 2024 edition of the Software Architecture course/i);
+  expect(linkElement).toBeInTheDocument();
+});
+*/
+
+describe('App', () => {
+
+  it('renders login page when not logged in', () => {
+    render(
+      <MemoryRouter>
+        <App />
+      </MemoryRouter>
+    );
+
+    expect(screen.getByText(/Login/i)).toBeInTheDocument();
+  });
+
+  it('renders home page when logged in', () => {
+    // Mock local storage to simulate being logged in
+    const mockLocalStorage = {
+      getItem: jest.fn(() => 'true'),
+      setItem: jest.fn(),
+      clear: jest.fn()
+    };
+    global.localStorage = mockLocalStorage;
+
+    render(
+      <MemoryRouter>
+        <App />
+      </MemoryRouter>
+    );
+
+    expect(screen.getByText(/Home/i)).toBeInTheDocument();
+  });
+
+  it('redirects to login when trying to access stats page without logging in', () => {
+    render(
+      <MemoryRouter initialEntries={['/stats']}>
+        <App />
+      </MemoryRouter>
+    );
+
+    expect(screen.getByText(/Login/i)).toBeInTheDocument();
+  });
+
+  it('renders stats page when logged in and trying to access stats page', () => {
+    // Mock local storage to simulate being logged in
+    const mockLocalStorage = {
+      getItem: jest.fn(() => 'true'),
+      setItem: jest.fn(),
+      clear: jest.fn()
+    };
+    global.localStorage = mockLocalStorage;
+
+    render(
+      <MemoryRouter initialEntries={['/stats']}>
+        <App />
+      </MemoryRouter>
+    );
+
+    expect(screen.getByText(/Estadisticas/i)).toBeInTheDocument();
+  });
+});

webapp/src/components/Pages/Juego.js

@@ -29,7 +29,7 @@ const Juego = ({isLogged, username, numPreguntas}) => {
   const [numRespuestasIncorrectas, setNumRespuestasIncorrectas] = useState(0)
   const [disableFinish, setDisableFinish] = useState(false)
 
-  //const navigate= useNavigate()
+  const navigate= useNavigate()
 
   //Variables para la obtencion y modificacion de estadisticas del usuario y de preguntas
   const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
@@ -201,7 +201,7 @@ const Juego = ({isLogged, username, numPreguntas}) => {
   const clickFinalizar = () => {
     updateStats();
     setDisableFinish(true)
-    //navigate('/')
+    navigate('/')
   }
 
   const handleRestart = () => {

webapp/src/components/Pages/Layout.js

@@ -3,6 +3,8 @@ import React from 'react';
 import {Container, Nav, Navbar} from 'react-bootstrap';
 import PropTypes from 'prop-types'
 
+const apiEndpoint = process.env.REACT_APP_API_ENDPOINT || 'http://localhost:8000';
+
   const Layout = ({ isLogged, setIsLogged }) => {
 
     function onLogout(){
@@ -22,8 +24,12 @@ import PropTypes from 'prop-types'
                   <Nav.Link href="stats">Estadísticas</Nav.Link>
                 }
               </Nav>
+              <Nav>
+                <Nav.Link href={`${apiEndpoint}/api-doc`} target="_blanck">API</Nav.Link>
+              </Nav>
               <Nav>
                 {isLogged ? (
+
                   <Nav.Link onClick={onLogout}>Cerrar sesión</Nav.Link>
                 ) : (
                   <>

webapp/src/components/Temporizador.test.js

@@ -0,0 +1,49 @@
+import React from 'react';
+import { render, screen, fireEvent } from '@testing-library/react';
+import Temporizador from './Temporizador';
+
+describe('Temporizador', () => {
+  it('renders the initial countdown time', () => {
+    const tiempoInicial = 60;
+    render(<Temporizador tiempoInicial={tiempoInicial} />);
+    const countdownElement = screen.getByText(tiempoInicial);
+    expect(countdownElement).toBeInTheDocument();
+  });
+
+  it('decreases countdown time when not paused', () => {
+    jest.useFakeTimers();
+    const tiempoInicial = 60;
+    render(<Temporizador tiempoInicial={tiempoInicial} />);
+    jest.advanceTimersByTime(1000);
+    const updatedCountdownElement = screen.getByText(tiempoInicial - 1);
+    expect(updatedCountdownElement).toBeInTheDocument();
+    jest.useRealTimers();
+  });
+
+  it('stops countdown time when paused', () => {
+    jest.useFakeTimers();
+    const tiempoInicial = 60;
+    render(<Temporizador tiempoInicial={tiempoInicial} pausa={true} />);
+    jest.advanceTimersByTime(1000);
+    const updatedCountdownElement = screen.getByText(tiempoInicial);
+    expect(updatedCountdownElement).toBeInTheDocument();
+    jest.useRealTimers();
+  });
+
+  it('restarts countdown time when restart prop changes', () => {
+    jest.useFakeTimers();
+    const tiempoInicial = 60;
+    const { rerender } = render(<Temporizador tiempoInicial={tiempoInicial} />);
+    jest.advanceTimersByTime(1000);
+    const updatedCountdownElement = screen.getByText(tiempoInicial - 1);
+    expect(updatedCountdownElement).toBeInTheDocument();
+
+    // Simulate restart by changing the restart prop
+    rerender(<Temporizador tiempoInicial={tiempoInicial} restart={true} />);
+
+    // Countdown should restart
+    const restartedCountdownElement = screen.getByText(tiempoInicial);
+    expect(restartedCountdownElement).toBeInTheDocument();
+    jest.useRealTimers();
+  });
+});