Skip to content

Commit 22412ae

Browse files
committed
1 parent 9050d02 commit 22412ae

File tree

4 files changed

+8
-17
lines changed

4 files changed

+8
-17
lines changed

src/app/modules/activities-management/services/activity.service.spec.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,15 @@ describe('Activity Service', () => {
2828
expect(httpClient).toBeTruthy();
2929
}));
3030

31-
it('activities are read using GET from assets/activities.json URL', () => {
31+
it('activities are read using GET from baseUrl', () => {
3232
const activitiesFoundSize = activities.length;
33+
service.baseUrl = 'foo';
3334
service
3435
.getActivities()
3536
.subscribe(activitiesInResponse => {
3637
expect(activitiesInResponse.length).toBe(activitiesFoundSize);
3738
});
38-
const getActivitiesRequest = httpMock.expectOne('assets/activities.json');
39+
const getActivitiesRequest = httpMock.expectOne(service.baseUrl);
3940
expect(getActivitiesRequest.request.method).toBe('GET');
4041
getActivitiesRequest.flush(activities);
4142
});

src/app/modules/activities-management/services/activity.service.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { environment } from './../../../../environments/environment';
12
import { Injectable } from '@angular/core';
23
import { HttpClient } from '@angular/common/http';
34
import { Observable } from 'rxjs';
@@ -8,11 +9,11 @@ import { Activity } from '../../shared/models';
89
})
910
export class ActivityService {
1011

11-
url = 'assets/activities.json';
12+
baseUrl = `${environment.timeTrackerApiUrl}/activities`;
1213

1314
constructor(private http: HttpClient) {}
1415

1516
getActivities(): Observable<Activity[]> {
16-
return this.http.get<Activity[]>(this.url);
17+
return this.http.get<Activity[]>(this.baseUrl);
1718
}
1819
}

src/assets/activities.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/environments/environment.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
// The list of file replacements can be found in `angular.json`.
44

55
export const environment = {
6-
production: false
6+
production: false,
7+
timeTrackerApiUrl: 'https://timetracker-api.azurewebsites.net'
78
};
89

910
/*

0 commit comments

Comments
 (0)