IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-01-20 20:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change code after Alex review suggestions

Browse Source
This commit is contained in:
Wolfgang Huß 2022-05-02 10:14:29 +02:00
parent d7ae0bc3b8
commit f22b391557
5 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/Message/Message.spec.js
View File

@ -27,7 +27,7 @@ describe('Message', () => {
})
it('renders the component', () => {
expect(wrapper.find('div.header').exists()).toBeTruthy()
expect(wrapper.find('div.header').exists()).toBe(true)
})
it('renders title, subtitle, and button text', () => {

11
frontend/src/components/Message/Message.vue
View File

@ -7,9 +7,9 @@
<p class="h4 test-message-subtitle">{{ subtitle }}</p>
<hr />
<b-button
v-if="buttonText && (linkTo || callback)"
v-if="showButton()"
class="test-message-button"
:to="linkTo ? linkTo + (code ? `/${code}` : '') : null"
:to="buttonLinkTo()"
@click="optionalCallback()"
>
{{ buttonText }}
@ -29,6 +29,7 @@ export default {
buttonText: { type: String, required: false, default: null },
linkTo: { type: String, required: false, default: null },
callback: { type: Function, required: false, default: null },
code: { type: String, required: false, default: null },
},
methods: {
optionalCallback() {
@ -36,6 +37,12 @@ export default {
this.callback()
}
},
showButton() {
return this.buttonText && (this.linkTo || this.callback)
},
buttonLinkTo() {
return this.linkTo ? this.linkTo + (this.code ? `/${this.code}` : '') : null
},
},
}
</script>

8
frontend/src/pages/ForgotPassword.spec.js
View File

@ -47,7 +47,7 @@ describe('ForgotPassword', () => {
})
it('renders the component', () => {
expect(wrapper.find('div.forgot-password').exists()).toBeTruthy()
expect(wrapper.find('div.forgot-password').exists()).toBe(true)
})
it('has a title', () => {
@ -84,7 +84,7 @@ describe('ForgotPassword', () => {
})
it('has a submit button', () => {
expect(form.find('button[type="submit"]').exists()).toBeTruthy()
expect(form.find('button[type="submit"]').exists()).toBe(true)
})
describe('invalid Email', () => {
@ -118,7 +118,7 @@ describe('ForgotPassword', () => {
})
it('shows error title, subtitle, login button', () => {
expect(wrapper.vm.showPageMessage).toBeTruthy()
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.email-already-sent')
expect(wrapper.find('.test-message-button').text()).toBe('login')
@ -153,7 +153,7 @@ describe('ForgotPassword', () => {
})
it('shows success title, subtitle, login button', () => {
expect(wrapper.vm.showPageMessage).toBeTruthy()
expect(wrapper.vm.showPageMessage).toBe(true)
expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title')
expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.email')
expect(wrapper.find('.test-message-button').text()).toBe('login')

16
frontend/src/pages/Login.spec.js
View File

@ -59,7 +59,7 @@ describe('Login', () => {
})
it('renders the Login form', () => {
expect(wrapper.find('div.login-form').exists()).toBeTruthy()
expect(wrapper.find('div.login-form').exists()).toBe(true)
})
describe('Login header', () => {
@ -102,19 +102,19 @@ describe('Login', () => {
describe('Login form', () => {
it('has a login form', () => {
expect(wrapper.find('form').exists()).toBeTruthy()
expect(wrapper.find('form').exists()).toBe(true)
})
it('has an Email input field', () => {
expect(wrapper.find('input[placeholder="Email"]').exists()).toBeTruthy()
expect(wrapper.find('input[placeholder="Email"]').exists()).toBe(true)
})
it('has an Password input field', () => {
expect(wrapper.find('input[placeholder="form.password"]').exists()).toBeTruthy()
expect(wrapper.find('input[placeholder="form.password"]').exists()).toBe(true)
})
it('has a Submit button', () => {
expect(wrapper.find('button[type="submit"]').exists()).toBeTruthy()
expect(wrapper.find('button[type="submit"]').exists()).toBe(true)
})
})
@ -227,7 +227,7 @@ describe('Login', () => {
})
it('shows error title, subtitle, login button', () => {
expect(wrapper.vm.showPageMessage).toBeTruthy()
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('site.thx.activateEmail')
expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset')
@ -255,7 +255,7 @@ describe('Login', () => {
})
it('shows error title, subtitle, login button', () => {
expect(wrapper.vm.showPageMessage).toBeTruthy()
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('site.thx.unsetPassword')
expect(wrapper.find('.test-message-button').text()).toBe('settings.password.reset')
@ -282,7 +282,7 @@ describe('Login', () => {
})
it('shows error title, subtitle, login button', () => {
expect(wrapper.vm.showPageMessage).toBeTruthy()
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',

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

@ -50,7 +50,7 @@ describe('Register', () => {
})
it('renders the Register form', () => {
expect(wrapper.find('div#registerform').exists()).toBeTruthy()
expect(wrapper.find('div#registerform').exists()).toBe(true)
})
describe('Register header', () => {
@ -94,22 +94,22 @@ describe('Register', () => {
describe('Register form', () => {
it('has a register form', () => {
expect(wrapper.find('form').exists()).toBeTruthy()
expect(wrapper.find('form').exists()).toBe(true)
})
it('has firstname input fields', () => {
expect(wrapper.find('#registerFirstname').exists()).toBeTruthy()
expect(wrapper.find('#registerFirstname').exists()).toBe(true)
})
it('has lastname input fields', () => {
expect(wrapper.find('#registerLastname').exists()).toBeTruthy()
expect(wrapper.find('#registerLastname').exists()).toBe(true)
})
it('has email input fields', () => {
expect(wrapper.find('#Email-input-field').exists()).toBeTruthy()
expect(wrapper.find('#Email-input-field').exists()).toBe(true)
})
it('has Language selected field', () => {
expect(wrapper.find('.selectedLanguage').exists()).toBeTruthy()
expect(wrapper.find('.selectedLanguage').exists()).toBe(true)
})
it('selects Language value en', async () => {
@ -118,7 +118,7 @@ describe('Register', () => {
})
it('has 1 checkbox input fields', () => {
expect(wrapper.find('#registerCheckbox').exists()).toBeTruthy()
expect(wrapper.find('#registerCheckbox').exists()).toBe(true)
})
it('has PublisherId input fields', () => {
@ -235,7 +235,7 @@ describe('Register', () => {
})
it('shows success title, subtitle, login button', () => {
expect(wrapper.vm.showPageMessage).toBeTruthy()
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(
@ -250,7 +250,7 @@ describe('Register', () => {
it('click calls "solveError"', async () => {
wrapper.find('.test-message-button').trigger('click')
await wrapper.vm.$nextTick()
expect(wrapper.vm.showPageMessage).not.toBeTruthy()
expect(wrapper.vm.showPageMessage).toBe(false)
})
})
@ -260,7 +260,7 @@ describe('Register', () => {
})
it('shows success title, subtitle, login button', () => {
expect(wrapper.vm.showPageMessage).toBeTruthy()
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.',
@ -277,7 +277,7 @@ describe('Register', () => {
it('click calls "solveError"', async () => {
wrapper.find('.test-message-button').trigger('click')
await wrapper.vm.$nextTick()
expect(wrapper.vm.showPageMessage).not.toBeTruthy()
expect(wrapper.vm.showPageMessage).toBe(false)
})
})
})
@ -308,13 +308,13 @@ describe('Register', () => {
})
it('shows success title, subtitle', () => {
expect(wrapper.vm.showPageMessage).toBeTruthy()
expect(wrapper.vm.showPageMessage).toBe(true)
expect(wrapper.find('.test-message-headline').text()).toBe('site.thx.title')
expect(wrapper.find('.test-message-subtitle').text()).toBe('site.thx.register')
})
it('button is not present', () => {
expect(wrapper.find('.test-message-button')).toBeTruthy()
expect(wrapper.find('.test-message-button').exists()).toBe(false)
})
})
})