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

View File

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

View File

@ -282,6 +282,7 @@ describe('Login', () => {
}) })
it('shows no error message on the page', () => { 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.vm.showPageMessage).toBe(false)
expect(wrapper.find('.test-message-headline').exists()).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-subtitle').exists()).toBe(false)
@ -299,6 +300,7 @@ describe('Login', () => {
}) })
it('shows no error message on the page', () => { 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.vm.showPageMessage).toBe(false)
expect(wrapper.find('.test-message-headline').exists()).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-subtitle').exists()).toBe(false)

View File

@ -135,8 +135,10 @@ export default {
this.errorLinkTo = '/reset-password/login' this.errorLinkTo = '/reset-password/login'
this.toastError(this.$t('error.no-account')) this.toastError(this.$t('error.no-account'))
} else if (error.message.includes('No user with this credentials')) { } 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')) this.toastError(this.$t('error.no-user'))
} else { } else {
// don't show any error on the page! against boots
this.toastError(this.$t('error.unknown-error') + error.message) this.toastError(this.$t('error.unknown-error') + error.message)
} }
loader.hide() loader.hide()

View File

@ -234,24 +234,17 @@ describe('Register', () => {
await createError('GraphQL error: User already exists.') await createError('GraphQL error: User already exists.')
}) })
it('shows success title, subtitle, login button', () => { it('shows no error message on the page', () => {
expect(wrapper.vm.showPageMessage).toBe(true) // don't show any error on the page! against boots
expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle') expect(wrapper.vm.showPageMessage).toBe(false)
expect(wrapper.find('.test-message-subtitle').text()).toBe('error.user-already-exists') expect(wrapper.find('.test-message-headline').exists()).toBe(false)
expect(wrapper.find('.test-message-button').text()).toBe( expect(wrapper.find('.test-message-subtitle').exists()).toBe(false)
'site.register.message-button-text', expect(wrapper.find('.test-message-button').exists()).toBe(false)
)
}) })
it('toasts the error message', () => { it('toasts the error message', () => {
expect(toastErrorSpy).toBeCalledWith('error.user-already-exists') 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"', () => { describe('server sends back error "Unknown error"', () => {
@ -259,26 +252,17 @@ describe('Register', () => {
await createError(' Unknown error.') await createError(' Unknown error.')
}) })
it('shows success title, subtitle, login button', () => { it('shows no error message on the page', () => {
expect(wrapper.vm.showPageMessage).toBe(true) // don't show any error on the page! against boots
expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.errorTitle') expect(wrapper.vm.showPageMessage).toBe(false)
expect(wrapper.find('.test-message-subtitle').text()).toBe( expect(wrapper.find('.test-message-headline').exists()).toBe(false)
'error.unknown-error Unknown error.', expect(wrapper.find('.test-message-subtitle').exists()).toBe(false)
) expect(wrapper.find('.test-message-button').exists()).toBe(false)
expect(wrapper.find('.test-message-button').text()).toBe(
'site.register.message-button-text',
)
}) })
it('toasts the error message', () => { it('toasts the error message', () => {
expect(toastErrorSpy).toBeCalledWith('error.unknown-error Unknown error.') 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-row>
</b-container> </b-container>
<b-container v-else class="mt--8 p-1"> <b-container v-else class="mt--8 p-1">
<message <message :headline="$t('site.thx.title')" :subtitle="$t('site.thx.register')" />
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"
/>
</b-container> </b-container>
<!-- <!--
<div class="text-center pt-4"> <div class="text-center pt-4">
@ -214,7 +203,6 @@ export default {
language: '', language: '',
showPageMessage: false, showPageMessage: false,
submitted: false, submitted: false,
messageError: '',
publisherId: this.$store.state.publisherId, publisherId: this.$store.state.publisherId,
redeemCode: this.$route.params.code, redeemCode: this.$route.params.code,
CONFIG, CONFIG,
@ -246,30 +234,21 @@ export default {
}) })
.then(() => { .then(() => {
this.showPageMessage = true this.showPageMessage = true
this.success = true
}) })
.catch((error) => { .catch((error) => {
this.showPageMessage = true // don't show any error on the page! against boots
this.success = false let errorMessage
switch (error.message) { switch (error.message) {
case 'GraphQL error: User already exists.': case 'GraphQL error: User already exists.':
this.messageError = this.$t('error.user-already-exists') errorMessage = this.$t('error.user-already-exists')
break break
default: default:
this.messageError = this.$t('error.unknown-error') + error.message errorMessage = this.$t('error.unknown-error') + error.message
break 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: { computed: {
namesFilled() { namesFilled() {