@@ -17,7 +17,7 @@ describe('EntryService', () => {
1717 service = TestBed . inject ( EntryService ) ;
1818 httpMock = TestBed . inject ( HttpTestingController ) ;
1919 service . baseUrl = 'time-entries' ;
20- reportsUrl = service . urlInProductionLegacy ? service . baseUrl : service . baseUrl + '/report' ;
20+ reportsUrl = service . urlInProductionLegacy ? service . baseUrl : service . baseUrl + '/report/ ' ;
2121 } ) ;
2222
2323 it ( 'services are ready to be used' , inject (
@@ -36,22 +36,22 @@ describe('EntryService', () => {
3636 expect ( response . length ) . toBe ( 1 ) ;
3737 } ) ;
3838
39- const createEntryRequest = httpMock . expectOne ( service . baseUrl ) ;
39+ const createEntryRequest = httpMock . expectOne ( ` ${ service . baseUrl } /` ) ;
4040 expect ( createEntryRequest . request . method ) . toBe ( 'POST' ) ;
4141 createEntryRequest . flush ( entry ) ;
4242 } ) ;
4343
4444 it ( 'loads an activeEntry with /running' , ( ) => {
4545 service . loadActiveEntry ( ) . subscribe ( ) ;
4646
47- const loadEntryRequest = httpMock . expectOne ( `${ service . baseUrl } /running` ) ;
47+ const loadEntryRequest = httpMock . expectOne ( `${ service . baseUrl } /running/ ` ) ;
4848 expect ( loadEntryRequest . request . method ) . toBe ( 'GET' ) ;
4949 } ) ;
5050
5151 it ( 'loads summary with get /summary?time_offset=<time-offset>' , ( ) => {
5252 service . summary ( ) . subscribe ( ) ;
5353 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 } ` ) ;
5555 expect ( loadEntryRequest . request . method ) . toBe ( 'GET' ) ;
5656 } ) ;
5757
@@ -62,7 +62,7 @@ describe('EntryService', () => {
6262 const timezoneOffset = new Date ( ) . getTimezoneOffset ( ) ;
6363 service . loadEntries ( { year, month } ) . subscribe ( ) ;
6464
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 } ` ) ;
6666 expect ( loadEntryRequest . request . method ) . toBe ( 'GET' ) ;
6767
6868 } ) ;
@@ -89,15 +89,15 @@ describe('EntryService', () => {
8989 service . urlInProductionLegacy = true ;
9090 service . stopEntryRunning ( 'id' ) . subscribe ( ) ;
9191
92- const updateEntryRequest = httpMock . expectOne ( `${ service . baseUrl } /id/stop` ) ;
92+ const updateEntryRequest = httpMock . expectOne ( `${ service . baseUrl } /id/stop/ ` ) ;
9393 expect ( updateEntryRequest . request . method ) . toBe ( 'POST' ) ;
9494 } ) ;
9595
9696 it ( 'stops an entry using PUT' , ( ) => {
9797 service . urlInProductionLegacy = false ;
9898 service . stopEntryRunning ( 'id' ) . subscribe ( ) ;
9999
100- const updateEntryRequest = httpMock . expectOne ( `${ service . baseUrl } /stop` ) ;
100+ const updateEntryRequest = httpMock . expectOne ( `${ service . baseUrl } /stop/ ` ) ;
101101 expect ( updateEntryRequest . request . method ) . toBe ( 'PUT' ) ;
102102 } ) ;
103103
@@ -153,7 +153,7 @@ describe('EntryService', () => {
153153
154154 service . findEntriesByProjectId ( projectId ) . subscribe ( ) ;
155155
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 } ` ) ;
157157 expect ( restartEntryRequest . request . method ) . toBe ( 'GET' ) ;
158158 } ) ;
159159
0 commit comments