Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reparando todos los problemas del workflow #8

Merged
merged 1 commit into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env node
// eslint-disable-next-line no-undef
module.exports = {
env: {
browser: true,
Expand Down
6 changes: 3 additions & 3 deletions src/ErrorMessage.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import React from "react";

const ErrorMessage = ({ error }) => (
<div data-testid="error">An error occured: {error.toString()}</div>
)
);

export default ErrorMessage
export default ErrorMessage;
12 changes: 8 additions & 4 deletions src/LoadingSpinner.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import React from 'react'
import React from "react";

const LoadingSpinner = () => (
<img className="loading-spinner" alt="Loading..." src="https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/items/poke-ball.png" />
)
<img
className="loading-spinner"
alt="Loading..."
src="https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/items/poke-ball.png"
/>
);

export default LoadingSpinner
export default LoadingSpinner;
10 changes: 4 additions & 6 deletions src/PokemonAbility.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
import React from 'react'
import React from "react";

const PokemonAbility = ({ abilityName }) => (
<div className="pokemon-ability">
<div className="pokemon-ability-type">Hidden ability</div>
<div className="pokemon-ability-name">
{abilityName}
</div>
<div className="pokemon-ability-name">{abilityName}</div>
</div>
)
);

export default PokemonAbility
export default PokemonAbility;
25 changes: 14 additions & 11 deletions src/PokemonList.jsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
import React from 'react'
import { Link } from 'react-router-dom'
import React from "react";
import { Link } from "react-router-dom";

const PokemonList = ({ pokemonList }) => {
return (
<div className="list-container">
{pokemonList.map(({ id, name }) => (
<Link key={id} to={`/pokemon/${name}`} className="list-item" style={{ backgroundImage: `url(${`https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/${id}.png`})` }}>
<div
className="list-item-name"
>
{name}
</div>
<Link
key={id}
to={`/pokemon/${name}`}
className="list-item"
style={{
backgroundImage: `url(${`https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/${id}.png`})`,
}}
>
<div className="list-item-name">{name}</div>
</Link>
))}
</div>
)
}
);
};

export default PokemonList
export default PokemonList;
24 changes: 12 additions & 12 deletions src/useApi.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import { useEffect, useState } from 'react'
import axios from 'axios'
import { useEffect, useState } from "react";
import axios from "axios";

const useApi = (url, mapResults = (result) => result) => {
const [data, setData] = useState()
const [isLoading, setIsLoading] = useState(true)
const [error, setError] = useState()
const [data, setData] = useState();
const [isLoading, setIsLoading] = useState(true);
const [error, setError] = useState();
useEffect(() => {
setIsLoading(true)
setIsLoading(true);
axios
.get(url)
.then(response => setData(mapResults(response.data)))
.then((response) => setData(mapResults(response.data)))
.catch(setError)
.finally(() => setIsLoading(false))
}, [url])
.finally(() => setIsLoading(false));
}, [url]);

return { data, isLoading, error }
}
return { data, isLoading, error };
};

export { useApi }
export { useApi };
73 changes: 43 additions & 30 deletions test/App.jest.spec.jsx
Original file line number Diff line number Diff line change
@@ -1,35 +1,48 @@
import React from 'react'
import { render, screen } from '@testing-library/react'
import axiosMock from 'axios'
import { act } from 'react-dom/test-utils'
import '@testing-library/jest-dom'
import { BrowserRouter as Router } from 'react-router-dom'
import App from '../src/App'
import React from "react";
import { render, screen } from "@testing-library/react";
import axiosMock from "axios";
import { act } from "react-dom/test-utils";
import "@testing-library/jest-dom";
import { BrowserRouter as Router } from "react-router-dom";
import App from "../src/App";

jest.mock('axios')
jest.mock("axios");

describe('<App />', () => {
it('fetches data', async () => {
axiosMock.get.mockResolvedValueOnce(
{
data: {
results: [{ url: 'https://pokeapi.co/api/v2/pokemon/1/', name: 'bulbasaur', id: 1 }]
}
}
)
describe("<App />", () => {
it("fetches data", async () => {
axiosMock.get.mockResolvedValueOnce({
data: {
results: [
{
url: "https://pokeapi.co/api/v2/pokemon/1/",
name: "bulbasaur",
id: 1,
},
],
},
});
await act(async () => {
render(<Router><App/></Router>)
})
expect(axiosMock.get).toHaveBeenCalledTimes(1)
expect(axiosMock.get).toHaveBeenCalledWith('https://pokeapi.co/api/v2/pokemon/?limit=50')
})
render(
<Router>
<App />
</Router>
);
});
expect(axiosMock.get).toHaveBeenCalledTimes(1);
expect(axiosMock.get).toHaveBeenCalledWith(
"https://pokeapi.co/api/v2/pokemon/?limit=50"
);
});

it('shows error', async () => {
axiosMock.get.mockRejectedValueOnce(new Error())
it("shows error", async () => {
axiosMock.get.mockRejectedValueOnce(new Error());
await act(async () => {
render(<Router><App/></Router>)
})
expect(screen.getByTestId('error')).toBeVisible()
})

})
render(
<Router>
<App />
</Router>
);
});
expect(screen.getByTestId("error")).toBeVisible();
});
});
46 changes: 24 additions & 22 deletions test/PokemonList.jest.spec.jsx
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
import React from 'react'
import { render, screen } from '@testing-library/react'
import { BrowserRouter } from 'react-router-dom'
import '@testing-library/jest-dom'
import PokemonList from '../src/PokemonList'
import React from "react";
import { render, screen } from "@testing-library/react";
import { BrowserRouter } from "react-router-dom";
import "@testing-library/jest-dom";
import PokemonList from "../src/PokemonList";

const pokemonList = [
{
url: "https://pokeapi.co/api/v2/pokemon/1/",
name: "bulbasaur",
id: 1,
},
{
url: "https://pokeapi.co/api/v2/pokemon/133/",
name: "eevee",
id: 133,
},
];

const pokemonList = [{
url: 'https://pokeapi.co/api/v2/pokemon/1/',
name: 'bulbasaur',
id: 1
}, {
url: 'https://pokeapi.co/api/v2/pokemon/133/',
name: 'eevee',
id: 133
}]

describe('<PokemonList />', () => {
it('should render items', () => {
describe("<PokemonList />", () => {
it("should render items", () => {
render(
<BrowserRouter>
<PokemonList pokemonList={pokemonList} />
</BrowserRouter>
)
expect(screen.getByText('bulbasaur')).toBeVisible()
expect(screen.getByText('eevee')).toBeVisible()
})
})
);
expect(screen.getByText("bulbasaur")).toBeVisible();
expect(screen.getByText("eevee")).toBeVisible();
});
});
Loading