Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,15 @@ describe('Activity Service', () => {
expect(httpClient).toBeTruthy();
}));

it('activities are read using GET from assets/activities.json URL', () => {
it('activities are read using GET from baseUrl', () => {
const activitiesFoundSize = activities.length;
service.baseUrl = 'foo';
service
.getActivities()
.subscribe(activitiesInResponse => {
expect(activitiesInResponse.length).toBe(activitiesFoundSize);
});
const getActivitiesRequest = httpMock.expectOne('assets/activities.json');
const getActivitiesRequest = httpMock.expectOne(service.baseUrl);
expect(getActivitiesRequest.request.method).toBe('GET');
getActivitiesRequest.flush(activities);
});
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { environment } from './../../../../environments/environment';
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
Expand All @@ -8,11 +9,11 @@ import { Activity } from '../../shared/models';
})
export class ActivityService {

url = 'assets/activities.json';
baseUrl = `${environment.timeTrackerApiUrl}/activities`;

constructor(private http: HttpClient) {}

getActivities(): Observable<Activity[]> {
return this.http.get<Activity[]>(this.url);
return this.http.get<Activity[]>(this.baseUrl);
}
}
12 changes: 0 additions & 12 deletions src/assets/activities.json

This file was deleted.

3 changes: 2 additions & 1 deletion src/environments/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
// The list of file replacements can be found in `angular.json`.

export const environment = {
production: false
production: false,
timeTrackerApiUrl: 'https://timetracker-api.azurewebsites.net'
};

/*
Expand Down