merge conflict

2018-02-25 22:12:16 +01:00
parent 67ab31c458 16d2548b99
commit ce5724c11f
6 changed files with 37 additions and 40 deletions
--- a/src/app/components/home/home.component.spec.ts
+++ b/src/app/components/home/home.component.spec.ts
@@ -29,6 +29,6 @@ describe('HomeComponent', () => {

  it('should render title in a h1 tag', async(() => {
    const compiled = fixture.debugElement.nativeElement;
-    expect(compiled.querySelector('h1').textContent).toBeTruthy();
+    expect(compiled.querySelector('h1').textContent).toContain('PAGES.HOME.TITLE');
  }));
 });