test: TT-155 modify test expectations

Author: thegreatyamori

src/app/modules/reports/components/time-entries-table/time-entries-table.component.spec.ts

@@ -21,7 +21,7 @@ describe('Reports Page', () => {
       description: 'any comment',
       uri: 'custom uri',
       project_id: '123',
-      project_name: 'Time-Tracker'
+      project_name: 'Time-Tracker',
     };
 
     const state: EntryState = {
@@ -33,38 +33,41 @@ describe('Reports Page', () => {
       timeEntriesSummary: null,
       timeEntriesDataSource: {
         data: [timeEntry],
-        isLoading: false
+        isLoading: false,
       },
       reportDataSource: {
         data: [timeEntry],
-        isLoading: false
-      }
+        isLoading: false,
+      },
     };
 
-    beforeEach(waitForAsync(() => {
-      TestBed.configureTestingModule({
-        imports: [],
-        declarations: [TimeEntriesTableComponent, SubstractDatePipe],
-        providers: [provideMockStore({ initialState: state })],
-      }).compileComponents();
-      store = TestBed.inject(MockStore);
-
-    }));
+    beforeEach(
+      waitForAsync(() => {
+        TestBed.configureTestingModule({
+          imports: [],
+          declarations: [TimeEntriesTableComponent, SubstractDatePipe],
+          providers: [provideMockStore({ initialState: state })],
+        }).compileComponents();
+        store = TestBed.inject(MockStore);
+      })
+    );
 
-    beforeEach(waitForAsync(() => {
-      fixture = TestBed.createComponent(TimeEntriesTableComponent);
-      component = fixture.componentInstance;
-      store.setState(state);
-      getReportDataSourceSelectorMock = store.overrideSelector(getReportDataSource, state.reportDataSource);
-      fixture.detectChanges();
-    }));
+    beforeEach(
+      waitForAsync(() => {
+        fixture = TestBed.createComponent(TimeEntriesTableComponent);
+        component = fixture.componentInstance;
+        store.setState(state);
+        getReportDataSourceSelectorMock = store.overrideSelector(getReportDataSource, state.reportDataSource);
+        fixture.detectChanges();
+      })
+    );
 
     it('component should be created', async () => {
       expect(component).toBeTruthy();
     });
 
     it('on success load time entries, the report should be populated', () => {
-      component.reportDataSource$.subscribe(ds => {
+      component.reportDataSource$.subscribe((ds) => {
         expect(ds.data).toEqual(state.reportDataSource.data);
       });
     });
@@ -78,16 +81,20 @@ describe('Reports Page', () => {
 
     fit('when the uri starts with http or https it should return true and open the url in a new tab', () => {
       const uriExpected = 'http://customuri.com';
+      spyOn(component, 'isValidUri').and.returnValue(true);
       spyOn(window, 'open');
-      const isValidUri = uriExpected.startsWith('http' || 'https');
-      expect(isValidUri).toBeTrue();
-      expect(window.open).toHaveBeenCalled();
+
+      expect(component.isLinkExternal(uriExpected)).not.toEqual('');
+      expect(window.open).toHaveBeenCalledWith(uriExpected, '_blank');
+      expect(component.isValidUri).toHaveBeenCalled();
     });
 
     it('when the uri starts without http or https it should return false and not navigate or open a new tab', () => {
       const uriExpected = timeEntry.uri;
-      const isValidUri = uriExpected.startsWith('http' || 'https');
-      expect(isValidUri).toBeFalse();
+      spyOn(component, 'isValidUri').and.returnValue(false);
+
+      expect(component.isLinkExternal(uriExpected)).toEqual('');
+      expect(component.isValidUri).toHaveBeenCalled();
     });
 
     afterEach(() => {

src/app/modules/reports/components/time-entries-table/time-entries-table.component.ts

@@ -86,12 +86,11 @@ export class TimeEntriesTableComponent implements OnInit, OnDestroy, AfterViewIn
     }
   }
 
-  isLinkExternal(uri: string) {
+  isLinkExternal(uri: string): WindowProxy | string {
     return this.isValidUri(uri) ? window.open(uri, '_blank') : '';
   }
 
   isValidUri(uri: string) {
     return uri.startsWith('http' || 'https');
   }
-
 }