This repository was archived by the owner on Apr 5, 2024. It is now read-only.
File tree Expand file tree Collapse file tree 4 files changed +21
-9
lines changed Expand file tree Collapse file tree 4 files changed +21
-9
lines changed Original file line number Diff line number Diff line change @@ -14,6 +14,10 @@ describe("The Home Page", () => {
14
14
// {enter} causes the form to submit
15
15
cy . get ( "input[id=formBasicPassword]" ) . type ( `${ password } {enter}` ) ;
16
16
17
+ cy . get ( "span.navbar-link-description" )
18
+ . contains ( "Health" )
19
+ . click ( ) ;
20
+
17
21
// UI should reflect this user being logged in
18
22
cy . get ( "h1" ) . should ( "contain" , "FileFighter" ) ;
19
23
Original file line number Diff line number Diff line change @@ -11,6 +11,10 @@ describe("The register Page", () => {
11
11
} ) ;
12
12
13
13
it ( "registers a user successfully" , ( ) => {
14
+ cy . get ( "span.navbar-link-description" )
15
+ . contains ( "Health" )
16
+ . click ( ) ;
17
+
14
18
cy . get ( "#ff-heath-table > tbody > tr:nth-child(4) > td:nth-child(2)" )
15
19
. contains ( / ^ \d + / )
16
20
. then ( ( $tr ) => {
@@ -33,7 +37,7 @@ describe("The register Page", () => {
33
37
cy . get ( "#formConfirmPassword" ) . type ( password ) ;
34
38
35
39
cy . get ( ".btn.btn-primary" ) . contains ( "Submit" ) . click ( ) ;
36
- cy . get ( "span.navbar-link-description" ) . contains ( "Main " ) . click ( ) ;
40
+ cy . get ( "span.navbar-link-description" ) . contains ( "Health " ) . click ( ) ;
37
41
38
42
cy . logout ( ) ;
39
43
@@ -43,6 +47,10 @@ describe("The register Page", () => {
43
47
`${ password } {enter}`
44
48
) ;
45
49
50
+ cy . get ( "span.navbar-link-description" )
51
+ . contains ( "Health" )
52
+ . click ( ) ;
53
+
46
54
cy . get ( "h1" ) . should ( "contain" , "FileFighter" ) ;
47
55
48
56
let newUserCount = ( parseInt ( currentUserCount ) + 1 ) . toString ( ) ;
Original file line number Diff line number Diff line change @@ -10,15 +10,15 @@ import Profile from "../pages/User/Profile";
10
10
export default function Router ( ) : ReactElement {
11
11
return (
12
12
< Switch >
13
- < Route exact path = { "/" } component = { Health } />
14
13
< Route path = { "/login" } component = { Login } />
14
+ < Route exact path = { "/" } >
15
+ < Redirect to = { filesBaseUrl } />
16
+ </ Route >
15
17
< Route path = { "/start" } >
16
18
< Redirect to = { "/" } />
17
19
</ Route >
20
+ < Route path = { "/health" } component = { Health } />
18
21
< Route path = { filesBaseUrl } component = { FileSystem } />
19
- < Route path = { "/health" } >
20
- < Redirect to = { "/" } />
21
- </ Route >
22
22
< Route path = { "/registration" } component = { Registration } />
23
23
{ < Route path = { "/profile" } component = { Profile } /> }
24
24
< Route path = { "*" } component = { Error404 } />
Original file line number Diff line number Diff line change @@ -35,10 +35,10 @@ function Header(props: PropsFromRedux): ReactElement {
35
35
const history = useHistory ( ) ;
36
36
const navBarElements : navBarElement_Interface [ ] = [
37
37
{
38
- name : "main " ,
39
- text : "Main " ,
40
- link : "/" ,
41
- deviantVisibleLink : "/start " ,
38
+ name : "health " ,
39
+ text : "Health " ,
40
+ link : "/health " ,
41
+ deviantVisibleLink : "/health " ,
42
42
logo : null
43
43
} ,
44
44
{
You can’t perform that action at this time.
0 commit comments