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/41] 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 32f8e43c90e24b43201886faab70f596cc82f6be Mon Sep 17 00:00:00 2001 From: ogerly Date: Sun, 29 May 2022 12:08:28 +0200 Subject: [PATCH 17/41] remove files and code from coinanimation settings --- .../UserSettings/UserCoinAnimation.spec.js | 127 ------------------ .../UserSettings/UserCoinAnimation.vue | 65 --------- frontend/src/graphql/mutations.js | 2 - frontend/src/graphql/queries.js | 2 - frontend/src/locales/de.json | 5 - frontend/src/locales/en.json | 5 - frontend/src/pages/Profile.spec.js | 4 - frontend/src/pages/Profile.vue | 4 - frontend/src/store/store.js | 6 - frontend/src/store/store.test.js | 40 ++---- 10 files changed, 10 insertions(+), 250 deletions(-) delete mode 100644 frontend/src/components/UserSettings/UserCoinAnimation.spec.js delete mode 100644 frontend/src/components/UserSettings/UserCoinAnimation.vue diff --git a/frontend/src/components/UserSettings/UserCoinAnimation.spec.js b/frontend/src/components/UserSettings/UserCoinAnimation.spec.js deleted file mode 100644 index aabf927fb..000000000 --- a/frontend/src/components/UserSettings/UserCoinAnimation.spec.js +++ /dev/null @@ -1,127 +0,0 @@ -import { mount } from '@vue/test-utils' -import UserCoinAnimation from './UserCoinAnimation' -import { updateUserInfos } from '@/graphql/mutations' - -import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup' - -const localVue = global.localVue - -const mockAPIcall = jest.fn() - -const storeCommitMock = jest.fn() - -describe('UserCard_CoinAnimation', () => { - let wrapper - - const mocks = { - $t: jest.fn((t) => t), - $store: { - state: { - language: 'de', - coinanimation: true, - }, - commit: storeCommitMock, - }, - $apollo: { - mutate: mockAPIcall, - }, - } - - const Wrapper = () => { - return mount(UserCoinAnimation, { localVue, mocks }) - } - - describe('mount', () => { - beforeEach(() => { - jest.clearAllMocks() - wrapper = Wrapper() - }) - - it('renders the component', () => { - expect(wrapper.find('div#formusercoinanimation').exists()).toBeTruthy() - }) - - it('has an edit BFormCheckbox switch', () => { - expect(wrapper.find('.Test-BFormCheckbox').exists()).toBeTruthy() - }) - - describe('enable with success', () => { - beforeEach(async () => { - await wrapper.setData({ CoinAnimationStatus: false }) - mockAPIcall.mockResolvedValue({ - data: { - updateUserInfos: { - validValues: 1, - }, - }, - }) - await wrapper.find('input').setChecked() - }) - - it('calls the updateUserInfos mutation', () => { - expect(mockAPIcall).toBeCalledWith({ - mutation: updateUserInfos, - variables: { - coinanimation: true, - }, - }) - }) - - it('updates the store', () => { - expect(storeCommitMock).toBeCalledWith('coinanimation', true) - }) - - it('toasts a success message', () => { - expect(toastSuccessSpy).toBeCalledWith('settings.coinanimation.True') - }) - }) - - describe('disable with success', () => { - beforeEach(async () => { - await wrapper.setData({ CoinAnimationStatus: true }) - mockAPIcall.mockResolvedValue({ - data: { - updateUserInfos: { - validValues: 1, - }, - }, - }) - await wrapper.find('input').setChecked(false) - }) - - it('calls the subscribe mutation', () => { - expect(mockAPIcall).toBeCalledWith({ - mutation: updateUserInfos, - variables: { - coinanimation: false, - }, - }) - }) - - it('updates the store', () => { - expect(storeCommitMock).toBeCalledWith('coinanimation', false) - }) - - it('toasts a success message', () => { - expect(toastSuccessSpy).toBeCalledWith('settings.coinanimation.False') - }) - }) - - describe('disable with server error', () => { - beforeEach(() => { - mockAPIcall.mockRejectedValue({ - message: 'Ouch', - }) - wrapper.find('input').trigger('change') - }) - - it('resets the CoinAnimationStatus', () => { - expect(wrapper.vm.CoinAnimationStatus).toBeTruthy() - }) - - it('toasts an error message', () => { - expect(toastErrorSpy).toBeCalledWith('Ouch') - }) - }) - }) -}) diff --git a/frontend/src/components/UserSettings/UserCoinAnimation.vue b/frontend/src/components/UserSettings/UserCoinAnimation.vue deleted file mode 100644 index 040825105..000000000 --- a/frontend/src/components/UserSettings/UserCoinAnimation.vue +++ /dev/null @@ -1,65 +0,0 @@ - - diff --git a/frontend/src/graphql/mutations.js b/frontend/src/graphql/mutations.js index 672af5f04..9b035cba6 100644 --- a/frontend/src/graphql/mutations.js +++ b/frontend/src/graphql/mutations.js @@ -31,7 +31,6 @@ export const updateUserInfos = gql` $password: String $passwordNew: String $locale: String - $coinanimation: Boolean ) { updateUserInfos( firstName: $firstName @@ -39,7 +38,6 @@ export const updateUserInfos = gql` password: $password passwordNew: $passwordNew language: $locale - coinanimation: $coinanimation ) } ` diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js index 2bd905e5e..601880a51 100644 --- a/frontend/src/graphql/queries.js +++ b/frontend/src/graphql/queries.js @@ -7,7 +7,6 @@ export const login = gql` firstName lastName language - coinanimation klickTipp { newsletterState } @@ -25,7 +24,6 @@ export const verifyLogin = gql` firstName lastName language - coinanimation klickTipp { newsletterState } diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 3b4912a2f..a3e412a0e 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -186,11 +186,6 @@ "send_gdd": "GDD versenden", "send_per_link": "GDD versenden per Link", "settings": { - "coinanimation": { - "coinanimation": "Münzanimation", - "False": "Münzanimation ausgeschaltet", - "True": "Münzanimation eingeschaltet" - }, "language": { "changeLanguage": "Sprache ändern", "de": "Deutsch", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 63f2510a3..4a7245147 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -186,11 +186,6 @@ "send_gdd": "GDD send", "send_per_link": "GDD send via link", "settings": { - "coinanimation": { - "coinanimation": "Coin animation", - "False": "Coin animation disabled", - "True": "Coin animation enabled" - }, "language": { "changeLanguage": "Change language", "de": "Deutsch", diff --git a/frontend/src/pages/Profile.spec.js b/frontend/src/pages/Profile.spec.js index fb4ee2d42..6a6efcfe3 100644 --- a/frontend/src/pages/Profile.spec.js +++ b/frontend/src/pages/Profile.spec.js @@ -38,9 +38,5 @@ describe('Profile', () => { it('has a user change newsletter form', () => { expect(wrapper.findComponent({ name: 'UserNewsletter' }).exists()).toBeTruthy() }) - - it('has a user change coin animation form', () => { - expect(wrapper.findComponent({ name: 'UserCoinAnimation' }).exists()).toBeTruthy() - }) }) }) diff --git a/frontend/src/pages/Profile.vue b/frontend/src/pages/Profile.vue index 01308b29a..703fea307 100644 --- a/frontend/src/pages/Profile.vue +++ b/frontend/src/pages/Profile.vue @@ -8,8 +8,6 @@
-
- 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 24/41] 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 25/41] 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 26/41] 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 @@