From e351e82129b0b6abc8ec6e4ff8dbd7086c4bb2c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 27 Apr 2022 09:51:53 +0200 Subject: [PATCH 01/17] Add NVM config files --- admin/.nvmrc | 1 + backend/.nvmrc | 1 + database/.nvmrc | 1 + frontend/.nvmrc | 1 + 4 files changed, 4 insertions(+) create mode 100644 admin/.nvmrc create mode 100644 backend/.nvmrc create mode 100644 database/.nvmrc create mode 100644 frontend/.nvmrc diff --git a/admin/.nvmrc b/admin/.nvmrc new file mode 100644 index 000000000..ce4572cce --- /dev/null +++ b/admin/.nvmrc @@ -0,0 +1 @@ +v17.9.0 \ No newline at end of file diff --git a/backend/.nvmrc b/backend/.nvmrc new file mode 100644 index 000000000..ce4572cce --- /dev/null +++ b/backend/.nvmrc @@ -0,0 +1 @@ +v17.9.0 \ No newline at end of file diff --git a/database/.nvmrc b/database/.nvmrc new file mode 100644 index 000000000..ce4572cce --- /dev/null +++ b/database/.nvmrc @@ -0,0 +1 @@ +v17.9.0 \ No newline at end of file diff --git a/frontend/.nvmrc b/frontend/.nvmrc new file mode 100644 index 000000000..ce4572cce --- /dev/null +++ b/frontend/.nvmrc @@ -0,0 +1 @@ +v17.9.0 \ No newline at end of file From fe4e87f5760bf2e708008bfffed8c2469df18d86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 28 Apr 2022 08:41:17 +0200 Subject: [PATCH 02/17] Add NVM config file as well for the main folder --- .nvmrc | 1 + 1 file changed, 1 insertion(+) create mode 100644 .nvmrc diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 000000000..ce4572cce --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +v17.9.0 \ No newline at end of file From 5496ab5a970d06a39fc7a4ed857aa02179373538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 28 Apr 2022 15:42:14 +0200 Subject: [PATCH 03/17] Ignore .nvmrc files in sub directories --- .gitignore | 1 + admin/.gitignore | 3 ++- backend/.gitignore | 3 ++- database/.gitignore | 3 ++- frontend/.gitignore | 3 ++- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b02b9d6ec..f771e49f4 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ package-lock.json /deployment/bare_metal/nginx/update-page/updating.html /deployment/bare_metal/log /deployment/bare_metal/backup +/.nvmrc diff --git a/admin/.gitignore b/admin/.gitignore index 6bb62f667..d78b066c1 100644 --- a/admin/.gitignore +++ b/admin/.gitignore @@ -9,4 +9,5 @@ dist/ coverage/ # emacs -*~ \ No newline at end of file +*~ +/.nvmrc diff --git a/backend/.gitignore b/backend/.gitignore index 147e82849..2381e9abc 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -5,4 +5,5 @@ package-json.lock coverage # emacs -*~ \ No newline at end of file +*~ +/.nvmrc diff --git a/database/.gitignore b/database/.gitignore index bce5da58f..d1bd69ed3 100644 --- a/database/.gitignore +++ b/database/.gitignore @@ -24,4 +24,5 @@ package-lock.json coverage/ -*~ \ No newline at end of file +*~ +/.nvmrc diff --git a/frontend/.gitignore b/frontend/.gitignore index b19667d17..2054a5cd5 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -23,4 +23,5 @@ package-lock.json coverage/ -*~ \ No newline at end of file +*~ +/.nvmrc From 833c8f64ecfc055bdfb93edcbc8488baa45ec2b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 28 Apr 2022 15:57:13 +0200 Subject: [PATCH 04/17] Revert "Add NVM config file as well for the main folder" This reverts commit fe4e87f5760bf2e708008bfffed8c2469df18d86. --- .nvmrc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .nvmrc diff --git a/.nvmrc b/.nvmrc deleted file mode 100644 index ce4572cce..000000000 --- a/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -v17.9.0 \ No newline at end of file From 715dfb56751917424bb4f443590342ceafa6368a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 28 Apr 2022 15:57:13 +0200 Subject: [PATCH 05/17] Revert "Add NVM config files" This reverts commit e351e82129b0b6abc8ec6e4ff8dbd7086c4bb2c4. --- admin/.nvmrc | 1 - backend/.nvmrc | 1 - database/.nvmrc | 1 - frontend/.nvmrc | 1 - 4 files changed, 4 deletions(-) delete mode 100644 admin/.nvmrc delete mode 100644 backend/.nvmrc delete mode 100644 database/.nvmrc delete mode 100644 frontend/.nvmrc diff --git a/admin/.nvmrc b/admin/.nvmrc deleted file mode 100644 index ce4572cce..000000000 --- a/admin/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -v17.9.0 \ No newline at end of file diff --git a/backend/.nvmrc b/backend/.nvmrc deleted file mode 100644 index ce4572cce..000000000 --- a/backend/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -v17.9.0 \ No newline at end of file diff --git a/database/.nvmrc b/database/.nvmrc deleted file mode 100644 index ce4572cce..000000000 --- a/database/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -v17.9.0 \ No newline at end of file diff --git a/frontend/.nvmrc b/frontend/.nvmrc deleted file mode 100644 index ce4572cce..000000000 --- a/frontend/.nvmrc +++ /dev/null @@ -1 +0,0 @@ -v17.9.0 \ No newline at end of file From bee388c07c047f4c9646b5d73c4a0509ddfe7d08 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 4 May 2022 10:46:23 +0200 Subject: [PATCH 06/17] fix: Reload Transaction Link List Always on Page 1 --- .../src/components/Transactions/TransactionLinkSummary.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/Transactions/TransactionLinkSummary.vue b/frontend/src/components/Transactions/TransactionLinkSummary.vue index c24410924..cbce57029 100644 --- a/frontend/src/components/Transactions/TransactionLinkSummary.vue +++ b/frontend/src/components/Transactions/TransactionLinkSummary.vue @@ -84,7 +84,11 @@ export default { this.visible = false } else { this.transactionLinks = [] - this.updateListTransactionLinks() + if (this.currentPage === 1) { + this.updateListTransactionLinks() + } else { + this.currentPage = 1 + } this.visible = true } }, From 0e6ed809e25b06e16f2ff925b55fd6c67ccd66c7 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 4 May 2022 10:55:11 +0200 Subject: [PATCH 07/17] test reopening after loading more links --- .../TransactionLinkSummary.spec.js | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js index b60cc60f8..370233c42 100644 --- a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js +++ b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js @@ -227,6 +227,36 @@ describe('TransactionLinkSummary', () => { fetchPolicy: 'network-only', }) }) + + describe('close transaction link list', () => { + beforeEach(async () => { + wrapper.find('div.transaction-link-details').trigger('click') + }) + describe('reopen transaction link list', () => { + beforeEach(async () => { + jest.clearAllMocks() + wrapper.find('div.transaction-link-details').trigger('click') + }) + + it('calls the API once', () => { + expect(apolloQueryMock).toBeCalledTimes(1) + }) + + it('calls the API with curren page one', () => { + expect(apolloQueryMock).toBeCalledWith({ + query: listTransactionLinks, + variables: { + currentPage: 1, + }, + fetchPolicy: 'network-only', + }) + }) + + it('has four transactionLinks', () => { + expect(wrapper.vm.transactionLinks).toHaveLength(4) + }) + }) + }) }) }) From 837f644e255acffe84397e298ccd885ceec107ed Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 4 May 2022 10:58:24 +0200 Subject: [PATCH 08/17] fix typo --- .../src/components/Transactions/TransactionLinkSummary.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js index 370233c42..ba07f7aff 100644 --- a/frontend/src/components/Transactions/TransactionLinkSummary.spec.js +++ b/frontend/src/components/Transactions/TransactionLinkSummary.spec.js @@ -242,7 +242,7 @@ describe('TransactionLinkSummary', () => { expect(apolloQueryMock).toBeCalledTimes(1) }) - it('calls the API with curren page one', () => { + it('calls the API with current page one', () => { expect(apolloQueryMock).toBeCalledWith({ query: listTransactionLinks, variables: { From d9bd562a7c3eb41811aa7d405cfd283da23c2ada Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 4 May 2022 11:06:11 +0200 Subject: [PATCH 09/17] update deployment docu --- deployment/bare_metal/setup.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/deployment/bare_metal/setup.md b/deployment/bare_metal/setup.md index f39228879..0cb6951d9 100644 --- a/deployment/bare_metal/setup.md +++ b/deployment/bare_metal/setup.md @@ -2,6 +2,9 @@ # This assums you have root access via ssh to your cleanly setup server # Furthermore this assumes you have debian (11 64bit) running +# Check your (Sub-)Domain with your Provider. +# In this document gddhost.tld refers to your chosen domain + > ssh root@gddhost.tld # change root default shell @@ -92,4 +95,5 @@ > nano .env >> Adjust values accordingly # TODO the install.sh is not yet ready to run directly - consider to use it as pattern to do it manually -> ./install.sh \ No newline at end of file +# The Github Secret is Created on Github in Settimgs -> Webhooks +> ./install.sh From e3fd388f920fec72aeec36801fd02469eccfcd2e Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Wed, 4 May 2022 11:09:11 +0200 Subject: [PATCH 10/17] change text order --- deployment/bare_metal/setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/bare_metal/setup.md b/deployment/bare_metal/setup.md index 0cb6951d9..f43a3d655 100644 --- a/deployment/bare_metal/setup.md +++ b/deployment/bare_metal/setup.md @@ -90,10 +90,10 @@ # Adjust .env # NOTE ';' can not be part of any value +# The Github Secret is Created on Github in Settimgs -> Webhooks > cd gradido/deployment/bare_metal > cp .env.dist .env > nano .env >> Adjust values accordingly # TODO the install.sh is not yet ready to run directly - consider to use it as pattern to do it manually -# The Github Secret is Created on Github in Settimgs -> Webhooks > ./install.sh From 264904e74109dd3798280ded2e6c8aa0fe30fa6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 5 May 2022 10:49:16 +0200 Subject: [PATCH 11/17] Avoid negation by changing showPageMessage into enterData after Alex suggestion --- frontend/src/pages/ForgotPassword.vue | 15 ++++++++++----- frontend/src/pages/Login.vue | 8 +++++++- frontend/src/pages/Register.vue | 5 ++++- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/frontend/src/pages/ForgotPassword.vue b/frontend/src/pages/ForgotPassword.vue index eea54427a..182df5bc3 100644 --- a/frontend/src/pages/ForgotPassword.vue +++ b/frontend/src/pages/ForgotPassword.vue @@ -13,7 +13,7 @@ - + @@ -75,6 +75,11 @@ export default { success: null, } }, + created() { + if (this.$route.params.comingFrom) { + this.subtitle = 'settings.password.resend_subtitle' + } + }, methods: { async onSubmit() { this.$apollo @@ -95,10 +100,10 @@ export default { }) }, }, - created() { - if (this.$route.params.comingFrom) { - this.subtitle = 'settings.password.resend_subtitle' - } + computed: { + enterData() { + return !this.showPageMessage + }, }, } diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue index 4cfd62e69..bda36a0d2 100755 --- a/frontend/src/pages/Login.vue +++ b/frontend/src/pages/Login.vue @@ -13,7 +13,7 @@ - + @@ -136,6 +136,7 @@ export default { this.toastError(this.$t('error.no-account')) } else { // appeared errors: 'GraphQL error: No user with this credentials' + // Wolle: avoid this error message! may be avoid in general? const errorMessage = this.$t('error.unknown-error') + error.message this.showPageMessage = true this.errorSubtitle = errorMessage @@ -146,5 +147,10 @@ export default { }) }, }, + computed: { + enterData() { + return !this.showPageMessage + }, + }, } diff --git a/frontend/src/pages/Register.vue b/frontend/src/pages/Register.vue index a41952030..d6b5f9dba 100755 --- a/frontend/src/pages/Register.vue +++ b/frontend/src/pages/Register.vue @@ -15,7 +15,7 @@ - + @@ -286,6 +286,9 @@ export default { disabled() { return !(this.namesFilled && this.emailFilled && this.form.agree && !!this.language) }, + enterData() { + return !this.showPageMessage + }, }, } From 6a1b8f0fd9d6638f7921dd0ae3e687a596da0d54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 5 May 2022 11:33:07 +0200 Subject: [PATCH 12/17] Avoid on page error message on Login - Have a translation for 'No user with this credentials'. --- frontend/src/locales/de.json | 1 + frontend/src/locales/en.json | 1 + frontend/src/pages/Login.spec.js | 41 +++++++++++++++++++------------- frontend/src/pages/Login.vue | 10 +++----- 4 files changed, 29 insertions(+), 24 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index ea288819f..6066ce04a 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -35,6 +35,7 @@ "error": "Fehler!", "no-account": "Leider konnten wir keinen (aktivierten) Account mit diesen Daten finden.", "no-transactionlist": "Es gab leider einen Fehler. Es wurden keine Transaktionen vom Server übermittelt.", + "no-user": "Kein Benutzer mit diesen Anmeldedaten.", "session-expired": "Die Sitzung wurde aus Sicherheitsgründen beendet.", "unknown-error": "Unbekanter Fehler: ", "user-already-exists": "Ein Benutzer mit diesen Daten existiert bereits." diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index f5e412086..5a0602098 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -35,6 +35,7 @@ "error": "Error!", "no-account": "Unfortunately we could not find an (activated) account to the given data.", "no-transactionlist": "Unfortunately, there was an error. No transactions have been sent from the server.", + "no-user": "No user with this credentials.", "session-expired": "The session was closed for security reasons.", "unknown-error": "Unknown error: ", "user-already-exists": "A user with this data already exists." diff --git a/frontend/src/pages/Login.spec.js b/frontend/src/pages/Login.spec.js index db11a036e..478266676 100644 --- a/frontend/src/pages/Login.spec.js +++ b/frontend/src/pages/Login.spec.js @@ -219,7 +219,7 @@ describe('Login', () => { describe('login fails with "User email not validated"', () => { beforeEach(async () => { - await createError('GraphQL error: User email not validated') + await createError('GraphQL error: User email not validated.') }) it('hides the spinner', () => { @@ -251,7 +251,7 @@ describe('Login', () => { describe('login fails with "User has no password set yet"', () => { beforeEach(async () => { - await createError('GraphQL error: User has no password set yet') + await createError('GraphQL error: User has no password set yet.') }) it('shows error title, subtitle, login button', () => { @@ -276,26 +276,33 @@ describe('Login', () => { }) }) + describe('login fails with "No user with this credentials"', () => { + beforeEach(async () => { + await createError('GraphQL error: No user with this credentials.') + }) + + it('shows no error message on the page', () => { + 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.no-user') + }) + }) + describe('login fails with an unknow error', () => { beforeEach(async () => { await createError(' – Unknow error') }) - 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( - 'error.unknown-error – Unknow error', - ) - expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset') - }) - - it('button link directs to "/forgot-password"', () => { - expect(wrapper.find('.test-message-button').attributes('href')).toBe('/forgot-password') - }) - - it.skip('click redirects to "/forgot-password"', () => { - // expect(mockRouterPush).toBeCalledWith('/forgot-password') + it('shows no error message on the page', () => { + 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', () => { diff --git a/frontend/src/pages/Login.vue b/frontend/src/pages/Login.vue index bda36a0d2..7544bdcf7 100755 --- a/frontend/src/pages/Login.vue +++ b/frontend/src/pages/Login.vue @@ -134,14 +134,10 @@ export default { this.errorSubtitle = this.$t('site.thx.unsetPassword') this.errorLinkTo = '/reset-password/login' this.toastError(this.$t('error.no-account')) + } else if (error.message.includes('No user with this credentials')) { + this.toastError(this.$t('error.no-user')) } else { - // appeared errors: 'GraphQL error: No user with this credentials' - // Wolle: avoid this error message! may be avoid in general? - const errorMessage = this.$t('error.unknown-error') + error.message - this.showPageMessage = true - this.errorSubtitle = errorMessage - this.errorLinkTo = '/forgot-password' - this.toastError(errorMessage) + this.toastError(this.$t('error.unknown-error') + error.message) } loader.hide() }) From 4a64d1aa2013eb561a4e0c01778367bb3fa31ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 5 May 2022 12:05:04 +0200 Subject: [PATCH 13/17] Avoid any error messages on the Register page, because of boots --- frontend/src/locales/de.json | 3 --- frontend/src/locales/en.json | 3 --- frontend/src/pages/Login.spec.js | 2 ++ frontend/src/pages/Login.vue | 2 ++ frontend/src/pages/Register.spec.js | 40 +++++++++-------------------- frontend/src/pages/Register.vue | 33 +++++------------------- 6 files changed, 22 insertions(+), 61 deletions(-) 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 @@ - - +