IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1933-auth-footer-is-not-on-one-level

Browse Source
This commit is contained in:
Alexander Friedland 2022-05-30 07:39:02 +02:00 committed by GitHub
commit 57ddd8ab77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/src/pages/Register.spec.js
View File

@ -68,15 +68,6 @@ describe('Register', () => {
expect(wrapper.find('#Email-input-field').exists()).toBe(true)
})
it('has Language selected field', () => {
expect(wrapper.find('.selectedLanguage').exists()).toBe(true)
})
it('selects Language value en', async () => {
wrapper.find('.selectedLanguage').findAll('option').at(1).setSelected()
expect(wrapper.find('.selectedLanguage').element.value).toBe('en')
})
it('has 1 checkbox input fields', () => {
expect(wrapper.find('#registerCheckbox').exists()).toBe(true)
})
@ -114,7 +105,6 @@ describe('Register', () => {
beforeEach(() => {
wrapper.find('#registerFirstname').setValue('Max')
wrapper.find('#registerLastname').setValue('Mustermann')
wrapper.find('.language-switch-select').findAll('option').at(1).setSelected()
})
it('has disabled submit button when missing input checked box', () => {
wrapper.find('#Email-input-field').setValue('max.mustermann@gradido.net')
@ -132,7 +122,6 @@ describe('Register', () => {
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()
})
@ -241,7 +230,6 @@ describe('Register', () => {
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()
await wrapper.find('form').trigger('submit')
await flushPromises()

17
frontend/src/pages/Register.vue
View File

@ -61,11 +61,7 @@
</b-col>
</b-row>
<b-row>
<b-col sm="12" md="6"><input-email v-model="form.email"></input-email></b-col>
<b-col sm="12" md="6">
<label>{{ $t('language') }}</label>
<language-switch-select @update-language="updateLanguage" />
</b-col>
<b-col><input-email v-model="form.email"></input-email></b-col>
</b-row>
<b-row class="mt-4 mb-4">
@ -103,13 +99,11 @@
import { createUser } from '@/graphql/mutations'
import CONFIG from '@/config'
import InputEmail from '@/components/Inputs/InputEmail.vue'
import LanguageSwitchSelect from '@/components/LanguageSwitchSelect.vue'
import Message from '@/components/Message/Message'
export default {
components: {
InputEmail,
LanguageSwitchSelect,
Message,
},
name: 'Register',
@ -121,7 +115,6 @@ export default {
email: '',
agree: false,
},
language: '',
showPageMessage: false,
submitted: false,
publisherId: this.$store.state.publisherId,
@ -130,10 +123,6 @@ export default {
}
},
methods: {
updateLanguage(e) {
this.language = e
this.$store.commit('language', this.language)
},
getValidationState({ dirty, validated, valid = null }) {
return dirty || validated ? valid : null
},
@ -148,7 +137,7 @@ export default {
email: this.form.email,
firstName: this.form.firstname,
lastName: this.form.lastname,
language: this.language,
language: this.$store.state.language,
publisherId: this.$store.state.publisherId,
redeemCode: this.redeemCode,
},
@ -183,7 +172,7 @@ export default {
return this.form.email !== ''
},
disabled() {
return !(this.namesFilled && this.emailFilled && this.form.agree && !!this.language)
return !(this.namesFilled && this.emailFilled && this.form.agree)
},
enterData() {
return !this.showPageMessage