From 28f85cce87cce24fa07ce3568c3bfb2811e5ca37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Fri, 29 Apr 2022 11:41:32 +0200 Subject: [PATCH 01/17] Refactor ResetPassword to remove thx page, a start --- frontend/src/pages/ResetPassword.vue | 120 ++++++++++++++++----------- 1 file changed, 72 insertions(+), 48 deletions(-) diff --git a/frontend/src/pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue index a737246bc..fef56a112 100644 --- a/frontend/src/pages/ResetPassword.vue +++ b/frontend/src/pages/ResetPassword.vue @@ -1,55 +1,66 @@ From 44d695d0a587356e78531e153c7f07a75fd6ad91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 30 May 2022 12:44:45 +0200 Subject: [PATCH 10/17] Refactor test for ResetPassword.vue --- frontend/src/pages/Login.spec.js | 1 + frontend/src/pages/ResetPassword.spec.js | 84 +++++++++++++++++------- 2 files changed, 62 insertions(+), 23 deletions(-) diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js index 30fee4656..7b0b030b8 100644 --- a/frontend/src/pages/Login.spec.js +++ b/frontend/src/pages/Login.spec.js @@ -207,6 +207,7 @@ describe('Login', () => { expect(wrapper.find('.test-message-button').attributes('href')).toBe('/forgot-password') }) + // Wolle it.skip('click redirects to "/forgot-password"', async () => { // wrapper.find('.test-message-button').trigger('click') // await flushPromises() diff --git a/frontend/src/pages/ResetPassword.spec.js b/frontend/src/pages/ResetPassword.spec.js index ec3eba61b..1518fb71b 100644 --- a/frontend/src/pages/ResetPassword.spec.js +++ b/frontend/src/pages/ResetPassword.spec.js @@ -118,6 +118,21 @@ describe('ResetPassword', () => { await flushPromises() }) + it('shows error title, subtitle, login button', () => { + expect(wrapper.vm.showPageMessage).toBe(true) + expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle') + expect(wrapper.find('.test-message-subtitle').text()).toBe( + '...email was sent more than 23 hours and 10 minutes ago', + ) + expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset') + }) + + it('button link directs to "/forgot-password/resetPassword"', () => { + expect(wrapper.find('.test-message-button').attributes('href')).toBe( + '/forgot-password/resetPassword', + ) + }) + it('toasts an error message', () => { expect(toastErrorSpy).toHaveBeenCalledWith( '...email was sent more than 23 hours and 10 minutes ago', @@ -126,6 +141,9 @@ describe('ResetPassword', () => { // Wolle it.skip('click redirects to "/forgot-password/resetPassword"', () => { + // wrapper.find('.test-message-button').trigger('click') + // await flushPromises() + // await wrapper.vm.$nextTick() // expect(routerPushMock).toHaveBeenCalledWith('/forgot-password/resetPassword') }) }) @@ -138,9 +156,27 @@ describe('ResetPassword', () => { await flushPromises() }) + it('shows error title, subtitle, login button', () => { + expect(wrapper.vm.showPageMessage).toBe(true) + expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle') + expect(wrapper.find('.test-message-subtitle').text()).toBe('Error') + expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset') + }) + + it('button link directs to "/forgot-password/resetPassword"', () => { + expect(wrapper.find('.test-message-button').attributes('href')).toBe( + '/forgot-password/resetPassword', + ) + }) + it('toasts an error message', () => { expect(toastErrorSpy).toHaveBeenCalledWith('Error') }) + + // Wolle + it.only('click redirects to "/forgot-password/resetPassword"', () => { + // expect(routerPushMock).toHaveBeenCalledWith('/forgot-password/resetPassword') + }) }) describe('server response with success on /checkEmail', () => { @@ -169,30 +205,20 @@ describe('ResetPassword', () => { ) }) - it('redirects to "/thx/checkEmail"', () => { - expect(routerPushMock).toHaveBeenCalledWith('/thx/checkEmail') + it('shows message title, subtitle, login button', () => { + expect(wrapper.vm.showPageMessage).toBe(true) + expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title') + expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.checkEmail') + expect(wrapper.find('.test-message-button').text()).toBe('login') }) - describe('with param code', () => { - beforeEach(async () => { - mocks.$route.params.code = 'the-most-secret-code-ever' - apolloMutationMock.mockResolvedValue({ - data: { - resetPassword: 'success', - }, - }) - wrapper = Wrapper() - await wrapper.findAll('input').at(0).setValue('Aa123456_') - await wrapper.findAll('input').at(1).setValue('Aa123456_') - await wrapper.find('form').trigger('submit') - await flushPromises() - }) + it('button link directs to "/login"', () => { + expect(wrapper.find('.test-message-button').attributes('href')).toBe('/login') + }) - it('redirects to "/thx/checkEmail/the-most-secret-code-ever"', () => { - expect(routerPushMock).toHaveBeenCalledWith( - '/thx/checkEmail/the-most-secret-code-ever', - ) - }) + // Wolle + it.skip('click redirects to "/login"', () => { + // expect(routerPushMock).toHaveBeenCalledWith('/login') }) }) @@ -211,8 +237,20 @@ describe('ResetPassword', () => { await flushPromises() }) - it('redirects to "/thx/resetPassword"', () => { - expect(routerPushMock).toHaveBeenCalledWith('/thx/resetPassword') + it('shows message title, subtitle, login button', () => { + expect(wrapper.vm.showPageMessage).toBe(true) + expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title') + expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.reset') + expect(wrapper.find('.test-message-button').text()).toBe('login') + }) + + it('button link directs to "/login"', () => { + expect(wrapper.find('.test-message-button').attributes('href')).toBe('/login') + }) + + // Wolle + it.skip('click redirects to "/login"', () => { + // expect(routerPushMock).toHaveBeenCalledWith('/login') }) }) }) From eb34a9f6df7f4edced5efa4f06f8a26bf56474c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 30 May 2022 13:25:22 +0200 Subject: [PATCH 11/17] Refactor test for ResetPassword.vue, fix 'only' --- frontend/src/pages/ResetPassword.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/ResetPassword.spec.js b/frontend/src/pages/ResetPassword.spec.js index 1518fb71b..a62de3fe4 100644 --- a/frontend/src/pages/ResetPassword.spec.js +++ b/frontend/src/pages/ResetPassword.spec.js @@ -174,7 +174,7 @@ describe('ResetPassword', () => { }) // Wolle - it.only('click redirects to "/forgot-password/resetPassword"', () => { + it.skip('click redirects to "/forgot-password/resetPassword"', () => { // expect(routerPushMock).toHaveBeenCalledWith('/forgot-password/resetPassword') }) }) From 4091413847a6501552c388849dcbf757feae3ab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 30 May 2022 13:50:31 +0200 Subject: [PATCH 12/17] Remove thx page --- frontend/.eslintrc.js | 1 - frontend/src/locales/de.json | 2 - frontend/src/locales/en.json | 2 - frontend/src/pages/thx.spec.js | 101 ----------------------------- frontend/src/pages/thx.vue | 76 ---------------------- frontend/src/routes/router.test.js | 29 +-------- frontend/src/routes/routes.js | 12 ---- 7 files changed, 2 insertions(+), 221 deletions(-) delete mode 100644 frontend/src/pages/thx.spec.js delete mode 100644 frontend/src/pages/thx.vue diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js index 5127fc1cc..2ff182360 100644 --- a/frontend/.eslintrc.js +++ b/frontend/.eslintrc.js @@ -45,7 +45,6 @@ module.exports = { extensions: ['.js', '.vue'], // TODO: remove ignores ignores: [ - '/site.thx./', '/form./', '/time./', '/decay.types./', diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index a3e412a0e..f3385811b 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -245,11 +245,9 @@ "activateEmail": "Dein Konto wurde noch nicht aktiviert. Bitte überprüfe deine E-Mail und klicke den Aktivierungslink oder fordere einen neuen Aktivierungslink über die Password Reset Seite.", "checkEmail": "Deine E-Mail wurde erfolgreich verifiziert. Du kannst dich jetzt anmelden.", "email": "Wir haben dir eine E-Mail gesendet.", - "emailActivated": "Danke dass Du deine E-Mail bestätigt hast.", "errorTitle": "Achtung!", "register": "Du bist jetzt registriert, bitte überprüfe deine Emails und klicke auf den Aktivierungslink.", "reset": "Dein Passwort wurde geändert.", - "resetPassword": "Den Code den Du genutzt hast ist zu alt bitte fordere ein neuen über die Passwort Reset Seite an.", "title": "Danke!", "unsetPassword": "Dein Passwort wurde noch nicht gesetzt. Bitte setze es neu." } diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 4a7245147..f50d814f1 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -245,11 +245,9 @@ "activateEmail": "Your account has not been activated yet. Please check your emails and click the activation link or order a new activation link over the password reset page.", "checkEmail": "Your email has been successfully verified. You can sign in now.", "email": "We have sent you an email.", - "emailActivated": "Thank you your email has been activated.", "errorTitle": "Attention!", "register": "You are registered now, please check your emails and click the activation link.", "reset": "Your password has been changed.", - "resetPassword": "The code you used was to old please order a new on over the password reset page.", "title": "Thank you!", "unsetPassword": "Your password has not been set yet. Please set it again." } diff --git a/frontend/src/pages/thx.spec.js b/frontend/src/pages/thx.spec.js deleted file mode 100644 index a9d5ba3b7..000000000 --- a/frontend/src/pages/thx.spec.js +++ /dev/null @@ -1,101 +0,0 @@ -import { mount } from '@vue/test-utils' -import Thx from './thx' - -const localVue = global.localVue - -const createMockObject = (comingFrom) => { - return { - $t: jest.fn((t) => t), - $route: { - params: { - comingFrom, - }, - }, - } -} - -describe('Thx', () => { - let wrapper - - const Wrapper = (mocks) => { - return mount(Thx, { localVue, mocks }) - } - - describe('mount', () => { - beforeEach(() => { - wrapper = Wrapper(createMockObject('forgotPassword')) - }) - - it('renders the thx page', () => { - expect(wrapper.find('div.header').exists()).toBeTruthy() - }) - - it('renders the title', () => { - expect(wrapper.find('p.h1').text()).toBe('site.thx.title') - }) - }) - - describe('coming from /forgot-password', () => { - beforeEach(() => { - wrapper = Wrapper(createMockObject('forgotPassword')) - }) - - it('renders the thanks text', () => { - expect(wrapper.find('p.h4').text()).toBe('site.thx.email') - }) - - it('renders the thanks redirect button', () => { - expect(wrapper.find('a.btn').text()).toBe('login') - }) - - it('links the redirect button to /login', () => { - expect(wrapper.find('a.btn').attributes('href')).toBe('/login') - }) - }) - - describe('coming from /reset-password', () => { - beforeEach(() => { - wrapper = Wrapper(createMockObject('resetPassword')) - }) - - it('renders the thanks text', () => { - expect(wrapper.find('p.h4').text()).toBe('site.thx.reset') - }) - - it('renders the thanks redirect button', () => { - expect(wrapper.find('a.btn').text()).toBe('login') - }) - - it('links the redirect button to /login', () => { - expect(wrapper.find('a.btn').attributes('href')).toBe('/login') - }) - }) - - describe('coming from /register', () => { - beforeEach(() => { - wrapper = Wrapper(createMockObject('register')) - }) - - it('renders the thanks text', () => { - expect(wrapper.find('p.h4').text()).toBe('site.thx.register') - }) - }) - - describe('coming from /login', () => { - beforeEach(() => { - wrapper = Wrapper(createMockObject('login')) - }) - - it('renders the thanks text', () => { - expect(wrapper.find('p.h4').text()).toBe('site.thx.activateEmail') - }) - - it('renders the thanks redirect button', () => { - expect(wrapper.find('a.btn').text()).toBe('settings.password.reset') - }) - - it('links the redirect button to /forgot-password', () => { - expect(wrapper.find('a.btn').attributes('href')).toBe('/forgot-password') - }) - }) -}) diff --git a/frontend/src/pages/thx.vue b/frontend/src/pages/thx.vue deleted file mode 100644 index 7e203e8aa..000000000 --- a/frontend/src/pages/thx.vue +++ /dev/null @@ -1,76 +0,0 @@ - - diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js index 925b3ffca..32ab90d4e 100644 --- a/frontend/src/routes/router.test.js +++ b/frontend/src/routes/router.test.js @@ -49,8 +49,8 @@ describe('router', () => { expect(routes.find((r) => r.path === '/').redirect()).toEqual({ path: '/login' }) }) - it('has seventeen routes defined', () => { - expect(routes).toHaveLength(17) + it('has sixteen routes defined', () => { + expect(routes).toHaveLength(16) }) describe('overview', () => { @@ -111,31 +111,6 @@ describe('router', () => { }) }) - describe('thx', () => { - const thx = routes.find((r) => r.path === '/thx/:comingFrom/:code?') - - it('loads the "Thx" page', async () => { - const component = await thx.component() - expect(component.default.name).toBe('Thx') - }) - - describe('beforeEnter', () => { - const beforeEnter = thx.beforeEnter - const next = jest.fn() - - it('redirects to login when not coming from a valid page', () => { - beforeEnter({}, { path: '' }, next) - expect(next).toBeCalledWith({ path: '/login' }) - }) - - it('enters the page when coming from a valid page', () => { - jest.resetAllMocks() - beforeEnter({}, { path: '/forgot-password' }, next) - expect(next).toBeCalledWith() - }) - }) - }) - describe('forgot password', () => { it('loads the "ForgotPassword" page', async () => { const component = await routes.find((r) => r.path === '/forgot-password').component() diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js index a6586c201..e68f97502 100755 --- a/frontend/src/routes/routes.js +++ b/frontend/src/routes/routes.js @@ -46,18 +46,6 @@ const routes = [ path: '/register/:code?', component: () => import('@/pages/Register.vue'), }, - { - path: '/thx/:comingFrom/:code?', - component: () => import('@/pages/thx.vue'), - beforeEnter: (to, from, next) => { - const validFrom = ['forgot-password', 'reset-password', 'register', 'login', 'checkEmail'] - if (!validFrom.includes(from.path.split('/')[1])) { - next({ path: '/login' }) - } else { - next() - } - }, - }, { path: '/forgot-password', component: () => import('@/pages/ForgotPassword.vue'), From ac7fe1172f086743f9ce6ee69f9a62eba4aafa1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 30 May 2022 15:04:52 +0200 Subject: [PATCH 13/17] Change locale identifiers from 'site.thx.*' to 'message.*' --- .../UserSettings/UserPassword.spec.js | 2 +- .../components/UserSettings/UserPassword.vue | 2 +- frontend/src/locales/de.json | 20 +++++++++---------- frontend/src/locales/en.json | 20 +++++++++---------- frontend/src/pages/ForgotPassword.spec.js | 6 +++--- frontend/src/pages/ForgotPassword.vue | 4 ++-- frontend/src/pages/Login.spec.js | 8 ++++---- frontend/src/pages/Login.vue | 6 +++--- frontend/src/pages/Register.spec.js | 4 ++-- frontend/src/pages/Register.vue | 2 +- frontend/src/pages/ResetPassword.spec.js | 12 +++++------ frontend/src/pages/ResetPassword.vue | 8 ++++---- 12 files changed, 47 insertions(+), 47 deletions(-) diff --git a/frontend/src/components/UserSettings/UserPassword.spec.js b/frontend/src/components/UserSettings/UserPassword.spec.js index 59ec65bd7..14df1f41f 100644 --- a/frontend/src/components/UserSettings/UserPassword.spec.js +++ b/frontend/src/components/UserSettings/UserPassword.spec.js @@ -189,7 +189,7 @@ describe('UserCard_FormUserPasswort', () => { }) it('toasts a success message', () => { - expect(toastSuccessSpy).toBeCalledWith('site.thx.reset') + expect(toastSuccessSpy).toBeCalledWith('message.reset') }) it('cancels the edit process', () => { diff --git a/frontend/src/components/UserSettings/UserPassword.vue b/frontend/src/components/UserSettings/UserPassword.vue index 430f9a75d..0ba1576e8 100644 --- a/frontend/src/components/UserSettings/UserPassword.vue +++ b/frontend/src/components/UserSettings/UserPassword.vue @@ -89,7 +89,7 @@ export default { }, }) .then(() => { - this.toastSuccess(this.$t('site.thx.reset')) + this.toastSuccess(this.$t('message.reset')) this.cancelEdit() }) .catch((error) => { diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index f3385811b..a551c2486 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -172,6 +172,16 @@ "minus": "−", "pipe": "|" }, + "message": { + "activateEmail": "Dein Konto wurde noch nicht aktiviert. Bitte überprüfe deine E-Mail und klicke den Aktivierungslink oder fordere einen neuen Aktivierungslink über die Password Reset Seite.", + "checkEmail": "Deine E-Mail wurde erfolgreich verifiziert. Du kannst dich jetzt anmelden.", + "email": "Wir haben dir eine E-Mail gesendet.", + "errorTitle": "Achtung!", + "register": "Du bist jetzt registriert, bitte überprüfe deine Emails und klicke auf den Aktivierungslink.", + "reset": "Dein Passwort wurde geändert.", + "title": "Danke!", + "unsetPassword": "Dein Passwort wurde noch nicht gesetzt. Bitte setze es neu." + }, "navigation": { "admin_area": "Adminbereich", "logout": "Abmelden", @@ -240,16 +250,6 @@ "one_number": "Zahl erforderlich.", "special-char": "Sonderzeichen erforderlich (z.B. _ oder ä)", "uppercase": "Großbuchstabe erforderlich." - }, - "thx": { - "activateEmail": "Dein Konto wurde noch nicht aktiviert. Bitte überprüfe deine E-Mail und klicke den Aktivierungslink oder fordere einen neuen Aktivierungslink über die Password Reset Seite.", - "checkEmail": "Deine E-Mail wurde erfolgreich verifiziert. Du kannst dich jetzt anmelden.", - "email": "Wir haben dir eine E-Mail gesendet.", - "errorTitle": "Achtung!", - "register": "Du bist jetzt registriert, bitte überprüfe deine Emails und klicke auf den Aktivierungslink.", - "reset": "Dein Passwort wurde geändert.", - "title": "Danke!", - "unsetPassword": "Dein Passwort wurde noch nicht gesetzt. Bitte setze es neu." } }, "success": "Erfolg", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index f50d814f1..258a10139 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -172,6 +172,16 @@ "minus": "−", "pipe": "|" }, + "message": { + "activateEmail": "Your account has not been activated yet. Please check your emails and click the activation link or order a new activation link over the password reset page.", + "checkEmail": "Your email has been successfully verified. You can sign in now.", + "email": "We have sent you an email.", + "errorTitle": "Attention!", + "register": "You are registered now, please check your emails and click the activation link.", + "reset": "Your password has been changed.", + "title": "Thank you!", + "unsetPassword": "Your password has not been set yet. Please set it again." + }, "navigation": { "admin_area": "Admin Area", "logout": "Logout", @@ -240,16 +250,6 @@ "one_number": "One number required.", "special-char": "One special character required (e.g. _ or ä)", "uppercase": "One uppercase letter required." - }, - "thx": { - "activateEmail": "Your account has not been activated yet. Please check your emails and click the activation link or order a new activation link over the password reset page.", - "checkEmail": "Your email has been successfully verified. You can sign in now.", - "email": "We have sent you an email.", - "errorTitle": "Attention!", - "register": "You are registered now, please check your emails and click the activation link.", - "reset": "Your password has been changed.", - "title": "Thank you!", - "unsetPassword": "Your password has not been set yet. Please set it again." } }, "success": "Success", diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js index 587418b7d..2fe946308 100644 --- a/frontend/src/pages/ForgotPassword.spec.js +++ b/frontend/src/pages/ForgotPassword.spec.js @@ -111,7 +111,7 @@ describe('ForgotPassword', () => { it('shows error title, subtitle, login button', () => { expect(wrapper.vm.showPageMessage).toBe(true) - expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle') + expect(wrapper.find('.test-message-headline').text()).toBe('message.errorTitle') expect(wrapper.find('.test-message-subtitle').text()).toBe('error.email-already-sent') expect(wrapper.find('.test-message-button').text()).toBe('login') }) @@ -147,8 +147,8 @@ describe('ForgotPassword', () => { it('shows success title, subtitle, login button', () => { expect(wrapper.vm.showPageMessage).toBe(true) - expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title') - expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.email') + expect(wrapper.find('.test-message-headline').text()).toBe('message.title') + expect(wrapper.find('.test-message-subtitle').text()).toBe('message.email') expect(wrapper.find('.test-message-button').text()).toBe('login') }) diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue index 74e5161f1..eba0eb4e5 100644 --- a/frontend/src/pages/ForgotPassword.vue +++ b/frontend/src/pages/ForgotPassword.vue @@ -26,8 +26,8 @@ diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js index 7b0b030b8..519f02655 100644 --- a/frontend/src/pages/Login.spec.js +++ b/frontend/src/pages/Login.spec.js @@ -198,8 +198,8 @@ describe('Login', () => { it('shows error title, subtitle, login button', () => { expect(wrapper.vm.showPageMessage).toBe(true) - expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle') - expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.activateEmail') + expect(wrapper.find('.test-message-headline').text()).toBe('message.errorTitle') + expect(wrapper.find('.test-message-subtitle').text()).toBe('message.activateEmail') expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset') }) @@ -227,8 +227,8 @@ describe('Login', () => { it('shows error title, subtitle, login button', () => { expect(wrapper.vm.showPageMessage).toBe(true) - expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle') - expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.unsetPassword') + expect(wrapper.find('.test-message-headline').text()).toBe('message.errorTitle') + expect(wrapper.find('.test-message-subtitle').text()).toBe('message.unsetPassword') expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset') }) diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue index 208f7941f..62e4739dc 100755 --- a/frontend/src/pages/Login.vue +++ b/frontend/src/pages/Login.vue @@ -41,7 +41,7 @@ { if (error.message.includes('User email not validated')) { this.showPageMessage = true - this.errorSubtitle = this.$t('site.thx.activateEmail') + this.errorSubtitle = this.$t('message.activateEmail') this.errorLinkTo = '/forgot-password' this.toastError(this.$t('error.no-account')) } else if (error.message.includes('User has no password set yet')) { this.showPageMessage = true - this.errorSubtitle = this.$t('site.thx.unsetPassword') + this.errorSubtitle = this.$t('message.unsetPassword') this.errorLinkTo = '/reset-password/login' this.toastError(this.$t('error.no-account')) } else if (error.message.includes('No user with this credentials')) { diff --git a/frontend/src/pages/Register.spec.js b/frontend/src/pages/Register.spec.js index 742851a1d..a9415de87 100644 --- a/frontend/src/pages/Register.spec.js +++ b/frontend/src/pages/Register.spec.js @@ -202,8 +202,8 @@ describe('Register', () => { it('shows success title, subtitle', () => { expect(wrapper.vm.showPageMessage).toBe(true) - expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title') - expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.register') + expect(wrapper.find('.test-message-headline').text()).toBe('message.title') + expect(wrapper.find('.test-message-subtitle').text()).toBe('message.register') }) it('button is not present', () => { diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue index f64b86ebc..3d99ca605 100755 --- a/frontend/src/pages/Register.vue +++ b/frontend/src/pages/Register.vue @@ -90,7 +90,7 @@ - + diff --git a/frontend/src/pages/ResetPassword.spec.js b/frontend/src/pages/ResetPassword.spec.js index a62de3fe4..6a96f57c1 100644 --- a/frontend/src/pages/ResetPassword.spec.js +++ b/frontend/src/pages/ResetPassword.spec.js @@ -120,7 +120,7 @@ describe('ResetPassword', () => { it('shows error title, subtitle, login button', () => { expect(wrapper.vm.showPageMessage).toBe(true) - expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle') + expect(wrapper.find('.test-message-headline').text()).toBe('message.errorTitle') expect(wrapper.find('.test-message-subtitle').text()).toBe( '...email was sent more than 23 hours and 10 minutes ago', ) @@ -158,7 +158,7 @@ describe('ResetPassword', () => { it('shows error title, subtitle, login button', () => { expect(wrapper.vm.showPageMessage).toBe(true) - expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle') + expect(wrapper.find('.test-message-headline').text()).toBe('message.errorTitle') expect(wrapper.find('.test-message-subtitle').text()).toBe('Error') expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset') }) @@ -207,8 +207,8 @@ describe('ResetPassword', () => { it('shows message title, subtitle, login button', () => { expect(wrapper.vm.showPageMessage).toBe(true) - expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title') - expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.checkEmail') + expect(wrapper.find('.test-message-headline').text()).toBe('message.title') + expect(wrapper.find('.test-message-subtitle').text()).toBe('message.checkEmail') expect(wrapper.find('.test-message-button').text()).toBe('login') }) @@ -239,8 +239,8 @@ describe('ResetPassword', () => { it('shows message title, subtitle, login button', () => { expect(wrapper.vm.showPageMessage).toBe(true) - expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title') - expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.reset') + expect(wrapper.find('.test-message-headline').text()).toBe('message.title') + expect(wrapper.find('.test-message-subtitle').text()).toBe('message.reset') expect(wrapper.find('.test-message-button').text()).toBe('login') }) diff --git a/frontend/src/pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue index 32d219947..9cf52a2cc 100644 --- a/frontend/src/pages/ResetPassword.vue +++ b/frontend/src/pages/ResetPassword.vue @@ -84,10 +84,10 @@ export default { this.form.passwordRepeat = '' this.showPageMessage = true - this.messageHeadline = this.$t('site.thx.title') + this.messageHeadline = this.$t('message.title') this.messageSubtitle = this.$route.path.includes('checkEmail') - ? this.$t('site.thx.checkEmail') - : this.$t('site.thx.reset') + ? this.$t('message.checkEmail') + : this.$t('message.reset') this.messageButtonText = this.$t('login') this.messageButtonLinktTo = '/login' }) @@ -103,7 +103,7 @@ export default { errorMessage = error.message } this.showPageMessage = true - this.messageHeadline = this.$t('site.thx.errorTitle') + this.messageHeadline = this.$t('message.errorTitle') this.messageSubtitle = errorMessage this.messageButtonText = this.$t('settings.password.reset') this.messageButtonLinktTo = '/forgot-password/resetPassword' From 58e61fa14084166c132918e9c40c28f3802b0cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 30 May 2022 15:10:57 +0200 Subject: [PATCH 14/17] Cleanup --- frontend/src/pages/ForgotPassword.spec.js | 2 -- frontend/src/pages/Login.spec.js | 2 -- frontend/src/pages/ResetPassword.spec.js | 4 ---- 3 files changed, 8 deletions(-) diff --git a/frontend/src/pages/ForgotPassword.spec.js b/frontend/src/pages/ForgotPassword.spec.js index 2fe946308..14363633c 100644 --- a/frontend/src/pages/ForgotPassword.spec.js +++ b/frontend/src/pages/ForgotPassword.spec.js @@ -120,7 +120,6 @@ describe('ForgotPassword', () => { expect(wrapper.find('.test-message-button').attributes('href')).toBe('/login') }) - // Wolle it.skip('click redirects to "/login"', async () => { // wrapper.find('.test-message-button').trigger('click') // await wrapper.vm.$nextTick() @@ -156,7 +155,6 @@ describe('ForgotPassword', () => { expect(wrapper.find('.test-message-button').attributes('href')).toBe('/login') }) - // Wolle it.skip('click redirects to "/login"', () => { // expect(mockRouterPush).toBeCalledWith('/login') }) diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js index 519f02655..6359d07c6 100644 --- a/frontend/src/pages/Login.spec.js +++ b/frontend/src/pages/Login.spec.js @@ -207,7 +207,6 @@ describe('Login', () => { expect(wrapper.find('.test-message-button').attributes('href')).toBe('/forgot-password') }) - // Wolle it.skip('click redirects to "/forgot-password"', async () => { // wrapper.find('.test-message-button').trigger('click') // await flushPromises() @@ -238,7 +237,6 @@ describe('Login', () => { ) }) - // Wolle it.skip('click redirects to "/reset-password/login"', () => { // expect(mockRouterPush).toBeCalledWith('/reset-password/login') }) diff --git a/frontend/src/pages/ResetPassword.spec.js b/frontend/src/pages/ResetPassword.spec.js index 6a96f57c1..7c0b920c5 100644 --- a/frontend/src/pages/ResetPassword.spec.js +++ b/frontend/src/pages/ResetPassword.spec.js @@ -139,7 +139,6 @@ describe('ResetPassword', () => { ) }) - // Wolle it.skip('click redirects to "/forgot-password/resetPassword"', () => { // wrapper.find('.test-message-button').trigger('click') // await flushPromises() @@ -173,7 +172,6 @@ describe('ResetPassword', () => { expect(toastErrorSpy).toHaveBeenCalledWith('Error') }) - // Wolle it.skip('click redirects to "/forgot-password/resetPassword"', () => { // expect(routerPushMock).toHaveBeenCalledWith('/forgot-password/resetPassword') }) @@ -216,7 +214,6 @@ describe('ResetPassword', () => { expect(wrapper.find('.test-message-button').attributes('href')).toBe('/login') }) - // Wolle it.skip('click redirects to "/login"', () => { // expect(routerPushMock).toHaveBeenCalledWith('/login') }) @@ -248,7 +245,6 @@ describe('ResetPassword', () => { expect(wrapper.find('.test-message-button').attributes('href')).toBe('/login') }) - // Wolle it.skip('click redirects to "/login"', () => { // expect(routerPushMock).toHaveBeenCalledWith('/login') }) From 5ea093a61315c2212fce2452287aef9737500dc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Mon, 30 May 2022 15:25:22 +0200 Subject: [PATCH 15/17] Remove comment --- frontend/src/pages/ResetPassword.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/pages/ResetPassword.vue b/frontend/src/pages/ResetPassword.vue index 9cf52a2cc..d9bf1f891 100644 --- a/frontend/src/pages/ResetPassword.vue +++ b/frontend/src/pages/ResetPassword.vue @@ -1,5 +1,4 @@