diff --git a/src/app/modules/activities-management/services/activity.service.spec.ts b/src/app/modules/activities-management/services/activity.service.spec.ts index de5817160..3586f0ed4 100644 --- a/src/app/modules/activities-management/services/activity.service.spec.ts +++ b/src/app/modules/activities-management/services/activity.service.spec.ts @@ -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); }); diff --git a/src/app/modules/activities-management/services/activity.service.ts b/src/app/modules/activities-management/services/activity.service.ts index 9d1ce6734..adef6808f 100644 --- a/src/app/modules/activities-management/services/activity.service.ts +++ b/src/app/modules/activities-management/services/activity.service.ts @@ -1,3 +1,4 @@ +import { environment } from './../../../../environments/environment'; import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; @@ -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 { - return this.http.get(this.url); + return this.http.get(this.baseUrl); } } diff --git a/src/assets/activities.json b/src/assets/activities.json deleted file mode 100644 index 4282c8fd6..000000000 --- a/src/assets/activities.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "id": "1234-9873-9999", - "name": "Development", - "description": "Generic activity for developers" - }, - { - "id": "3444-2311-6655", - "name": "Meeting", - "description": "Any meeting on-line or on-site" - } -] diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 7b4f817ad..556ffe581 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -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' }; /*