Skip to content

feat: TTA-83 Improve Admins Validation in Frontend #918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Aug 12, 2022
+33,219 −324
Merged

feat: TTA-83 Improve Admins Validation in Frontend #918

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
55d9da6
fix: TTA-83 improve admin validation
jimmyjaramillo Jun 30, 2022
4250cbf
fix: TTA-83 improve admin validation
jimmyjaramillo Jun 30, 2022
d0911f4
feat TTA-83: frontend admin validation
Jul 27, 2022
c695593
fix TTA-83: fixing conflicts
Jul 27, 2022
3f691c4
fix TTA-83: Returning to login functions to subscribe
Jul 27, 2022
c56d61c
fix TTA-83: Fixing login component tests
Jul 27, 2022
1ccac53
fix TTA-83: Sonarcloud fix
Jul 27, 2022
24d945e
fix TTA-83: Adding legacy login
Aug 5, 2022
b461870
fix TTA-83: fixing tests
Aug 5, 2022
912fc06
Tta 83 solving conflicts (#912)
Aug 5, 2022
5348352
Update TTA 83 Branch (#913)
Aug 5, 2022
0602127
second try of merge from master (#914)
rodolfoIOET Aug 8, 2022
beb2798
Updating TTA-83 branch
Aug 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix TTA-83: Fixing login component tests
  • Loading branch information
Rodrigo Lins committed Jul 27, 2022
commit c56d61cde98e97329c8fcc18b1ffc183a8e730c6
37 changes: 15 additions & 22 deletions src/app/modules/login/login.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,11 @@ describe('LoginComponent', () => {
spyOn(azureAdB2CService, 'signIn').and.returnValue(of(() => {}));
spyOn(featureToggleCookiesService, 'setCookies').and.returnValue(featureToggleCookiesService.setCookies());

component.login().toPromise()
.then(result => {
expect(azureAdB2CService.signIn).toHaveBeenCalled();
expect(azureAdB2CService.setCookies).toHaveBeenCalled();
expect(featureToggleCookiesService.setCookies).toHaveBeenCalled();
});
component.login();

expect(azureAdB2CService.signIn).toHaveBeenCalled();
expect(azureAdB2CService.setCookies).toHaveBeenCalled();
expect(featureToggleCookiesService.setCookies).toHaveBeenCalled();
}));

it('should sign up or login with google if is not logged-in into the app Locally', inject([Router], (router: Router) => {
Expand All @@ -108,32 +107,26 @@ describe('LoginComponent', () => {
spyOn(featureToggleCookiesService, 'setCookies').and.returnValue(featureToggleCookiesService.setCookies());

component.ngOnInit();
component.loginWithGoogle().toPromise()
.then(result => {
expect(loginService.signIn).toHaveBeenCalled();
expect(loginService.setCookies).toHaveBeenCalled();
expect(featureToggleCookiesService.setCookies).toHaveBeenCalled();
});
component.loginWithGoogle();

expect(loginService.signIn).toHaveBeenCalled();
expect(loginService.setCookies).toHaveBeenCalled();
expect(featureToggleCookiesService.setCookies).toHaveBeenCalled();
}));

it('should not sign-up or login with google if is already logged-in into the app on Production', inject([Router], (router: Router) => {
spyOn(azureAdB2CService, 'isLogin').and.returnValue(of(true));
spyOn(router, 'navigate').and.stub();
component.login().toPromise()
.then(result => {
expect(azureAdB2CService.isLogin).toHaveBeenCalled();
expect(router.navigate).toHaveBeenCalledWith(['']);
});
component.login();
expect(azureAdB2CService.isLogin).toHaveBeenCalled();
expect(router.navigate).toHaveBeenCalledWith(['']);
}));

it('should not sign-up or login with google if is already logged-in into the app Locally', inject([Router], (router: Router) => {
spyOn(loginService, 'isLogin').and.returnValue(of(true));
spyOn(router, 'navigate').and.stub();
component.loginWithGoogle().toPromise()
.then(result => {
expect(loginService.isLogin).toHaveBeenCalled();
expect(router.navigate).toHaveBeenCalledWith(['']);
});
component.loginWithGoogle();
expect(loginService.isLogin).toHaveBeenCalled();
expect(router.navigate).toHaveBeenCalledWith(['']);
}));
});