mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 01:54:15 +00:00
Merge remote-tracking branch 'atmire/w2p-97298_issue-3281_self-register-issue-7.2' into w2p-97298_issue-3281_self-register-issue-main
# Conflicts: # src/app/register-email-form/register-email-form.component.spec.ts
This commit is contained in:
@@ -89,15 +89,6 @@ describe('RegisterEmailFormComponent', () => {
|
|||||||
const elem = fixture.debugElement.queryAll(By.css('input#email'))[0].nativeElement;
|
const elem = fixture.debugElement.queryAll(By.css('input#email'))[0].nativeElement;
|
||||||
expect(elem).toBeDefined();
|
expect(elem).toBeDefined();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should not retrieve the validDomains for TYPE_REQUEST_FORGOT', () => {
|
|
||||||
spyOn(configurationDataService, 'findByPropertyName');
|
|
||||||
comp.typeRequest = TYPE_REQUEST_FORGOT;
|
|
||||||
|
|
||||||
comp.ngOnInit();
|
|
||||||
|
|
||||||
expect(configurationDataService.findByPropertyName).not.toHaveBeenCalledWith('authentication-password.domain.valid');
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
describe('email validation', () => {
|
describe('email validation', () => {
|
||||||
it('should be invalid when no email is present', () => {
|
it('should be invalid when no email is present', () => {
|
||||||
@@ -111,6 +102,18 @@ describe('RegisterEmailFormComponent', () => {
|
|||||||
comp.form.patchValue({email: 'valid@email.org'});
|
comp.form.patchValue({email: 'valid@email.org'});
|
||||||
expect(comp.form.invalid).toBeFalse();
|
expect(comp.form.invalid).toBeFalse();
|
||||||
});
|
});
|
||||||
|
it('should accept email with other domain names on TYPE_REQUEST_FORGOT form', () => {
|
||||||
|
spyOn(configurationDataService, 'findByPropertyName').and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
|
||||||
|
name: 'authentication-password.domain.valid',
|
||||||
|
values: ['marvel.com'],
|
||||||
|
})));
|
||||||
|
comp.typeRequest = TYPE_REQUEST_FORGOT;
|
||||||
|
|
||||||
|
comp.ngOnInit();
|
||||||
|
|
||||||
|
comp.form.patchValue({ email: 'valid@email.org' });
|
||||||
|
expect(comp.form.invalid).toBeFalse();
|
||||||
|
});
|
||||||
it('should be valid when uppercase letters are used', () => {
|
it('should be valid when uppercase letters are used', () => {
|
||||||
comp.form.patchValue({email: 'VALID@email.org'});
|
comp.form.patchValue({email: 'VALID@email.org'});
|
||||||
expect(comp.form.invalid).toBeFalse();
|
expect(comp.form.invalid).toBeFalse();
|
||||||
|
Reference in New Issue
Block a user