Merge 294693e into 41e7533

src/app/message/message.component.spec.ts

@@ -3,6 +3,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MessageComponent } from './message.component';
 import { ChatService } from '../services/chat.service';
 import { ToastrModule } from 'ngx-toastr';
+import {By} from '@angular/platform-browser';
 
 describe('MessageComponent', () => {
   let component: MessageComponent;
@@ -26,4 +27,18 @@ describe('MessageComponent', () => {
   it('should be created', () => {
     expect(component).toBeTruthy();
   });
+
+  it('should remove message (case a)', () => {
+    component.messageContent = '';
+    component.removeMessage();
+    expect(By.css('#toastr-container'));
+  });
+
+  it('should remove message (case b)', () => {
+    component.messageContent = 'a';
+    component.isOwnMessage = true;
+    component.removeMessage();
+    expect(By.css('#toastr-container'));
+    expect(component.messageContent === '');
+  });
 });

src/app/settings/settings.component.spec.ts

@@ -1,36 +1,82 @@
-
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { SettingsComponent } from './settings.component';
-import { FormsModule } from '@angular/forms';
-import { ChatService } from '../services/chat.service';
-import { NgSelectModule } from '@ng-select/ng-select';
-import { ToastrService, ToastrModule } from 'ngx-toastr';
-import { RouterTestingModule } from '@angular/router/testing';
-import {By} from '@angular/platform-browser';
-
-describe('SettingsComponent', () => {
-
-  let component: SettingsComponent;
-  let fixture: ComponentFixture<SettingsComponent>;
-  let spy: any;
-
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ SettingsComponent ],
-      imports: [ FormsModule , ToastrModule.forRoot(), NgSelectModule, RouterTestingModule ],
-      providers: [ ChatService , ToastrService ]
-    })
-    .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(SettingsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-});
+
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SettingsComponent } from './settings.component';
+import { FormsModule } from '@angular/forms';
+import { ChatService } from '../services/chat.service';
+import { NgSelectModule } from '@ng-select/ng-select';
+import { ToastrService, ToastrModule } from 'ngx-toastr';
+import { RouterTestingModule } from '@angular/router/testing';
+import {By} from '@angular/platform-browser';
+
+describe('SettingsComponent', () => {
+
+  let component: SettingsComponent;
+  let fixture: ComponentFixture<SettingsComponent>;
+  let spy: any;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ SettingsComponent ],
+      imports: [ FormsModule , ToastrModule.forRoot(), NgSelectModule, RouterTestingModule ],
+      providers: [ ChatService , ToastrService ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SettingsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should display input error (add)', () => {
+
+    spy = spyOn(component.chat, 'addFriend').and.callFake(function(friend) {
+      return null;
+    });
+
+    component.webIdAddFriend = 'test';
+    component.addFriend();
+    expect(!By.css('#toastr-container'));
+
+    component.webIdAddFriend = null;
+    component.addFriend();
+    expect(By.css('#toastr-container'));
+
+    component.webIdAddFriend = '';
+    component.addFriend();
+    expect(By.css('#toastr-container'));
+  });
+
+  it('should display input error (remove)', () => {
+
+    spy = spyOn(component.chat, 'removeFriend').and.callFake(function(friend) {
+      return null;
+    });
+
+    component.webIdRemoveFriend = 'test';
+    component.removeFriend();
+    expect(!By.css('#toastr-container'));
+
+    component.webIdRemoveFriend = null;
+    component.removeFriend();
+    expect(By.css('#toastr-container'));
+
+    component.webIdRemoveFriend = '';
+    component.removeFriend();
+    expect(By.css('#toastr-container'));
+
+  });
+
+  it('should click intro', () => {
+    component.webIdAddFriend = null;
+    component.handleSubmit({keyCode: 13});
+    expect(By.css('#toastr-container'));
+  });
+
+});

src/app/settings/settings.component.ts

@@ -18,7 +18,7 @@ export class SettingsComponent implements OnInit {
   urlAddedFriend: string;
   customProviderUrl: string;
 
-  constructor(private chat: ChatService, private toastr: ToastrService, private auth: AuthService, private sdv: Router) { }
+  constructor(public chat: ChatService, private toastr: ToastrService, private auth: AuthService, private sdv: Router) { }
 
   ngOnInit() {
     this.identityProviders = this.auth.getIdentityProviders();