Team tests (ongoing)
This commit is contained in:
Rodrigo Pedroso
parent
f2303fb70c
commit
97509a85d7
7 changed files with 283 additions and 230 deletions
|
|
@ -10,6 +10,10 @@
|
|||
"plugins": ["prettier"],
|
||||
"rules": {
|
||||
"prettier/prettier": "error",
|
||||
"no-unused-vars": 1
|
||||
}
|
||||
"no-unused-vars": 1,
|
||||
"react/prop-types": 0
|
||||
},
|
||||
'extends': [
|
||||
'plugin:react/recommended'
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,51 +6,71 @@ import Team from '../views/Team'
|
|||
import Member from '../views/Member'
|
||||
import config from '../config.json'
|
||||
|
||||
history.listen(location => {
|
||||
window.scrollTo(0,0)
|
||||
history.listen(() => {
|
||||
window.scrollTo(0, 0)
|
||||
})
|
||||
|
||||
export default function Router(props) {
|
||||
let [team, setTeam] = useState([])
|
||||
let [allTeams, setAllTeams] = useState([])
|
||||
let [users, setUsers] = useState([])
|
||||
let [memberProps, setMemberProps] = useState({})
|
||||
|
||||
let teamCallback = (el) => {
|
||||
setTeam(el)
|
||||
}
|
||||
export default function Router() {
|
||||
// let [team, setTeam] = useState([])
|
||||
let [allTeams, setAllTeams] = useState([])
|
||||
// let [users, setUsers] = useState([])
|
||||
let [memberProps, setMemberProps] = useState({})
|
||||
let [teamProps, setTeamProps] = useState({})
|
||||
|
||||
let usersCallback = (el) => {
|
||||
setUsers(el)
|
||||
}
|
||||
let teamCallback = (teamId, users) => {
|
||||
// Remove this:
|
||||
// setTeam(teamId)
|
||||
|
||||
let userIdCallback = (el) => {
|
||||
setMemberProps({
|
||||
url: config.api + '/user/' + el,
|
||||
teams: allTeams
|
||||
})
|
||||
}
|
||||
// Leave:
|
||||
setTeamProps({
|
||||
url: config.api + '/team/' + teamId,
|
||||
team: teamId,
|
||||
users: users,
|
||||
cb: userIdCallback
|
||||
})
|
||||
}
|
||||
|
||||
let allTeamsCallback = (el) => {
|
||||
setAllTeams(el)
|
||||
}
|
||||
let usersCallback = el => {
|
||||
setUsers(el)
|
||||
}
|
||||
|
||||
return (
|
||||
<ReactRouter history = { history }>
|
||||
<Switch>
|
||||
<Route
|
||||
exact path='/'
|
||||
render={(props) => <Home teamCallback={teamCallback} usersCallback={usersCallback} allTeamsCallback={allTeamsCallback} {...props} />}
|
||||
/>
|
||||
<Route
|
||||
exact path='/team'
|
||||
render={(props) => <Team teamProps={team} usersProps={users} userIdCallback={userIdCallback} {...props} />}
|
||||
/>
|
||||
<Route
|
||||
exact path='/member'
|
||||
render={(props) => <Member props={memberProps} />}
|
||||
/>
|
||||
</Switch>
|
||||
</ReactRouter>
|
||||
)
|
||||
let userIdCallback = el => {
|
||||
setMemberProps({
|
||||
url: config.api + '/user/' + el,
|
||||
teams: allTeams
|
||||
})
|
||||
}
|
||||
|
||||
let allTeamsCallback = el => {
|
||||
setAllTeams(el)
|
||||
}
|
||||
|
||||
// <Route
|
||||
// exact
|
||||
// path="/team"
|
||||
// render={props => <Team teamProps={team} usersProps={users} userIdCallback={userIdCallback} {...props} />}
|
||||
// />
|
||||
|
||||
return (
|
||||
<ReactRouter history={history}>
|
||||
<Switch>
|
||||
<Route
|
||||
exact
|
||||
path="/"
|
||||
render={props => (
|
||||
<Home
|
||||
teamCallback={teamCallback}
|
||||
usersCallback={usersCallback}
|
||||
allTeamsCallback={allTeamsCallback}
|
||||
{...props}
|
||||
/>
|
||||
)}
|
||||
/>
|
||||
|
||||
<Route exact path="/team" render={() => <Team props={teamProps} />} />
|
||||
|
||||
<Route exact path="/member" render={() => <Member props={memberProps} />} />
|
||||
</Switch>
|
||||
</ReactRouter>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,78 +1,78 @@
|
|||
// MARK: Definitions
|
||||
import React, { useState, useEffect } from 'react'
|
||||
import axios from 'axios'
|
||||
import history from '../history.js'
|
||||
import history from '../history.js'
|
||||
// import config from '../config.json'
|
||||
import './Member.scss'
|
||||
|
||||
export default function Member({ props }) {
|
||||
// MARK: State
|
||||
let [user, setUser] = useState(null)
|
||||
let [teamNames, setTeamNames] = useState([])
|
||||
// MARK: State
|
||||
let [user, setUser] = useState(null)
|
||||
let [teamNames, setTeamNames] = useState([])
|
||||
|
||||
// MARK: Effects
|
||||
// MARK: - Load user info from Tempo backend on initialization
|
||||
useEffect(() => {
|
||||
let fetchData = async() => {
|
||||
try {
|
||||
let result = await axios.get(props.url)
|
||||
if (result.data) {
|
||||
setUser(result.data)
|
||||
// MARK: Effects
|
||||
// MARK: - Load user info from Tempo backend on initialization
|
||||
useEffect(() => {
|
||||
let fetchData = async () => {
|
||||
try {
|
||||
let result = await axios.get(props.url)
|
||||
if (result.data) {
|
||||
setUser(result.data)
|
||||
|
||||
result.data.member_teams.map(teamId => {
|
||||
let arr = props.teams.filter(el => el.id === teamId)
|
||||
setTeamNames(t => [...t, arr[0].name])
|
||||
result.data.member_teams.map(teamId => {
|
||||
let arr = props.teams.filter(el => el.id === teamId)
|
||||
setTeamNames(t => [...t, arr[0].name])
|
||||
|
||||
return null
|
||||
})
|
||||
}
|
||||
}
|
||||
catch(err) {
|
||||
history.push('/')
|
||||
}
|
||||
}
|
||||
return null
|
||||
})
|
||||
}
|
||||
} catch (err) {
|
||||
history.push('/')
|
||||
}
|
||||
}
|
||||
|
||||
fetchData()
|
||||
}, [props])
|
||||
fetchData()
|
||||
}, [props])
|
||||
|
||||
// MARK: Helpers
|
||||
let navBack = () => {
|
||||
history.push('/team')
|
||||
}
|
||||
// MARK: Helpers
|
||||
let navBack = () => {
|
||||
history.push('/team')
|
||||
}
|
||||
|
||||
// MARK: Return
|
||||
return (
|
||||
<div className='member'>
|
||||
// MARK: Return
|
||||
return (
|
||||
<div className="member">
|
||||
{user === null ? (
|
||||
<div data-testid="loading">Loading...</div>
|
||||
) : (
|
||||
user !== undefined && (
|
||||
<div>
|
||||
<div className="header">
|
||||
<span data-testid="resolved">
|
||||
<h1>Member {user.name}</h1>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
{user === null ? (<div data-testid='loading'>Loading...</div>) : (
|
||||
user !== undefined &&
|
||||
<div>
|
||||
<div className='header'>
|
||||
<span data-testid='resolved'><h1>Member {user.name}</h1></span>
|
||||
</div>
|
||||
<div className="back">
|
||||
<button className="back-btn" onClick={navBack}>{`< Back to team`}</button>
|
||||
</div>
|
||||
|
||||
<div className='back'>
|
||||
<button className='back-btn' onClick={navBack}>{`< Back to team`}</button>
|
||||
</div>
|
||||
<h2>Username:</h2>
|
||||
<div className="username">
|
||||
<p>{user.username}</p>
|
||||
</div>
|
||||
|
||||
<h2>Username:</h2>
|
||||
<div className='username'>
|
||||
<p>{user.username}</p>
|
||||
</div>
|
||||
|
||||
<h2>Member of:</h2>
|
||||
<ul className='list'>
|
||||
{teamNames.map((name, index) => (
|
||||
<li className='list-item' key={index}>
|
||||
<div className='username'>
|
||||
{name}
|
||||
</div>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
)}
|
||||
|
||||
</div>
|
||||
)
|
||||
<h2>Member of:</h2>
|
||||
<ul className="list">
|
||||
{teamNames.map((name, index) => (
|
||||
<li className="list-item" key={index}>
|
||||
<div className="username">{name}</div>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
)
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,27 +5,29 @@ import '@testing-library/react/cleanup-after-each'
|
|||
import axiosMock from 'axios'
|
||||
import Member from './Member'
|
||||
|
||||
it('Renders without crashing', () => {
|
||||
const { getByTestId } = render(<Member />)
|
||||
expect(getByTestId('loading')).toHaveTextContent('Loading...')
|
||||
})
|
||||
|
||||
it('Fetches and displays data', async () => {
|
||||
const callData = {
|
||||
username: 'goodpanda',
|
||||
member_teams: [3],
|
||||
lead_teams: [],
|
||||
id: 15,
|
||||
name: 'Charlotte Amsterdan'
|
||||
}
|
||||
|
||||
axiosMock.get.mockResolvedValueOnce({ data: callData })
|
||||
|
||||
const address = { url: '/user15' }
|
||||
const { getByTestId } = render(<Member props={address} />)
|
||||
const resolvedSpan = await waitForElement(() => getByTestId('resolved'))
|
||||
|
||||
expect(resolvedSpan).toHaveTextContent('Member ' + callData.name)
|
||||
expect(axiosMock.get).toHaveBeenCalledTimes(1)
|
||||
expect(axiosMock.get).toHaveBeenCalledWith(address.url)
|
||||
describe('A members page', () => {
|
||||
it('should render without crashing', () => {
|
||||
const { getByTestId } = render(<Member />)
|
||||
expect(getByTestId('loading')).toHaveTextContent('Loading...')
|
||||
})
|
||||
|
||||
it('should fetch and display data', async () => {
|
||||
const callData = {
|
||||
username: 'goodpanda',
|
||||
member_teams: [3],
|
||||
lead_teams: [],
|
||||
id: 15,
|
||||
name: 'Charlotte Amsterdan'
|
||||
}
|
||||
|
||||
axiosMock.get.mockResolvedValueOnce({ data: callData })
|
||||
|
||||
const address = { url: '/user15' }
|
||||
const { getByTestId } = render(<Member props={address} />)
|
||||
const resolvedSpan = await waitForElement(() => getByTestId('resolved'))
|
||||
|
||||
expect(resolvedSpan).toHaveTextContent('Member ' + callData.name)
|
||||
expect(axiosMock.get).toHaveBeenCalledTimes(1)
|
||||
expect(axiosMock.get).toHaveBeenCalledWith(address.url)
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,127 +1,123 @@
|
|||
// MARK: Definitions
|
||||
import React, { useState, useEffect } from 'react'
|
||||
import axios from 'axios'
|
||||
import history from '../history.js'
|
||||
import config from '../config.json'
|
||||
import history from '../history.js'
|
||||
import FilterForm from '../components/FilterForm.jsx'
|
||||
import './Team.scss'
|
||||
|
||||
// teamProps, usersProps, userIdCallback
|
||||
export default function Team(props) {
|
||||
// MARK: State
|
||||
let [loading, setLoading] = useState(true)
|
||||
let [team, setTeam] = useState([])
|
||||
let [members, setMembers] = useState([])
|
||||
let [filteredMembers, setFilteredMembers] = useState([])
|
||||
// MARK: State
|
||||
let [team, setTeam] = useState([])
|
||||
let [members, setMembers] = useState([])
|
||||
let [filteredMembers, setFilteredMembers] = useState([])
|
||||
|
||||
// MARK: Effect
|
||||
// MARK: - Load user info from Tempo backend on initialization
|
||||
useEffect(() => {
|
||||
let fetchData = async() => {
|
||||
setLoading(true)
|
||||
try {
|
||||
let result = await axios(config.api + '/team/' + props.teamProps.id)
|
||||
if (result.data) {
|
||||
setTeam(result.data)
|
||||
// MARK: Effect
|
||||
// MARK: - Load user info from Tempo backend on initialization
|
||||
useEffect(() => {
|
||||
let fetchData = async () => {
|
||||
try {
|
||||
let result = await axios(props.url)
|
||||
if (result.data) {
|
||||
setTeam(result.data)
|
||||
|
||||
result.data.members.map(memberId => {
|
||||
let arr = props.usersProps.filter(el => el.id === memberId)
|
||||
if (arr[0] !== undefined) {
|
||||
let tupple = {
|
||||
name: arr[0].name,
|
||||
id: memberId
|
||||
}
|
||||
setMembers(t => [...t, tupple])
|
||||
setFilteredMembers(t => [...t, tupple])
|
||||
}
|
||||
else {
|
||||
history.push('/')
|
||||
}
|
||||
result.data.members.map(memberId => {
|
||||
let arr = props.users.filter(el => el.id === memberId)
|
||||
if (arr[0] !== undefined) {
|
||||
let tupple = {
|
||||
name: arr[0].name,
|
||||
id: memberId
|
||||
}
|
||||
setMembers(t => [...t, tupple])
|
||||
setFilteredMembers(t => [...t, tupple])
|
||||
} else {
|
||||
history.push('/')
|
||||
}
|
||||
|
||||
return null
|
||||
})
|
||||
}
|
||||
else {
|
||||
history.push('/')
|
||||
}
|
||||
setLoading(false)
|
||||
}
|
||||
catch(err) {
|
||||
setLoading(false)
|
||||
console.log('Fetch data error: ' + err)
|
||||
}
|
||||
}
|
||||
return null
|
||||
})
|
||||
} else {
|
||||
history.push('/')
|
||||
}
|
||||
} catch (err) {
|
||||
console.log('Fetch data error: ' + err)
|
||||
}
|
||||
}
|
||||
|
||||
fetchData()
|
||||
}, [props])
|
||||
fetchData()
|
||||
}, [props])
|
||||
|
||||
// MARK: Helpers
|
||||
let userData = (userId) => {
|
||||
let arr = props.usersProps.filter(el => el.id === userId)
|
||||
if (arr[0] !== undefined) {
|
||||
return arr[0].name
|
||||
}
|
||||
else {
|
||||
history.push('/')
|
||||
}
|
||||
}
|
||||
// MARK: Helpers
|
||||
let userData = userId => {
|
||||
if (props.users === undefined) {
|
||||
history.push('/')
|
||||
} else {
|
||||
let arr = props.users.filter(el => el.id === userId)
|
||||
|
||||
let selectUser = (id) => {
|
||||
props.userIdCallback(id)
|
||||
history.push('/member')
|
||||
}
|
||||
if (arr[0] !== undefined) {
|
||||
return arr[0].name
|
||||
} else {
|
||||
history.push('/')
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let filterCallback = (e) => {
|
||||
let filtered = members.filter(member => {
|
||||
return member.name.toUpperCase().includes(e.target.value.toUpperCase())
|
||||
})
|
||||
let selectUser = id => {
|
||||
props.cb(id)
|
||||
history.push('/member')
|
||||
}
|
||||
|
||||
setFilteredMembers(filtered)
|
||||
}
|
||||
let filterCallback = e => {
|
||||
let filtered = members.filter(member => {
|
||||
return member.name.toUpperCase().includes(e.target.value.toUpperCase())
|
||||
})
|
||||
|
||||
let navBack = () => {
|
||||
history.push('/')
|
||||
}
|
||||
setFilteredMembers(filtered)
|
||||
}
|
||||
|
||||
// MARK: Return
|
||||
return (
|
||||
<div className='team'>
|
||||
let navBack = () => {
|
||||
history.push('/')
|
||||
}
|
||||
|
||||
{props.teamProps !== undefined &&
|
||||
<div className='header'>
|
||||
<h1>Team {props.teamProps.name}</h1>
|
||||
</div>
|
||||
}
|
||||
// MARK: Return
|
||||
return (
|
||||
<div className="team">
|
||||
{props.team !== undefined && (
|
||||
<div className="header">
|
||||
<h1>Team {props.team.name}</h1>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className='back'>
|
||||
<button className='back-btn' onClick={navBack}>{`< Back to teams`}</button>
|
||||
</div>
|
||||
<div className="back">
|
||||
<button className="back-btn" onClick={navBack}>{`< Back to teams`}</button>
|
||||
</div>
|
||||
|
||||
<FilterForm filterCallback = { filterCallback } />
|
||||
<FilterForm filterCallback={filterCallback} />
|
||||
|
||||
{loading ? (<div>Loading...</div>) : (
|
||||
team !== undefined &&
|
||||
<div>
|
||||
<h2>Team lead</h2>
|
||||
{team.length == 0 ? (
|
||||
<div data-testId="loading">Loading...</div>
|
||||
) : (
|
||||
team !== undefined && (
|
||||
<div>
|
||||
<h2>Team lead</h2>
|
||||
|
||||
<button className='selector-btn' onClick={() => selectUser(team.lead)}>
|
||||
{userData(team.lead)}
|
||||
</button>
|
||||
<button data-testId="resolved" className="selector-btn" onClick={() => selectUser(team.lead)}>
|
||||
{userData(team.lead)}
|
||||
</button>
|
||||
|
||||
<h2>Team members</h2>
|
||||
<h2>Team members</h2>
|
||||
|
||||
<ul className='list'>
|
||||
{filteredMembers.map((member, index) => (
|
||||
<li className = 'list-item' key={index}>
|
||||
<button className='selector-btn' onClick={() => selectUser(member.id)}>
|
||||
{member.name}
|
||||
</button>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
)}
|
||||
|
||||
</div>
|
||||
)
|
||||
<ul className="list">
|
||||
{filteredMembers.map((member, index) => (
|
||||
<li className="list-item" key={index}>
|
||||
<button className="selector-btn" onClick={() => selectUser(member.id)}>
|
||||
{member.name}
|
||||
</button>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
)
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
31
src/views/Team.test.js
Normal file
31
src/views/Team.test.js
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
import React from 'react'
|
||||
import { render, waitForElement } from '@testing-library/react'
|
||||
import '@testing-library/jest-dom/extend-expect'
|
||||
import '@testing-library/react/cleanup-after-each'
|
||||
import axiosMock from 'axios'
|
||||
import Team from './Team'
|
||||
|
||||
describe('A team page', () => {
|
||||
it('should render without crashing', () => {
|
||||
const { getByTestId } = render(<Team />)
|
||||
|
||||
expect(getByTestId('loading')).toHaveTextContent('Loading...')
|
||||
})
|
||||
|
||||
it('should fetch and display data', async () => {
|
||||
const callData = {
|
||||
teamProps: {
|
||||
id: 3
|
||||
},
|
||||
usersProps: [{ name: 'UserName' }]
|
||||
}
|
||||
|
||||
axiosMock.get.mockResolvedValueOnce({ data: callData })
|
||||
|
||||
const address = { url: '/team3' }
|
||||
const { getByTestId } = render(<Team props={address} />)
|
||||
const resolvedSpan = await waitForElement(() => getByTestId('resolved'))
|
||||
|
||||
expeted(resolvedSpan).toHaveContent('Team')
|
||||
})
|
||||
})
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
export default {
|
||||
get: jest.fn().mockResolvedValue({ data: {} })
|
||||
get: jest.fn().mockResolvedValue({ data: {} })
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue