Team tests (ongoing)

.eslintrc

@@ -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'
+  ]
 }

src/components/Router.jsx

@@ -6,50 +6,70 @@ import Team from '../views/Team'
 import Member from '../views/Member'
 import config from '../config.json'
 
-history.listen(location => {
+history.listen(() => {
   window.scrollTo(0, 0)
 })
 
-export default function Router(props) {
+export default function Router() {
-	let [team, setTeam] = useState([])
+  // let [team, setTeam] = useState([])
   let [allTeams, setAllTeams] = useState([])
-	let [users, setUsers] = useState([])
+  // let [users, setUsers] = useState([])
   let [memberProps, setMemberProps] = useState({})
+  let [teamProps, setTeamProps] = useState({})
 
-	let teamCallback = (el) => {
+  let teamCallback = (teamId, users) => {
-		setTeam(el)
+    // Remove this:
+    // setTeam(teamId)
+
+    // Leave:
+    setTeamProps({
+      url: config.api + '/team/' + teamId,
+      team: teamId,
+      users: users,
+      cb: userIdCallback
+    })
   }
 
-	let usersCallback = (el) => {
+  let usersCallback = el => {
     setUsers(el)
   }
 
-	let userIdCallback = (el) => {
+  let userIdCallback = el => {
     setMemberProps({
       url: config.api + '/user/' + el,
       teams: allTeams
     })
   }
 
-	let allTeamsCallback = (el) => {
+  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='/' 
+          exact
-					render={(props) => <Home teamCallback={teamCallback} usersCallback={usersCallback} allTeamsCallback={allTeamsCallback} {...props} />}
+          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} />}
         />
+
+        <Route exact path="/team" render={() => <Team props={teamProps} />} />
+
+        <Route exact path="/member" render={() => <Member props={memberProps} />} />
       </Switch>
     </ReactRouter>
   )

src/views/Member.jsx

@@ -26,8 +26,7 @@ export default function Member({ props }) {
             return null
           })
         }
-			}
+      } catch (err) {
-			catch(err) {
         history.push('/')
       }
     }
@@ -42,37 +41,38 @@ export default function Member({ props }) {
 
   // MARK: Return
   return (
-		<div className='member'>
+    <div className="member">
-
+      {user === null ? (
-			{user === null ? (<div data-testid='loading'>Loading...</div>) : (
+        <div data-testid="loading">Loading...</div>
-				user !== undefined &&
+      ) : (
+        user !== undefined && (
           <div>
-					<div className='header'>
+            <div className="header">
-						<span data-testid='resolved'><h1>Member {user.name}</h1></span>
+              <span data-testid="resolved">
+                <h1>Member {user.name}</h1>
+              </span>
             </div>
 
-					<div className='back'>
+            <div className="back">
-						<button className='back-btn' onClick={navBack}>{`< Back to team`}</button>
+              <button className="back-btn" onClick={navBack}>{`< Back to team`}</button>
             </div>
 
             <h2>Username:</h2>
-					<div className='username'>
+            <div className="username">
               <p>{user.username}</p>
             </div>
 
             <h2>Member of:</h2>
-					<ul className='list'>
+            <ul className="list">
               {teamNames.map((name, index) => (
-							<li className='list-item' key={index}>
+                <li className="list-item" key={index}>
-								<div className='username'>
+                  <div className="username">{name}</div>
-									{name}
-								</div>
                 </li>
               ))}
             </ul>
           </div>
+        )
       )}
-
     </div>
   )
 }

src/views/Member.test.js

@@ -5,12 +5,13 @@ import '@testing-library/react/cleanup-after-each'
 import axiosMock from 'axios'
 import Member from './Member'
 
-it('Renders without crashing', () => {
+describe('A members page', () => {
+  it('should render without crashing', () => {
     const { getByTestId } = render(<Member />)
     expect(getByTestId('loading')).toHaveTextContent('Loading...')
   })
 
-it('Fetches and displays data', async () => {
+  it('should fetch and display data', async () => {
     const callData = {
       username: 'goodpanda',
       member_teams: [3],
@@ -29,3 +30,4 @@ it('Fetches and displays data', async () => {
     expect(axiosMock.get).toHaveBeenCalledTimes(1)
     expect(axiosMock.get).toHaveBeenCalledWith(address.url)
   })
+})

src/views/Team.jsx

@@ -2,14 +2,11 @@
 import React, { useState, useEffect } from 'react'
 import axios from 'axios'
 import history from '../history.js'
-import config from '../config.json'
 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([])
@@ -18,14 +15,13 @@ export default function Team(props) {
   // 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)
+        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)
+            let arr = props.users.filter(el => el.id === memberId)
             if (arr[0] !== undefined) {
               let tupple = {
                 name: arr[0].name,
@@ -33,21 +29,16 @@ export default function Team(props) {
               }
               setMembers(t => [...t, tupple])
               setFilteredMembers(t => [...t, tupple])
-						}
+            } else {
-						else {
               history.push('/')
             }
 
             return null
           })
-				}
+        } else {
-				else {
           history.push('/')
         }
-				setLoading(false)
+      } catch (err) {
-			}
-			catch(err) {
-				setLoading(false)
         console.log('Fetch data error: ' + err)
       }
     }
@@ -56,22 +47,26 @@ export default function Team(props) {
   }, [props])
 
   // MARK: Helpers
-	let userData = (userId) => {
+  let userData = userId => {
-		let arr = props.usersProps.filter(el => el.id === userId)
+    if (props.users === undefined) {
+      history.push('/')
+    } else {
+      let arr = props.users.filter(el => el.id === userId)
+
       if (arr[0] !== undefined) {
         return arr[0].name
-		}
+      } else {
-		else {
         history.push('/')
       }
     }
+  }
 
-	let selectUser = (id) => {
+  let selectUser = id => {
-		props.userIdCallback(id)
+    props.cb(id)
     history.push('/member')
   }
 
-	let filterCallback = (e) => {
+  let filterCallback = e => {
     let filtered = members.filter(member => {
       return member.name.toUpperCase().includes(e.target.value.toUpperCase())
     })
@@ -85,43 +80,44 @@ export default function Team(props) {
 
   // MARK: Return
   return (
-		<div className='team'>
+    <div className="team">
-
+      {props.team !== undefined && (
-			{props.teamProps !== undefined &&
+        <div className="header">
-				<div className='header'>
+          <h1>Team {props.team.name}</h1>
-					<h1>Team {props.teamProps.name}</h1>
         </div>
-			}
+      )}
 
-			<div className='back'>
+      <div className="back">
-				<button className='back-btn' onClick={navBack}>{`< Back to teams`}</button>
+        <button className="back-btn" onClick={navBack}>{`< Back to teams`}</button>
       </div>
 
       <FilterForm filterCallback={filterCallback} />
 
-			{loading ? (<div>Loading...</div>) : (
+      {team.length == 0 ? (
-				team !== undefined &&	
+        <div data-testId="loading">Loading...</div>
+      ) : (
+        team !== undefined && (
           <div>
             <h2>Team lead</h2>
 
-					<button className='selector-btn' onClick={() => selectUser(team.lead)}>
+            <button data-testId="resolved" className="selector-btn" onClick={() => selectUser(team.lead)}>
               {userData(team.lead)}
             </button>
 
             <h2>Team members</h2>
 
-					<ul className='list'>
+            <ul className="list">
               {filteredMembers.map((member, index) => (
-							<li className = 'list-item' key={index}>
+                <li className="list-item" key={index}>
-								<button className='selector-btn' onClick={() => selectUser(member.id)}>
+                  <button className="selector-btn" onClick={() => selectUser(member.id)}>
                     {member.name}
                   </button>
                 </li>
               ))}
             </ul>
           </div>
+        )
       )}
-
     </div>
   )
 }

src/views/Team.test.js

@@ -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')
+  })
+})