diff --git a/src/layouts/Header/components/GuestHeader/GuestHeader.test.tsx b/src/layouts/Header/components/GuestHeader/GuestHeader.test.tsx index d83cc285f2..fa95d63788 100644 --- a/src/layouts/Header/components/GuestHeader/GuestHeader.test.tsx +++ b/src/layouts/Header/components/GuestHeader/GuestHeader.test.tsx @@ -147,7 +147,7 @@ describe('GuestHeader', () => { render(, { wrapper }) const queryString = qs.stringify({ to: '/gh' }) - const login = screen.queryByText('Login') + const login = screen.queryByText('Log in') expect(login).toBeInTheDocument() expect(login).toHaveAttribute('href', `/?${queryString}`) }) diff --git a/src/layouts/Header/components/GuestHeader/GuestHeader.tsx b/src/layouts/Header/components/GuestHeader/GuestHeader.tsx index 559356606f..5bb20f48db 100644 --- a/src/layouts/Header/components/GuestHeader/GuestHeader.tsx +++ b/src/layouts/Header/components/GuestHeader/GuestHeader.tsx @@ -81,7 +81,7 @@ function GuestHeader() { data-testid="login-link" hook="guest-header-login-link" > - Login + Log in ) : (
- Login + Log in {/* if the user is logged in, we don't want to show the login button */} {statusCode === 404 && !user ? ( @@ -186,7 +186,7 @@ function ResetHandler({ logoutUser = false, reset, statusCode }) { variant="primary" to={{ pageName: 'login', options: { to: location.pathname } }} > - Login + Log in ) : null}
diff --git a/src/layouts/shared/NetworkErrorBoundary/NetworkErrorBoundary.test.jsx b/src/layouts/shared/NetworkErrorBoundary/NetworkErrorBoundary.test.jsx index 9416dca311..409edde51a 100644 --- a/src/layouts/shared/NetworkErrorBoundary/NetworkErrorBoundary.test.jsx +++ b/src/layouts/shared/NetworkErrorBoundary/NetworkErrorBoundary.test.jsx @@ -396,7 +396,7 @@ describe('NetworkErrorBoundary', () => { await user.type(textBox, 'fail') const queryString = qs.stringify({ to: '/gh/codecov' }) - const loginButton = await screen.findByText(/Login/) + const loginButton = await screen.findByText(/Log in/) expect(loginButton).toBeInTheDocument() expect(loginButton).toHaveAttribute('href', `/login?${queryString}`) }) @@ -415,7 +415,7 @@ describe('NetworkErrorBoundary', () => { const notFound = await screen.findByText(/Not found/) expect(notFound).toBeInTheDocument() - const loginButton = screen.queryByText(/Login/) + const loginButton = screen.queryByText(/Log in/) expect(loginButton).not.toBeInTheDocument() }) }) @@ -459,7 +459,7 @@ describe('NetworkErrorBoundary', () => { await user.type(textBox, 'fail') const queryString = qs.stringify({ to: '/gh/codecov' }) - const loginButton = await screen.findByText(/Login/) + const loginButton = await screen.findByText(/Log in/) expect(loginButton).toBeInTheDocument() expect(loginButton).toHaveAttribute('href', `/?${queryString}`) }) @@ -478,7 +478,7 @@ describe('NetworkErrorBoundary', () => { const notFound = await screen.findByText(/Not found/) expect(notFound).toBeInTheDocument() - const loginButton = screen.queryByText(/Login/) + const loginButton = screen.queryByText(/Log in/) expect(loginButton).not.toBeInTheDocument() }) }) @@ -517,7 +517,7 @@ describe('NetworkErrorBoundary', () => { const textBox = await screen.findByRole('textbox') await user.type(textBox, 'fail') - const button = await screen.findByText('Return to login') + const button = await screen.findByText('Return to log in') expect(button).toBeInTheDocument() await user.click(button) diff --git a/src/pages/EnterpriseLandingPage/ProviderCard/ProviderCard.test.tsx b/src/pages/EnterpriseLandingPage/ProviderCard/ProviderCard.test.tsx index af3ec3bcdd..42d7adbe1f 100644 --- a/src/pages/EnterpriseLandingPage/ProviderCard/ProviderCard.test.tsx +++ b/src/pages/EnterpriseLandingPage/ProviderCard/ProviderCard.test.tsx @@ -101,7 +101,7 @@ describe('ProviderCard', () => { }) const element = screen.getByRole('link', { - name: `Login via ${name}`, + name: `Log in via ${name}`, }) expect(element).toBeInTheDocument() expect(element).toHaveAttribute('href', `secret-api-url${to}`) @@ -158,7 +158,7 @@ describe('ProviderCard', () => { ) const element = screen.getByRole('link', { - name: `Login via ${name}`, + name: `Log in via ${name}`, }) expect(element).toBeInTheDocument() expect(element).toHaveAttribute( diff --git a/src/pages/EnterpriseLandingPage/ProviderCard/ProviderCard.tsx b/src/pages/EnterpriseLandingPage/ProviderCard/ProviderCard.tsx index 0013f31944..e4aa6db58f 100644 --- a/src/pages/EnterpriseLandingPage/ProviderCard/ProviderCard.tsx +++ b/src/pages/EnterpriseLandingPage/ProviderCard/ProviderCard.tsx @@ -44,7 +44,7 @@ const ExternalProviderButton: React.FC = ({ options: { provider: provider?.externalKey, to }, }} > - Login via {provider.name} + Log in via {provider.name} ) } @@ -77,7 +77,7 @@ const InternalProviderButton: React.FC = ({ options: { provider: provider.selfHostedKey, to }, }} > - Login via {provider.selfHostedName} + Log in via {provider.selfHostedName} ) } diff --git a/src/pages/LoginPage/LoginButton.jsx b/src/pages/LoginPage/LoginButton.jsx index 5f4224c225..e2140c4a1a 100644 --- a/src/pages/LoginPage/LoginButton.jsx +++ b/src/pages/LoginPage/LoginButton.jsx @@ -43,7 +43,7 @@ function LoginButton({ provider }) { className="mx-4 w-6" src={providerImage} /> - Login with {providerName} + Log in with {providerName} ) } diff --git a/src/pages/LoginPage/LoginButton.test.jsx b/src/pages/LoginPage/LoginButton.test.jsx index 525d3e9e76..9669281e6a 100644 --- a/src/pages/LoginPage/LoginButton.test.jsx +++ b/src/pages/LoginPage/LoginButton.test.jsx @@ -51,7 +51,7 @@ describe('LoginButton', () => { }), }) - const bitbucket = screen.getByText(/Login with Bitbucket/i) + const bitbucket = screen.getByText(/Log in with Bitbucket/i) expect(bitbucket).toBeInTheDocument() }) }) @@ -65,7 +65,7 @@ describe('LoginButton', () => { }), }) - const github = screen.getByText(/Login with GitHub/i) + const github = screen.getByText(/Log in with GitHub/i) expect(github).toBeInTheDocument() }) }) @@ -79,7 +79,7 @@ describe('LoginButton', () => { }), }) - const gitlab = screen.getByText(/Login with GitLab/i) + const gitlab = screen.getByText(/Log in with GitLab/i) expect(gitlab).toBeInTheDocument() }) }) @@ -93,7 +93,7 @@ describe('LoginButton', () => { }), }) - const sentry = screen.getByText(/Login with Sentry/i) + const sentry = screen.getByText(/Log in with Sentry/i) expect(sentry).toBeInTheDocument() }) }) @@ -106,7 +106,7 @@ describe('LoginButton', () => { }), }) - const github = screen.getByText(/Login with GitHub/i) + const github = screen.getByText(/Log in with GitHub/i) expect(github).toBeInTheDocument() act(() => github.click()) @@ -134,7 +134,7 @@ describe('LoginButton', () => { to: `http://secret-api-url/gh?${redirectQueryString}`, }) - const github = screen.getByText(/Login with GitHub/i) + const github = screen.getByText(/Log in with GitHub/i) expect(github).toHaveAttribute( 'href', `secret-api-url/login/gh?${toQueryString}` diff --git a/src/pages/LoginPage/LoginPage.jsx b/src/pages/LoginPage/LoginPage.jsx index 5ce7c60903..6a1810737e 100644 --- a/src/pages/LoginPage/LoginPage.jsx +++ b/src/pages/LoginPage/LoginPage.jsx @@ -17,7 +17,7 @@ function LoginPage() { return (
-

Login to Codecov

+

Log in to Codecov

You'll be taken to your provider to authenticate

diff --git a/src/pages/LoginPage/LoginPage.test.jsx b/src/pages/LoginPage/LoginPage.test.jsx index bceec0b43d..f03712926d 100644 --- a/src/pages/LoginPage/LoginPage.test.jsx +++ b/src/pages/LoginPage/LoginPage.test.jsx @@ -57,7 +57,7 @@ describe('LoginPage', () => { render(, { wrapper: wrapper('/login') }) const githubLink = screen.getByRole('link', { - name: /login with github/i, + name: /Log in with github/i, }) expect(githubLink).toBeInTheDocument() }) @@ -66,7 +66,7 @@ describe('LoginPage', () => { render(, { wrapper: wrapper('/login') }) const sentryLink = screen.getByRole('link', { - name: /login with sentry/i, + name: /Log in with sentry/i, }) expect(sentryLink).toBeInTheDocument() }) @@ -75,7 +75,7 @@ describe('LoginPage', () => { render(, { wrapper: wrapper('/login') }) const gitlabLink = screen.getByRole('link', { - name: /login with gitlab/i, + name: /Log in with gitlab/i, }) expect(gitlabLink).toBeInTheDocument() }) @@ -84,7 +84,7 @@ describe('LoginPage', () => { render(, { wrapper: wrapper('/login') }) const bitBucketLink = screen.getByRole('link', { - name: /login with bitbucket/i, + name: /Log in with bitbucket/i, }) expect(bitBucketLink).toBeInTheDocument() }) @@ -97,7 +97,7 @@ describe('LoginPage', () => { render(, { wrapper: wrapper('/login/gh') }) const githubLink = screen.getByRole('link', { - name: /login with github/i, + name: /Log in with github/i, }) expect(githubLink).toBeInTheDocument() }) diff --git a/src/services/navigation/useNavLinks.ts b/src/services/navigation/useNavLinks.ts index 754a55f9c6..8e917a1a96 100644 --- a/src/services/navigation/useNavLinks.ts +++ b/src/services/navigation/useNavLinks.ts @@ -54,7 +54,7 @@ export function useNavLinks() { isExternalLink: true, }, login: { - text: 'Login', + text: 'Log in', path: ({ to }: { to?: string } = {}) => { const query = qs.stringify({ to }, { addQueryPrefix: true })