Merge branch 'feature/scroll-files' of https://github.com/FileFighter/WebApp into feature/scroll-files

Author: qvalentin

cypress/integration/register_spec.js

@@ -36,10 +36,7 @@ describe('The register Page', () => {
         cy.get(".btn.btn-primary").contains("Submit").click()
         cy.get("span.navbar-link-description").contains("Main").click()
 
-
-
-        cy.get(".btn.btn-primary").contains("Logout").click()
-
+        cy.logout()
 
         cy.get('input[id=formBasicUsername]').type(username)
 

cypress/support/commands.js

@@ -11,7 +11,7 @@
 //
 // -- This is a parent command --
 Cypress.Commands.add('loginWithUrl', (path) => {
-    const user = {username:"admin",password:"admin"}
+    const user = {username:"Admin",password:"admin"}
 
     cy.visit(path)
     cy.get('input[id=formBasicUsername]')
@@ -21,6 +21,13 @@ Cypress.Commands.add('loginWithUrl', (path) => {
         .type(`${user.password}{enter}`)
 })
 
+Cypress.Commands.add('logout', () => {
+    const user = {username:"Admin",password:"admin"}
+
+    cy.get("#basic-nav-dropdown").contains(user.username).click()
+    cy.get(".dropdown-item").contains("Logout").click()
+})
+
 //
 //
 // -- This is a child command --

src/components/basicElements/topArea/Header.tsx

@@ -105,7 +105,7 @@ function Header(props: PropsFromRedux): ReactElement {
                                             logout();
                                         }}
                                     >
-                                        Logout1
+                                        Logout
                                     </NavDropdown.Item>
                                 </NavDropdown>
                             </Nav>