diff --git a/admin/src/components/NavBar.vue b/admin/src/components/NavBar.vue index afc9b9507..9103b56e6 100644 --- a/admin/src/components/NavBar.vue +++ b/admin/src/components/NavBar.vue @@ -2,7 +2,7 @@
- ... + ... diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 1af76e4df..5e59e3af0 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -120,7 +120,6 @@ "overview": "Übersicht", "privacy_policy": "Datenschutzerklärung", "publisher": { - "infoNoRegister": "Dies ist für die Registrieung nicht nötig.", "infoText": "Wenn dir dein Empfehlungsgeber seine Publisher-Id gegeben hat, trage sie hier ein, sonst lass das Feld bitte unverändert!", "publisherId": "Publisher-Id" }, diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 71ce6f9ef..d30d16717 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -120,7 +120,6 @@ "overview": "Overview", "privacy_policy": "Privacy policy", "publisher": { - "infoNoRegister": "This is not necessary for registration.", "infoText": "If your referrer has given you his publisher id, enter it here, otherwise leave the field unchanged!", "publisherId": "PublisherID" }, diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index 56f97549d..1a966e5b6 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -214,21 +214,55 @@ describe('Register', () => { }) */ - describe('API calls', () => { + describe('API calls when form is missing input', () => { + beforeEach(() => { + wrapper.find('#registerFirstname').setValue('Max') + wrapper.find('#registerLastname').setValue('Mustermann') + wrapper.find('.language-switch-select').findAll('option').at(1).setSelected() + wrapper.find('#publisherid').setValue('12345') + }) + it('has disabled submit button when missing input checked box', () => { + wrapper.find('#Email-input-field').setValue('max.mustermann@gradido.net') + expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled') + }) + + it('has disabled submit button when missing email input', () => { + wrapper.find('#registerCheckbox').setChecked() + expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled') + }) + }) + + describe('API calls when completely filled and missing publisherid', () => { + beforeEach(() => { + wrapper.find('#registerFirstname').setValue('Max') + wrapper.find('#registerLastname').setValue('Mustermann') + wrapper.find('#Email-input-field').setValue('max.mustermann@gradido.net') + wrapper.find('.language-switch-select').findAll('option').at(1).setSelected() + wrapper.find('#registerCheckbox').setChecked() + }) + it('has enabled submit button when completely filled', async () => { + await wrapper.vm.$nextTick() + expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe(undefined) + }) + }) + + describe('API calls when completely filled', () => { beforeEach(() => { wrapper.find('#registerFirstname').setValue('Max') wrapper.find('#registerLastname').setValue('Mustermann') wrapper.find('#Email-input-field').setValue('max.mustermann@gradido.net') wrapper.find('.language-switch-select').findAll('option').at(1).setSelected() wrapper.find('#publisherid').setValue('12345') + wrapper.find('#registerCheckbox').setChecked() }) it('commits publisherId to store', () => { expect(mockStoreCommit).toBeCalledWith('publisherId', 12345) }) - it('has enabled submit button when completely filled', () => { - expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled') + it('has enabled submit button when completely filled', async () => { + await wrapper.vm.$nextTick() + expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe(undefined) }) describe('server sends back error', () => { diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 070d80bb9..389efc68a 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -145,7 +145,6 @@ class="text-center mt-1 shadow-lg p-3 mb-5 rounded" > {{ $t('publisher.infoText') }} - {{ $t('publisher.infoNoRegister') }}
@@ -162,9 +161,9 @@ {{ $t('signup') }} @@ -268,6 +267,9 @@ export default { emailFilled() { return this.form.email !== '' }, + disabled() { + return !(this.namesFilled && this.emailFilled && this.form.agree && !!this.language) + }, }, }