diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json
index 6066ce04a..0d496bc3f 100644
--- a/frontend/src/locales/de.json
+++ b/frontend/src/locales/de.json
@@ -216,9 +216,6 @@
"new_wallet": "Neues Konto erstellen",
"signin": "Anmelden"
},
- "register": {
- "message-button-text": "Alles klar"
- },
"signup": {
"agree": "Ich stimme der Datenschutzerklärung zu.",
"dont_match": "Die Passwörter stimmen nicht überein.",
diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json
index 5a0602098..f5009e04f 100644
--- a/frontend/src/locales/en.json
+++ b/frontend/src/locales/en.json
@@ -216,9 +216,6 @@
"new_wallet": "Create new account",
"signin": "Sign in"
},
- "register": {
- "message-button-text": "Okay"
- },
"signup": {
"agree": "I agree to the privacy policy.",
"dont_match": "Passwords don't match.",
diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js
index 478266676..80177ab2b 100644
--- a/frontend/src/pages/Login.spec.js
+++ b/frontend/src/pages/Login.spec.js
@@ -282,6 +282,7 @@ describe('Login', () => {
})
it('shows no error message on the page', () => {
+ // don't show any error on the page! against boots
expect(wrapper.vm.showPageMessage).toBe(false)
expect(wrapper.find('.test-message-headline').exists()).toBe(false)
expect(wrapper.find('.test-message-subtitle').exists()).toBe(false)
@@ -299,6 +300,7 @@ describe('Login', () => {
})
it('shows no error message on the page', () => {
+ // don't show any error on the page! against boots
expect(wrapper.vm.showPageMessage).toBe(false)
expect(wrapper.find('.test-message-headline').exists()).toBe(false)
expect(wrapper.find('.test-message-subtitle').exists()).toBe(false)
diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue
index 7544bdcf7..10fcca649 100755
--- a/frontend/src/pages/Login.vue
+++ b/frontend/src/pages/Login.vue
@@ -135,8 +135,10 @@ export default {
this.errorLinkTo = '/reset-password/login'
this.toastError(this.$t('error.no-account'))
} else if (error.message.includes('No user with this credentials')) {
+ // don't show any error on the page! against boots
this.toastError(this.$t('error.no-user'))
} else {
+ // don't show any error on the page! against boots
this.toastError(this.$t('error.unknown-error') + error.message)
}
loader.hide()
diff --git a/frontend/src/pages/Register.spec.js b/frontend/src/pages/Register.spec.js
index e889f0ca7..f7a6c0ac8 100644
--- a/frontend/src/pages/Register.spec.js
+++ b/frontend/src/pages/Register.spec.js
@@ -234,24 +234,17 @@ describe('Register', () => {
await createError('GraphQL error: User already exists.')
})
- it('shows success 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.user-already-exists')
- expect(wrapper.find('.test-message-button').text()).toBe(
- 'site.register.message-button-text',
- )
+ it('shows no error message on the page', () => {
+ // don't show any error on the page! against boots
+ expect(wrapper.vm.showPageMessage).toBe(false)
+ expect(wrapper.find('.test-message-headline').exists()).toBe(false)
+ expect(wrapper.find('.test-message-subtitle').exists()).toBe(false)
+ expect(wrapper.find('.test-message-button').exists()).toBe(false)
})
it('toasts the error message', () => {
expect(toastErrorSpy).toBeCalledWith('error.user-already-exists')
})
-
- it('click calls "solveError"', async () => {
- wrapper.find('.test-message-button').trigger('click')
- await wrapper.vm.$nextTick()
- expect(wrapper.vm.showPageMessage).toBe(false)
- })
})
describe('server sends back error "Unknown error"', () => {
@@ -259,26 +252,17 @@ describe('Register', () => {
await createError(' – Unknown error.')
})
- it('shows success 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.unknown-error – Unknown error.',
- )
- expect(wrapper.find('.test-message-button').text()).toBe(
- 'site.register.message-button-text',
- )
+ it('shows no error message on the page', () => {
+ // don't show any error on the page! against boots
+ expect(wrapper.vm.showPageMessage).toBe(false)
+ expect(wrapper.find('.test-message-headline').exists()).toBe(false)
+ expect(wrapper.find('.test-message-subtitle').exists()).toBe(false)
+ expect(wrapper.find('.test-message-button').exists()).toBe(false)
})
it('toasts the error message', () => {
expect(toastErrorSpy).toBeCalledWith('error.unknown-error – Unknown error.')
})
-
- it('click calls "solveError"', async () => {
- wrapper.find('.test-message-button').trigger('click')
- await wrapper.vm.$nextTick()
- expect(wrapper.vm.showPageMessage).toBe(false)
- })
})
})
diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue
index d6b5f9dba..39230cb1e 100755
--- a/frontend/src/pages/Register.vue
+++ b/frontend/src/pages/Register.vue
@@ -165,18 +165,7 @@
-
-
+