Display username in navbar

betagouv · Nov 18, 2016 · 1473cbc · 1473cbc
1 parent e819fa9
commit 1473cbc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/client/src/components/header/Header.js b/client/src/components/header/Header.js
@@ -24,10 +24,8 @@ export class Header extends React.Component {
             <Navbar.Toggle />
           </Navbar.Header>
           <Navbar.Collapse>
-            <Nav>
-              <LinkContainer to="/application">
-                <NavItem eventKey={1}>Candidature</NavItem>
-              </LinkContainer>
+            <Nav pullRight>
+              <NavItem id="navbar-user">{this.props.user.username}</NavItem>
             </Nav>
           </Navbar.Collapse>
         </Navbar >

diff --git a/client/src/components/header/Header.test.js b/client/src/components/header/Header.test.js
@@ -18,9 +18,17 @@ describe('<Header>', () => {
     const navbar = wrapper.find('.navbar')
     expect(navbar.length).toBe(0)
   })
-  it('shows when user is logged in', () => {
-    const wrapper = setup({ isAuthenticated: true })
+  describe('When user is logged in', () => {
+    const authenticatedUser = { isAuthenticated: true, username: "authenticated user" }
+    const wrapper = setup(authenticatedUser)
     const navbar = wrapper.find('.navbar')
-    expect(navbar.length).toBe(1)
+    it('should display Header', () => {
+      expect(navbar.length).toBe(1)
+    })
+    it('should display username', () => {
+      const usernameDisplay = navbar.find('#navbar-user')
+      expect(usernameDisplay.length).toBe(1)
+      expect(usernameDisplay.text()).toBe(authenticatedUser.username)
+    })
   })
 })