Avoid any error messages on the Register page, because of boots

This commit is contained in:
Wolfgang Huß 2022-05-05 12:05:04 +02:00
parent 6a1b8f0fd9
commit 4a64d1aa20
6 changed files with 22 additions and 61 deletions

View File

@ -216,9 +216,6 @@
"new_wallet": "Neues Konto erstellen",
"signin": "Anmelden"
},
"register": {
"message-button-text": "Alles klar"
},
"signup": {
"agree": "Ich stimme der <a href='https://gradido.net/de/datenschutz/' target='_blank' >Datenschutzerklärung</a> zu.",
"dont_match": "Die Passwörter stimmen nicht überein.",

View File

@ -216,9 +216,6 @@
"new_wallet": "Create new account",
"signin": "Sign in"
},
"register": {
"message-button-text": "Okay"
},
"signup": {
"agree": "I agree to the <a href='https://gradido.net/en/datenschutz/' target='_blank' > privacy policy</a>.",
"dont_match": "Passwords don't match.",

View File

@ -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)

View File

@ -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()

View File

@ -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)
})
})
})

View File

@ -165,18 +165,7 @@
</b-row>
</b-container>
<b-container v-else class="mt--8 p-1">
<message
v-if="success"
:headline="$t('site.thx.title')"
:subtitle="$t('site.thx.register')"
/>
<message
v-else
:headline="$t('site.thx.errorTitle')"
:subtitle="messageError"
:buttonText="$t('site.register.message-button-text')"
:callback="solveError"
/>
<message :headline="$t('site.thx.title')" :subtitle="$t('site.thx.register')" />
</b-container>
<!--
<div class="text-center pt-4">
@ -214,7 +203,6 @@ export default {
language: '',
showPageMessage: false,
submitted: false,
messageError: '',
publisherId: this.$store.state.publisherId,
redeemCode: this.$route.params.code,
CONFIG,
@ -246,30 +234,21 @@ export default {
})
.then(() => {
this.showPageMessage = true
this.success = true
})
.catch((error) => {
this.showPageMessage = true
this.success = false
// don't show any error on the page! against boots
let errorMessage
switch (error.message) {
case 'GraphQL error: User already exists.':
this.messageError = this.$t('error.user-already-exists')
errorMessage = this.$t('error.user-already-exists')
break
default:
this.messageError = this.$t('error.unknown-error') + error.message
errorMessage = this.$t('error.unknown-error') + error.message
break
}
this.toastError(this.messageError)
this.toastError(errorMessage)
})
},
solveError() {
this.showPageMessage = false
this.messageError = ''
this.form.email = ''
this.form.firstname = ''
this.form.lastname = ''
this.form.agree = false
},
},
computed: {
namesFilled() {