Merge branch 'master' into fix_config_default_reset_password

This commit is contained in:
Moriz Wahl 2022-04-05 14:33:29 +02:00 committed by GitHub
commit 7dbf8fe010
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions

View File

@ -224,7 +224,7 @@ export default {
},
},
created() {
this.form.email = this.recipientEmail ? this.recipientEmail : ''
this.form.email = this.recipientEmail ? this.recipientEmail : this.form.email
},
}
</script>

View File

@ -85,10 +85,9 @@ describe('Send', () => {
})
it('restores the previous data in the formular', () => {
/* expect(wrapper.find('#input-group-1').find('input').vm.$el.value).toBe(
expect(wrapper.find('#input-group-1').find('input').vm.$el.value).toBe(
'user@example.org',
)
*/
expect(wrapper.find('#input-group-2').find('input').vm.$el.value).toBe('23.45')
expect(wrapper.find('#input-group-3').find('textarea').vm.$el.value).toBe(
'Make the best of it!',