@@ -19,6 +19,7 @@ describe('EventService', () => {
1919 } ) ;
2020
2121 eventService = injector . get < EventService > ( EventService ) ;
22+ eventService . currentDate = new Date ( '01-02-2019' ) ;
2223 httpMock = injector . get ( HttpTestingController ) ;
2324 } ) ;
2425
@@ -30,19 +31,20 @@ describe('EventService', () => {
3031 } ) ;
3132
3233 describe ( '#events' , ( ) => {
33- let events : Event [ ] ;
34+ let upcomingEvents : Event [ ] ;
35+ let pastEvents : Event [ ] ;
3436 let testData : EventResponse [ ] ;
3537
3638 beforeEach ( ( ) => {
3739 testData = getTestEventResponse ( ) ;
3840 httpMock . expectOne ( { } ) . flush ( testData ) ;
39- eventService . upcomingEvents . subscribe ( results => ( events = results ) ) ;
40- eventService . pastEvents . subscribe ( results => ( events = results ) ) ;
41+ eventService . upcomingEvents$ . subscribe ( results => ( upcomingEvents = results ) ) ;
42+ eventService . pastEvents$ . subscribe ( results => ( pastEvents = results ) ) ;
4143 } ) ;
4244
4345 it ( 'upcomingEvents observable should complete' , ( ) => {
4446 let completed = false ;
45- eventService . upcomingEvents . subscribe (
47+ eventService . upcomingEvents$ . subscribe (
4648 undefined ,
4749 undefined ,
4850 ( ) => ( completed = true )
@@ -52,14 +54,37 @@ describe('EventService', () => {
5254
5355 it ( 'pastEvents observable should complete' , ( ) => {
5456 let completed = false ;
55- eventService . pastEvents . subscribe (
57+ eventService . pastEvents$ . subscribe (
5658 undefined ,
5759 undefined ,
5860 ( ) => ( completed = true )
5961 ) ;
6062 expect ( completed ) . toBe ( true , 'observable completed' ) ;
6163 } ) ;
6264
65+ describe ( 'upcoming events' , ( ) => {
66+ it ( 'should emit' , ( ) => {
67+ expect ( upcomingEvents . length ) . toEqual ( 3 )
68+ } ) ;
69+
70+ it ( 'should correct set the date range' , ( ) => {
71+ expect ( upcomingEvents [ 0 ] . dateRangeString ) . toEqual ( 'January 1 - 3, 2019' ) ;
72+ expect ( upcomingEvents [ 1 ] . dateRangeString ) . toEqual ( 'April 1, 2019' ) ;
73+ expect ( upcomingEvents [ 2 ] . dateRangeString ) . toEqual ( 'April 2, 2019' ) ;
74+ } ) ;
75+ } ) ;
76+
77+ describe ( 'past events' , ( ) => {
78+ it ( 'should emit' , ( ) => {
79+ expect ( pastEvents . length ) . toEqual ( 2 )
80+ } ) ;
81+
82+ it ( 'should correct set the date range' , ( ) => {
83+ expect ( pastEvents [ 0 ] . dateRangeString ) . toEqual ( 'June 28 - July 1, 2018' ) ;
84+ expect ( pastEvents [ 1 ] . dateRangeString ) . toEqual ( 'December 25, 2018 - January 1, 2019' ) ;
85+ } ) ;
86+ } ) ;
87+
6388 // it('should reshape the contributor json to expected result', () => {
6489 // const groupNames = contribs.map(g => g.name).join(',');
6590 // expect(groupNames).toEqual('Angular,GDE');
0 commit comments