2 files changed, 42 insertions, 10 deletions

diff --git a/Timeline/ClientApp/src/app/user/user-login-success/user-login-success.component.spec.ts b/Timeline/ClientApp/src/app/user/user-login-success/user-login-success.component.spec.ts
index ba015ae6..1efbb5c7 100644
--- a/Timeline/ClientApp/src/app/user/user-login-success/user-login-success.component.spec.ts
+++ b/Timeline/ClientApp/src/app/user/user-login-success/user-login-success.component.spec.ts
@@ -1,20 +1,39 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { ActivatedRoute } from '@angular/router';
+
+import { MockActivatedRoute } from 'src/app/test-utilities/activated-route.mock';
+import { createMockInternalUserService } from '../internal-user-service/internal-user.service.mock';
 
 import { UserLoginSuccessComponent } from './user-login-success.component';
-import { By } from '@angular/platform-browser';
+import { InternalUserService } from '../internal-user-service/internal-user.service';
+
 
 describe('UserLoginSuccessComponent', () => {
   let component: UserLoginSuccessComponent;
   let fixture: ComponentFixture<UserLoginSuccessComponent>;
 
+  let mockInternalUserService: jasmine.SpyObj<InternalUserService>;
+  let mockActivatedRoute: MockActivatedRoute;
+
   const mockUserInfo = {
     username: 'crupest',
     roles: ['superman', 'coder']
   };
 
   beforeEach(async(() => {
+    mockInternalUserService = createMockInternalUserService();
+    mockActivatedRoute = new MockActivatedRoute();
+
+    // mock currentUserInfo property. because it only has a getter so cast it to any first.
+    (<any>mockInternalUserService).currentUserInfo = mockUserInfo;
+
     TestBed.configureTestingModule({
-      declarations: [UserLoginSuccessComponent]
+      declarations: [UserLoginSuccessComponent],
+      providers: [
+        { provide: InternalUserService, useValue: mockInternalUserService },
+        { provide: ActivatedRoute, useValue: mockActivatedRoute }
+      ]
     })
       .compileComponents();
   }));
@@ -22,18 +41,29 @@ describe('UserLoginSuccessComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(UserLoginSuccessComponent);
     component = fixture.componentInstance;
-    component.userInfo = mockUserInfo;
-    fixture.detectChanges();
   });
 
   it('should create', () => {
+    fixture.detectChanges();
     expect(component).toBeTruthy();
   });
 
-  it('should work well', () => {
+  it('user info should work well', () => {
+    fixture.detectChanges();
+
+    expect((fixture.debugElement.query(By.css('p.login-success-message')))).toBeFalsy();
+
     expect((fixture.debugElement.query(By.css('span.username')).nativeElement as HTMLSpanElement).textContent)
       .toBe(mockUserInfo.username);
     expect((fixture.debugElement.query(By.css('span.roles')).nativeElement as HTMLSpanElement).textContent)
       .toBe(mockUserInfo.roles.join(', '));
   });
+
+  it('login success message should display well', () => {
+    mockActivatedRoute.pushSnapshotWithParamMap({ reason: 'login' });
+
+    fixture.detectChanges();
+
+    expect((fixture.debugElement.query(By.css('p.login-success-message')))).toBeTruthy();
+  });
 });
diff --git a/Timeline/ClientApp/src/app/user/user-login-success/user-login-success.component.ts b/Timeline/ClientApp/src/app/user/user-login-success/user-login-success.component.ts
index 99de5970..48e331d6 100644
--- a/Timeline/ClientApp/src/app/user/user-login-success/user-login-success.component.ts
+++ b/Timeline/ClientApp/src/app/user/user-login-success/user-login-success.component.ts
@@ -1,5 +1,8 @@
 import { Component, OnInit, Input } from '@angular/core';
-import { UserInfo } from '../user-info';
+import { ActivatedRoute } from '@angular/router';
+
+import { UserInfo } from '../entities';
+import { InternalUserService } from '../internal-user-service/internal-user.service';
 
 @Component({
   selector: 'app-user-login-success',
@@ -8,15 +11,14 @@ import { UserInfo } from '../user-info';
 })
 export class UserLoginSuccessComponent implements OnInit {
 
-  @Input()
   displayLoginSuccessMessage = false;
 
-  @Input()
   userInfo: UserInfo;
 
-  constructor() { }
+  constructor(private route: ActivatedRoute, private userService: InternalUserService) { }
 
   ngOnInit() {
+    this.userInfo = this.userService.currentUserInfo;
+    this.displayLoginSuccessMessage = this.route.snapshot.paramMap.get('reason') === 'login';
   }
-
 }