{{ $t('transactionlist.title') }}
-
+
+
diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 651944547..d92f42f5d 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -198,7 +198,7 @@
},
"thx": {
"activateEmail": "Dein Konto wurde noch nicht aktiviert. Bitte überprüfe deine E-Mail und klicke den Aktivierungslink!",
- "checkEmail": "Deine E-Mail wurde erfolgreich verifiziert.",
+ "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!",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index c6cbeed69..014d449a0 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -198,7 +198,7 @@
},
"thx": {
"activateEmail": "Your account has not been activated yet, please check your emails and click the activation link!",
- "checkEmail": "Your email has been successfully verified.",
+ "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!",
diff --git a/frontend/src/views/Pages/ResetPassword.spec.js b/frontend/src/views/Pages/ResetPassword.spec.js
index e28d16c3e..da8b4bc4f 100644
--- a/frontend/src/views/Pages/ResetPassword.spec.js
+++ b/frontend/src/views/Pages/ResetPassword.spec.js
@@ -15,54 +15,48 @@ const stubs = {
RouterLink: RouterLinkStub,
}
-const createMockObject = (comingFrom) => {
- return {
- localVue,
- mocks: {
- $i18n: {
- locale: 'en',
- },
- $t: jest.fn((t) => t),
- $route: {
- params: {
- optin: '123',
- comingFrom,
- },
- path: {
- includes: (t) => t,
- },
- },
- $toasted: {
- global: {
- error: toasterMock,
- },
- },
- $router: {
- push: routerPushMock,
- },
- $loading: {
- show: jest.fn(() => {
- return { hide: jest.fn() }
- }),
- },
- $apollo: {
- mutate: apolloMutationMock,
- },
+const mocks = {
+ $i18n: {
+ locale: 'en',
+ },
+ $t: jest.fn((t) => t),
+ $route: {
+ params: {
+ optin: '123',
},
- stubs,
- }
+ path: {
+ mock: 'checkEmail',
+ includes: jest.fn((t) => t === mocks.$route.path.mock),
+ },
+ },
+ $toasted: {
+ global: {
+ error: toasterMock,
+ },
+ },
+ $router: {
+ push: routerPushMock,
+ },
+ $loading: {
+ show: jest.fn(() => {
+ return { hide: jest.fn() }
+ }),
+ },
+ $apollo: {
+ mutate: apolloMutationMock,
+ },
}
describe('ResetPassword', () => {
let wrapper
- const Wrapper = (functionName) => {
- return mount(ResetPassword, functionName)
+ const Wrapper = () => {
+ return mount(ResetPassword, { localVue, mocks, stubs })
}
describe('mount', () => {
beforeEach(() => {
- wrapper = Wrapper(createMockObject())
+ wrapper = Wrapper()
})
describe('No valid optin', () => {
@@ -86,11 +80,32 @@ describe('ResetPassword', () => {
})
describe('Register header', () => {
- it('has a welcome message', async () => {
- expect(wrapper.find('div.header').text()).toContain('settings.password.reset')
- expect(wrapper.find('div.header').text()).toContain(
- 'settings.password.reset-password.text',
- )
+ describe('from reset', () => {
+ beforeEach(() => {
+ mocks.$route.path.mock = 'reset'
+ wrapper = Wrapper()
+ })
+
+ it('has a welcome message', async () => {
+ expect(wrapper.find('div.header').text()).toContain('settings.password.reset')
+ expect(wrapper.find('div.header').text()).toContain(
+ 'settings.password.reset-password.text',
+ )
+ })
+ })
+
+ describe('from checkEmail', () => {
+ beforeEach(() => {
+ mocks.$route.path.mock = 'checkEmail'
+ wrapper = Wrapper()
+ })
+
+ it('has a welcome message', async () => {
+ expect(wrapper.find('div.header').text()).toContain('settings.password.set')
+ expect(wrapper.find('div.header').text()).toContain(
+ 'settings.password.set-password.text',
+ )
+ })
})
})
@@ -128,7 +143,6 @@ describe('ResetPassword', () => {
describe('submit form', () => {
beforeEach(async () => {
- // wrapper = Wrapper(createMockObject())
await wrapper.findAll('input').at(0).setValue('Aa123456_')
await wrapper.findAll('input').at(1).setValue('Aa123456_')
await flushPromises()
@@ -164,14 +178,14 @@ describe('ResetPassword', () => {
})
})
- describe('server response with success', () => {
+ describe('server response with success on /checkEmail', () => {
beforeEach(async () => {
+ mocks.$route.path.mock = 'checkEmail'
apolloMutationMock.mockResolvedValue({
data: {
resetPassword: 'success',
},
})
- wrapper = Wrapper(createMockObject('checkEmail'))
await wrapper.findAll('input').at(0).setValue('Aa123456_')
await wrapper.findAll('input').at(1).setValue('Aa123456_')
await wrapper.find('form').trigger('submit')
@@ -189,6 +203,26 @@ describe('ResetPassword', () => {
)
})
+ it('redirects to "/thx/checkEmail"', () => {
+ expect(routerPushMock).toHaveBeenCalledWith('/thx/checkEmail')
+ })
+ })
+
+ describe('server response with success on /reset', () => {
+ beforeEach(async () => {
+ mocks.$route.path.mock = 'reset'
+ wrapper = Wrapper()
+ apolloMutationMock.mockResolvedValue({
+ data: {
+ resetPassword: 'success',
+ },
+ })
+ 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('redirects to "/thx/reset"', () => {
expect(routerPushMock).toHaveBeenCalledWith('/thx/reset')
})
diff --git a/frontend/src/views/Pages/ResetPassword.vue b/frontend/src/views/Pages/ResetPassword.vue
index 05d8a0f6e..0023c3838 100644
--- a/frontend/src/views/Pages/ResetPassword.vue
+++ b/frontend/src/views/Pages/ResetPassword.vue
@@ -92,7 +92,11 @@ export default {
})
.then(() => {
this.form.password = ''
- this.$router.push('/thx/reset')
+ if (this.$route.path.includes('checkEmail')) {
+ this.$router.push('/thx/checkEmail')
+ } else {
+ this.$router.push('/thx/reset')
+ }
})
.catch((error) => {
this.$toasted.global.error(error.message)