[PRMP-295] - replace log out text in nav bar with sign out (#414)

* [PRMP-295] - replace log out text in nav bar with sign out * [PRMP-295] replace all logging in and logging out with signing in and signing out
nhsconnect · Aug 23, 2024 · adb9dde · adb9dde
1 parent e23c2e8
commit adb9dde
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/app/src/components/layout/navLinks/NavLinks.test.tsx b/app/src/components/layout/navLinks/NavLinks.test.tsx
@@ -33,7 +33,7 @@ describe('NavLinks', () => {
             const isLoggedIn = true;
             renderNav(isLoggedIn);
 
-            expect(screen.getByRole('link', { name: 'Log out' })).toBeInTheDocument();
+            expect(screen.getByRole('link', { name: 'Sign out' })).toBeInTheDocument();
         });
 
         it('renders a navlink for app searcg when user logged in', () => {
@@ -63,7 +63,7 @@ describe('NavLinks', () => {
             const isLoggedIn = false;
             renderNav(isLoggedIn);
 
-            expect(screen.queryByRole('link', { name: 'Log out' })).not.toBeInTheDocument();
+            expect(screen.queryByRole('link', { name: 'Sign out' })).not.toBeInTheDocument();
         });
     });
 
@@ -104,7 +104,7 @@ describe('NavLinks', () => {
             const isLoggedIn = true;
             renderNav(isLoggedIn);
 
-            const logoutLink = screen.getByRole('link', { name: 'Log out' });
+            const logoutLink = screen.getByRole('link', { name: 'Sign out' });
             expect(logoutLink).toBeInTheDocument();
 
             act(() => {

diff --git a/app/src/components/layout/navLinks/NavLinks.tsx b/app/src/components/layout/navLinks/NavLinks.tsx
@@ -24,7 +24,7 @@ const NavLinks = () => {
 
     const appLinks = [
         { href: routes.SEARCH_PATIENT, label: 'Search for a patient', id: 'search-btn' },
-        { href: routes.LOGOUT, label: 'Log out', id: 'logout-btn' },
+        { href: routes.LOGOUT, label: 'Sign out', id: 'logout-btn' },
     ];
 
     return session.isLoggedIn ? (

diff --git a/app/src/pages/authCallbackPage/AuthCallbackPage.test.tsx b/app/src/pages/authCallbackPage/AuthCallbackPage.test.tsx
@@ -54,7 +54,7 @@ describe('AuthCallbackPage', () => {
                 renderCallbackPage();
             });
             expect(screen.getByRole('status')).toBeInTheDocument();
-            expect(screen.getByText('Logging in...')).toBeInTheDocument();
+            expect(screen.getByText('Signing in...')).toBeInTheDocument();
 
             await waitFor(() => {
                 expect(mockedUseNavigate).toHaveBeenCalledWith(routes.HOME);
@@ -68,7 +68,7 @@ describe('AuthCallbackPage', () => {
             renderCallbackPage();
 
             expect(screen.getByRole('status')).toBeInTheDocument();
-            expect(screen.getByText('Logging in...')).toBeInTheDocument();
+            expect(screen.getByText('Signing in...')).toBeInTheDocument();
 
             await waitFor(() => {
                 expect(mockedUseNavigate).toHaveBeenCalledWith(routes.HOME);
@@ -87,7 +87,7 @@ describe('AuthCallbackPage', () => {
             renderCallbackPage();
 
             expect(screen.getByRole('status')).toBeInTheDocument();
-            expect(screen.getByText('Logging in...')).toBeInTheDocument();
+            expect(screen.getByText('Signing in...')).toBeInTheDocument();
 
             await waitFor(() => {
                 expect(mockedUseNavigate).toHaveBeenCalledWith(routes.AUTH_ERROR);
@@ -105,7 +105,7 @@ describe('AuthCallbackPage', () => {
             renderCallbackPage();
 
             expect(screen.getByRole('status')).toBeInTheDocument();
-            expect(screen.getByText('Logging in...')).toBeInTheDocument();
+            expect(screen.getByText('Signing in...')).toBeInTheDocument();
 
             await waitFor(() => {
                 expect(mockedUseNavigate).toHaveBeenCalledWith(routes.UNAUTHORISED_LOGIN);

diff --git a/app/src/pages/authCallbackPage/AuthCallbackPage.tsx b/app/src/pages/authCallbackPage/AuthCallbackPage.tsx
@@ -92,7 +92,7 @@ const AuthCallbackPage = (props: Props) => {
         void handleCallback({ baseUrl, code, state });
     }, [baseUrl, setSession, navigate, mockLocal, setConfig]);
 
-    return <Spinner status="Logging in..." />;
+    return <Spinner status="Signing in..." />;
 };
 
 export default AuthCallbackPage;
diff --git a/app/src/pages/authErrorPage/AuthErrorPage.tsx b/app/src/pages/authErrorPage/AuthErrorPage.tsx
@@ -32,7 +32,7 @@ const AuthErrorPage = () => {
             </Link>
         </>
     ) : (
-        <Spinner status="Logging in..." />
+        <Spinner status="Signing in..." />
     );
 };
 export default AuthErrorPage;
diff --git a/app/src/pages/logoutPage/LogoutPage.test.tsx b/app/src/pages/logoutPage/LogoutPage.test.tsx
@@ -23,7 +23,7 @@ describe('logoutPage', () => {
 
     it('returns a loading state until logout redirect', () => {
         renderLogoutPage();
-        const status = 'Logging out...';
+        const status = 'Signing out...';
         expect(screen.getByText(status)).toBeInTheDocument();
     });
 

diff --git a/app/src/pages/logoutPage/LogoutPage.tsx b/app/src/pages/logoutPage/LogoutPage.tsx
@@ -43,7 +43,7 @@ const LogoutPage = () => {
         handleCallback(args);
     }, [baseUrl, setSession, navigate, baseHeaders]);
 
-    return <Spinner status="Logging out..." />;
+    return <Spinner status="Signing out..." />;
 };
 
 export default LogoutPage;
diff --git a/app/src/pages/sessionExpiredErrorPage/SessionExpiredErrorPage.tsx b/app/src/pages/sessionExpiredErrorPage/SessionExpiredErrorPage.tsx
@@ -28,7 +28,7 @@ const SessionExpiredErrorPage = () => {
             </ButtonLink>
         </>
     ) : (
-        <Spinner status="Logging in..." />
+        <Spinner status="Signing in..." />
     );
 };
 export default SessionExpiredErrorPage;
diff --git a/app/src/pages/startPage/StartPage.tsx b/app/src/pages/startPage/StartPage.tsx
@@ -67,7 +67,7 @@ function StartPage(props: Props) {
                 process.env.REACT_APP_ENVIRONMENT === 'test') && <TestPanel />}
         </>
     ) : (
-        <Spinner status="Logging in..." />
+        <Spinner status="Signing in..." />
     );
 }
 

diff --git a/app/src/pages/unauthorisedPage/UnauthorisedPage.tsx b/app/src/pages/unauthorisedPage/UnauthorisedPage.tsx
@@ -23,7 +23,7 @@ const UnauthorisedPage = () => {
             <p>
                 The page you were looking for could not be accessed. If you have the permissions,{' '}
                 <Link to="" onClick={handleLogin}>
-                    logging in
+                    signing in
                 </Link>{' '}
                 may fix this.
             </p>
@@ -38,7 +38,7 @@ const UnauthorisedPage = () => {
             </Link>
         </>
     ) : (
-        <Spinner status="Logging in..." />
+        <Spinner status="Signing in..." />
     );
 };
 export default UnauthorisedPage;
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,7 +67,7 @@ function StartPage(props: Props) { @@
                     process.env.REACT_APP_ENVIRONMENT === 'test') && <TestPanel />}
             </>
         ) : (
-            <Spinner status="Logging in..." />
+            <Spinner status="Signing in..." />
         );
     }
@@ Expand Down @@