From 574c1cf20324dab7c52f47b94f3cbc7a3941534b Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 7 Mar 2022 19:23:08 +0100 Subject: [PATCH] rename route for reset-password --- frontend/src/pages/ForgotPassword.spec.js | 2 +- frontend/src/pages/ForgotPassword.vue | 2 +- frontend/src/pages/Login.spec.js | 4 ++-- frontend/src/pages/Login.vue | 2 +- frontend/src/pages/ResetPassword.spec.js | 14 +++++++------- frontend/src/pages/ResetPassword.vue | 6 +++--- frontend/src/pages/thx.spec.js | 4 ++-- frontend/src/pages/thx.vue | 2 +- frontend/src/routes/router.test.js | 6 ++++-- frontend/src/routes/routes.js | 2 +- 10 files changed, 23 insertions(+), 21 deletions(-) diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js index b8f1be3c0..a547f9cc1 100644 --- a/frontend/src/pages/ForgotPassword.spec.js +++ b/frontend/src/pages/ForgotPassword.spec.js @@ -158,7 +158,7 @@ describe('ForgotPassword', () => { describe('comingFrom login', () => { beforeEach(() => { - wrapper = Wrapper(createMockObject('reset')) + wrapper = Wrapper(createMockObject('resetPassword')) }) it('has another subtitle', () => { diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue index 7d389ff59..eeb954a0c 100644 --- a/frontend/src/pages/ForgotPassword.vue +++ b/frontend/src/pages/ForgotPassword.vue @@ -42,7 +42,7 @@ import { sendResetPasswordEmail } from '@/graphql/queries' import InputEmail from '@/components/Inputs/InputEmail' const textFields = { - reset: { + resetPassword: { headline: 'settings.password.reset', subtitle: 'settings.password.resend_subtitle', button: 'settings.password.send_now', diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js index ce32e1971..b0217104f 100644 --- a/frontend/src/pages/Login.spec.js +++ b/frontend/src/pages/Login.spec.js @@ -281,8 +281,8 @@ describe('Login', () => { await flushPromises() }) - it('redirects to /reset/login', () => { - expect(mockRouterPush).toBeCalledWith('/reset/login') + it('redirects to /reset-password/login', () => { + expect(mockRouterPush).toBeCalledWith('/reset-password/login') }) }) }) diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue index 75b9ae1e3..8a6d571af 100755 --- a/frontend/src/pages/Login.vue +++ b/frontend/src/pages/Login.vue @@ -109,7 +109,7 @@ export default { if (error.message.includes('User email not validated')) { this.$router.push('/thx/login') } else if (error.message.includes('User has no password set yet')) { - this.$router.push('/reset/login') + this.$router.push('/reset-password/login') } loader.hide() }) diff --git a/frontend/src/pages/ResetPassword.spec.js b/frontend/src/pages/ResetPassword.spec.js index 0e798c193..2230d13c8 100644 --- a/frontend/src/pages/ResetPassword.spec.js +++ b/frontend/src/pages/ResetPassword.spec.js @@ -78,7 +78,7 @@ describe('ResetPassword', () => { describe('Register header', () => { describe('from reset', () => { beforeEach(() => { - mocks.$route.path.mock = 'reset' + mocks.$route.path.mock = 'reset-password' wrapper = Wrapper() }) @@ -156,8 +156,8 @@ describe('ResetPassword', () => { expect(toastErrorSpy).toHaveBeenCalledWith('...Code is older than 10 minutes') }) - it('router pushes to /forgot-password/reset', () => { - expect(routerPushMock).toHaveBeenCalledWith('/forgot-password/reset') + it('router pushes to /forgot-password/resetPassword', () => { + expect(routerPushMock).toHaveBeenCalledWith('/forgot-password/resetPassword') }) }) @@ -204,9 +204,9 @@ describe('ResetPassword', () => { }) }) - describe('server response with success on /reset', () => { + describe('server response with success on /reset-password', () => { beforeEach(async () => { - mocks.$route.path.mock = 'reset' + mocks.$route.path.mock = 'reset-password' wrapper = Wrapper() apolloMutationMock.mockResolvedValue({ data: { @@ -219,8 +219,8 @@ describe('ResetPassword', () => { await flushPromises() }) - it('redirects to "/thx/reset"', () => { - expect(routerPushMock).toHaveBeenCalledWith('/thx/reset') + it('redirects to "/thx/resetPassword"', () => { + expect(routerPushMock).toHaveBeenCalledWith('/thx/resetPassword') }) }) }) diff --git a/frontend/src/pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue index 970cf1cba..830107a99 100644 --- a/frontend/src/pages/ResetPassword.vue +++ b/frontend/src/pages/ResetPassword.vue @@ -95,20 +95,20 @@ export default { if (this.$route.path.includes('checkEmail')) { this.$router.push('/thx/checkEmail') } else { - this.$router.push('/thx/reset') + this.$router.push('/thx/resetPassword') } }) .catch((error) => { this.toastError(error.message) if (error.message.includes('Code is older than 10 minutes')) - this.$router.push('/forgot-password/reset') + this.$router.push('/forgot-password/resetPassword') }) }, setDisplaySetup() { if (this.$route.path.includes('checkEmail')) { this.displaySetup = textFields.checkEmail } - if (this.$route.path.includes('reset')) { + if (this.$route.path.includes('reset-password')) { this.displaySetup = textFields.reset } }, diff --git a/frontend/src/pages/thx.spec.js b/frontend/src/pages/thx.spec.js index bcba121bd..ab1a3815b 100644 --- a/frontend/src/pages/thx.spec.js +++ b/frontend/src/pages/thx.spec.js @@ -53,9 +53,9 @@ describe('Thx', () => { }) }) - describe('coming from /reset', () => { + describe('coming from /reset-password', () => { beforeEach(() => { - wrapper = Wrapper(createMockObject('reset')) + wrapper = Wrapper(createMockObject('resetPassword')) }) it('renders the thanks text', () => { diff --git a/frontend/src/pages/thx.vue b/frontend/src/pages/thx.vue index 1308ca0fc..fc721b63e 100644 --- a/frontend/src/pages/thx.vue +++ b/frontend/src/pages/thx.vue @@ -24,7 +24,7 @@ const textFields = { button: 'login', linkTo: '/login', }, - reset: { + resetPassword: { headline: 'site.thx.title', subtitle: 'site.thx.reset', button: 'login', diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js index 7ad08ed74..bea723c2f 100644 --- a/frontend/src/routes/router.test.js +++ b/frontend/src/routes/router.test.js @@ -166,9 +166,11 @@ describe('router', () => { }) }) - describe('reset', () => { + describe('reset password', () => { it('loads the "ResetPassword" component', async () => { - const component = await routes.find((r) => r.path === '/reset/:optin').component() + const component = await routes + .find((r) => r.path === '/reset-password/:optin') + .component() expect(component.default.name).toBe('ResetPassword') }) }) diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js index 5e7046d9b..3c138cfc9 100755 --- a/frontend/src/routes/routes.js +++ b/frontend/src/routes/routes.js @@ -75,7 +75,7 @@ const routes = [ component: () => import('@/pages/SelectCommunity.vue'), }, { - path: '/reset/:optin', + path: '/reset-password/:optin', component: () => import('@/pages/ResetPassword.vue'), }, {