From 14ff40fb174a281628f4e95d6ffe5f69f2c6e498 Mon Sep 17 00:00:00 2001
From: Hannes Heine <hannes.heine@gmail.com>
Date: Wed, 11 Aug 2021 13:59:24 +0200
Subject: [PATCH] Rework after review. And store change so that we don't look
 at first_name and last_name but firstName and lastName

---
 frontend/src/store/store.js               |  4 +-
 frontend/src/store/store.test.js          |  4 +-
 frontend/src/views/Pages/Register.spec.js | 48 ++++++++++-------------
 3 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/frontend/src/store/store.js b/frontend/src/store/store.js
index 9b98645bd..03be5e75c 100644
--- a/frontend/src/store/store.js
+++ b/frontend/src/store/store.js
@@ -33,8 +33,8 @@ export const actions = {
     commit('email', data.user.email)
     commit('language', data.user.language)
     commit('username', data.user.username)
-    commit('firstName', data.user.first_name)
-    commit('lastName', data.user.last_name)
+    commit('firstName', data.user.firstName)
+    commit('lastName', data.user.lastName)
     commit('description', data.user.description)
   },
   logout: ({ commit, state }) => {
diff --git a/frontend/src/store/store.test.js b/frontend/src/store/store.test.js
index 4f276feec..a67dff5ce 100644
--- a/frontend/src/store/store.test.js
+++ b/frontend/src/store/store.test.js
@@ -72,8 +72,8 @@ describe('Vuex store', () => {
           email: 'someone@there.is',
           language: 'en',
           username: 'user',
-          first_name: 'Peter',
-          last_name: 'Lustig',
+          firstName: 'Peter',
+          lastName: 'Lustig',
           description: 'Nickelbrille',
         },
       }
diff --git a/frontend/src/views/Pages/Register.spec.js b/frontend/src/views/Pages/Register.spec.js
index aa1df3833..00dd0a2f6 100644
--- a/frontend/src/views/Pages/Register.spec.js
+++ b/frontend/src/views/Pages/Register.spec.js
@@ -124,13 +124,14 @@ describe('Register', () => {
         wrapper.find('input[name="site.signup.agree"]').setChecked(true)
       })
 
-      it('trigger reset button', async () => {
+      it('resets the form data after clicking the reset button', async () => {
         await wrapper.find('button.ml-2').trigger('click')
         await flushPromises()
-        expect(wrapper.find('#registerFirstname').text()).toBe('')
-        expect(wrapper.find('#registerLastname').text()).toBe('')
-        expect(wrapper.find('#Email-input-field').text()).toBe('')
-        expect(wrapper.find('input[name="form.password"]').text()).toBe('')
+        expect(wrapper.find('#registerFirstname').element.value).toBe('')
+        expect(wrapper.find('#registerLastname').element.value).toBe('')
+        expect(wrapper.find('#Email-input-field').element.value).toBe('')
+        // TODO: expect(wrapper.find('input[name="form.password"]').element.value).toBe('') or .toBe('Aa123456')
+        expect(wrapper.find('input[name="site.signup.agree"]').props.checked).not.toBeTruthy()
       })
     })
 
@@ -144,30 +145,27 @@ describe('Register', () => {
       })
 
       describe('server sends back error', () => {
-        beforeEach(() => {
-          resgisterUserQueryMock.mockRejectedValue({ message: 'error' })
-        })
-        it('shows error message', async () => {
+        beforeEach(async () => {
+          resgisterUserQueryMock.mockRejectedValue({ message: 'Ouch!' })
           await wrapper.find('form').trigger('submit')
           await flushPromises()
-          expect(wrapper.vm.messageError).toBe('error')
-          expect(wrapper.vm.showError).toBeTruthy()
-          expect(wrapper.find('span.alert-text').exists()).toBeTruthy()
-          expect(wrapper.find('span.alert-text').text().length !== 0).toBeTruthy()
         })
 
-        it('dissmiss error message', async () => {
-          await wrapper.find('form').trigger('submit')
-          await flushPromises()
+        it('shows error message', () => {
+          expect(wrapper.find('span.alert-text').exists()).toBeTruthy()
+          expect(wrapper.find('span.alert-text').text().length !== 0).toBeTruthy()
+          expect(wrapper.find('span.alert-text').text()).toContain('error.error!')
+          expect(wrapper.find('span.alert-text').text()).toContain('Ouch!')
+        })
+
+        it('button to dismisses error message is present', () => {
           expect(wrapper.find('button.close').exists()).toBeTruthy()
+        })
+
+        it('dismisses error message', async () => {
           await wrapper.find('button.close').trigger('click')
           await flushPromises()
-          expect(wrapper.vm.showError).toBe(false)
-          expect(wrapper.vm.messageError).toBe('')
-          expect(wrapper.vm.form.email).toBe('')
-          expect(wrapper.vm.form.firstname).toBe('')
-          expect(wrapper.vm.form.lastname).toBe('')
-          expect(wrapper.vm.form.password.password).toBe('')
+          expect(wrapper.find('span.alert-text').exists()).not.toBeTruthy()
         })
       })
 
@@ -180,7 +178,7 @@ describe('Register', () => {
           })
         })
 
-        it('rout to "/thx/register"', async () => {
+        it('routes to "/thx/register"', async () => {
           await wrapper.find('form').trigger('submit')
           await flushPromises()
           expect(resgisterUserQueryMock).toBeCalledWith(
@@ -193,10 +191,6 @@ describe('Register', () => {
               },
             }),
           )
-          expect(wrapper.vm.form.email).toBe('')
-          expect(wrapper.vm.form.firstname).toBe('')
-          expect(wrapper.vm.form.lastname).toBe('')
-          expect(wrapper.vm.form.password.password).toBe('')
           expect(routerPushMock).toHaveBeenCalledWith('/thx/register')
         })
       })