@@ -17,7 +17,7 @@ describe('EntryService', () => {
17
17
service = TestBed . inject ( EntryService ) ;
18
18
httpMock = TestBed . inject ( HttpTestingController ) ;
19
19
service . baseUrl = 'time-entries' ;
20
- reportsUrl = service . urlInProductionLegacy ? service . baseUrl : service . baseUrl + '/report' ;
20
+ reportsUrl = service . urlInProductionLegacy ? service . baseUrl : service . baseUrl + '/report/ ' ;
21
21
} ) ;
22
22
23
23
it ( 'services are ready to be used' , inject (
@@ -36,22 +36,22 @@ describe('EntryService', () => {
36
36
expect ( response . length ) . toBe ( 1 ) ;
37
37
} ) ;
38
38
39
- const createEntryRequest = httpMock . expectOne ( service . baseUrl ) ;
39
+ const createEntryRequest = httpMock . expectOne ( ` ${ service . baseUrl } /` ) ;
40
40
expect ( createEntryRequest . request . method ) . toBe ( 'POST' ) ;
41
41
createEntryRequest . flush ( entry ) ;
42
42
} ) ;
43
43
44
44
it ( 'loads an activeEntry with /running' , ( ) => {
45
45
service . loadActiveEntry ( ) . subscribe ( ) ;
46
46
47
- const loadEntryRequest = httpMock . expectOne ( `${ service . baseUrl } /running` ) ;
47
+ const loadEntryRequest = httpMock . expectOne ( `${ service . baseUrl } /running/ ` ) ;
48
48
expect ( loadEntryRequest . request . method ) . toBe ( 'GET' ) ;
49
49
} ) ;
50
50
51
51
it ( 'loads summary with get /summary?time_offset=<time-offset>' , ( ) => {
52
52
service . summary ( ) . subscribe ( ) ;
53
53
const timeOffset = new Date ( ) . getTimezoneOffset ( ) ;
54
- const loadEntryRequest = httpMock . expectOne ( `${ service . baseUrl } /summary?time_offset=${ timeOffset } ` ) ;
54
+ const loadEntryRequest = httpMock . expectOne ( `${ service . baseUrl } /summary/ ?time_offset=${ timeOffset } ` ) ;
55
55
expect ( loadEntryRequest . request . method ) . toBe ( 'GET' ) ;
56
56
} ) ;
57
57
@@ -62,7 +62,7 @@ describe('EntryService', () => {
62
62
const timezoneOffset = new Date ( ) . getTimezoneOffset ( ) ;
63
63
service . loadEntries ( { year, month } ) . subscribe ( ) ;
64
64
65
- const loadEntryRequest = httpMock . expectOne ( `${ service . baseUrl } ?month=${ month } &year=${ year } &timezone_offset=${ timezoneOffset } ` ) ;
65
+ const loadEntryRequest = httpMock . expectOne ( `${ service . baseUrl } / ?month=${ month } &year=${ year } &timezone_offset=${ timezoneOffset } ` ) ;
66
66
expect ( loadEntryRequest . request . method ) . toBe ( 'GET' ) ;
67
67
68
68
} ) ;
@@ -89,15 +89,15 @@ describe('EntryService', () => {
89
89
service . urlInProductionLegacy = true ;
90
90
service . stopEntryRunning ( 'id' ) . subscribe ( ) ;
91
91
92
- const updateEntryRequest = httpMock . expectOne ( `${ service . baseUrl } /id/stop` ) ;
92
+ const updateEntryRequest = httpMock . expectOne ( `${ service . baseUrl } /id/stop/ ` ) ;
93
93
expect ( updateEntryRequest . request . method ) . toBe ( 'POST' ) ;
94
94
} ) ;
95
95
96
96
it ( 'stops an entry using PUT' , ( ) => {
97
97
service . urlInProductionLegacy = false ;
98
98
service . stopEntryRunning ( 'id' ) . subscribe ( ) ;
99
99
100
- const updateEntryRequest = httpMock . expectOne ( `${ service . baseUrl } /stop` ) ;
100
+ const updateEntryRequest = httpMock . expectOne ( `${ service . baseUrl } /stop/ ` ) ;
101
101
expect ( updateEntryRequest . request . method ) . toBe ( 'PUT' ) ;
102
102
} ) ;
103
103
@@ -153,7 +153,7 @@ describe('EntryService', () => {
153
153
154
154
service . findEntriesByProjectId ( projectId ) . subscribe ( ) ;
155
155
156
- const restartEntryRequest = httpMock . expectOne ( `${ service . baseUrl } ?limit=2&project_id=${ projectId } &start_date=${ startDate } &end_date=${ endDate } ` ) ;
156
+ const restartEntryRequest = httpMock . expectOne ( `${ service . baseUrl } / ?limit=2&project_id=${ projectId } &start_date=${ startDate } &end_date=${ endDate } ` ) ;
157
157
expect ( restartEntryRequest . request . method ) . toBe ( 'GET' ) ;
158
158
} ) ;
159
159
0 commit comments