From 99fbeb3ca55e86d730498c99c6054959e9b8f76d Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 09:14:13 +0100 Subject: [PATCH 01/10] Button ist hell wenn nicht aktiv, und blau wenn aktiv --- frontend/src/views/Pages/Register.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 070d80bb9..5c42f0103 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -164,7 +164,8 @@ {{ $t('signup') }} From 733f66018bc01e6ed4bd60f3350cfdb0895fb4ce Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 09:14:32 +0100 Subject: [PATCH 02/10] yarn lint fix --- frontend/src/views/Pages/Register.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 5c42f0103..58ad7d4cd 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -164,8 +164,11 @@ {{ $t('signup') }} From 26bbc88d87665ae35759cdca5f5c2c7da351f098 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 11:03:58 +0100 Subject: [PATCH 03/10] add computed variable disabled --- frontend/src/views/Pages/Register.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index 58ad7d4cd..db5a7b4f6 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -162,10 +162,9 @@ From 3af4935fbc5fe57ecf9f6649d74dd0b69621d7cf Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 11:04:34 +0100 Subject: [PATCH 04/10] yarn lint fix --- frontend/src/views/Pages/Register.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frontend/src/views/Pages/Register.vue b/frontend/src/views/Pages/Register.vue index db5a7b4f6..37c28ed54 100755 --- a/frontend/src/views/Pages/Register.vue +++ b/frontend/src/views/Pages/Register.vue @@ -164,10 +164,7 @@ {{ $t('signup') }} From a5489ebb15d845f5e9db16834ac8c494f64ad9ba Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 12:03:41 +0100 Subject: [PATCH 05/10] test submit buttion have attributes disabled --- frontend/src/views/Pages/Register.spec.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index 56f97549d..433781ce9 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -221,14 +221,16 @@ describe('Register', () => { 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').trigger('click') }) 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"]').disabled).toBeFalsy() }) describe('server sends back error', () => { From 7e351e67992c1612fe80344da065e0f7b6948a7a Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 12:04:36 +0100 Subject: [PATCH 06/10] yarn lint fix --- frontend/src/views/Pages/Register.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index 433781ce9..20f8c704b 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -229,7 +229,7 @@ describe('Register', () => { }) it('has enabled submit button when completely filled', async () => { - await wrapper.vm.$nextTick() + await wrapper.vm.$nextTick() expect(wrapper.find('button[type="submit"]').disabled).toBeFalsy() }) From 473ea3b92de40b2d54504663f0f0908c54f27850 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 12:29:09 +0100 Subject: [PATCH 07/10] if form completely filled .attributes('disabled')).toBe(undefined) --- frontend/src/views/Pages/Register.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index 20f8c704b..a9b983440 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -221,7 +221,7 @@ describe('Register', () => { 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').trigger('click') + wrapper.find('#registerCheckbox').setChecked() }) it('commits publisherId to store', () => { @@ -230,7 +230,7 @@ describe('Register', () => { it('has enabled submit button when completely filled', async () => { await wrapper.vm.$nextTick() - expect(wrapper.find('button[type="submit"]').disabled).toBeFalsy() + expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe(undefined) }) describe('server sends back error', () => { From 48b3f26a1776a8216e316a69283558cefe444c1a Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 13:07:28 +0100 Subject: [PATCH 08/10] more test for submit button function --- frontend/src/views/Pages/Register.spec.js | 41 ++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index a9b983440..ca89fc72a 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -214,7 +214,46 @@ describe('Register', () => { }) */ - describe('API calls', () => { + describe('API calls when form is missing', () => { + + it('has disabled submit button when missing checked box', () => { + 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') + }) + expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled') + }) + + it('has disabled submit button when missing email 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') + 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') From 0256ab937b7a097a9e66152cee2769566d5b989b Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 13:07:59 +0100 Subject: [PATCH 09/10] yarn lint fix --- frontend/src/views/Pages/Register.spec.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index ca89fc72a..85646ea61 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -215,7 +215,6 @@ describe('Register', () => { */ describe('API calls when form is missing', () => { - it('has disabled submit button when missing checked box', () => { beforeEach(() => { wrapper.find('#registerFirstname').setValue('Max') From 793e10683e11c63346750468967ce7f993638c96 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Jan 2022 13:15:04 +0100 Subject: [PATCH 10/10] refactor tests for submit button beforeEach --- frontend/src/views/Pages/Register.spec.js | 26 +++++++++-------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js index 85646ea61..1a966e5b6 100644 --- a/frontend/src/views/Pages/Register.spec.js +++ b/frontend/src/views/Pages/Register.spec.js @@ -214,26 +214,20 @@ describe('Register', () => { }) */ - describe('API calls when form is missing', () => { - it('has disabled submit button when missing checked box', () => { - 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') - }) + 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', () => { - 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') - wrapper.find('#registerCheckbox').setChecked() - }) + wrapper.find('#registerCheckbox').setChecked() expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled') }) })