@@ -3,10 +3,14 @@ import { BasicEntityGetter, DataCache, EntityGetter, EntityView, ServerError } f
33import { from , throwError } from "rxjs" ;
44import { FakeModel , FakeParams } from "../test/fake-model" ;
55
6+ const fake1 = { id : "1" , parentId : "parent-1" , state : "active" , name : "Fake1" } ;
7+ const fake2 = { id : "1" , parentId : "parent-1" , state : "running" , name : "Fake1" } ;
8+ const fake3 = { id : "1" , parentId : "parent-1" , state : "completed" , name : "Fake1" } ;
9+
610const data = [
711 { id : "1" , state : "active" , name : "Fake1" } ,
812 { id : "1" , state : "running" , name : "Fake1" } ,
9- { id : "1" , state : "complated " , name : "Fake1" } ,
13+ { id : "1" , state : "completed " , name : "Fake1" } ,
1014] ;
1115
1216describe ( "EntityView" , ( ) => {
@@ -30,7 +34,7 @@ describe("EntityView", () => {
3034 cache : ( ) => cache ,
3135 getter : getter ,
3236 } ) ;
33- view . params = { id : "1" } ;
37+ view . params = { parentId : "parent-1" , id : "1" } ;
3438 } ) ;
3539
3640 afterEach ( ( ) => {
@@ -43,68 +47,67 @@ describe("EntityView", () => {
4347 view . fetch ( ) ;
4448 tick ( ) ;
4549 expect ( dataSpy ) . toHaveBeenCalledTimes ( 1 ) ;
46- expect ( item ! . toJS ( ) ) . toEqual ( data [ 0 ] ) ;
47- expect ( dataSpy ) . toHaveBeenCalledWith ( { id : "1" } ) ;
50+ expect ( item ! . toJS ( ) ) . toEqual ( fake1 ) ;
51+ expect ( dataSpy ) . toHaveBeenCalledWith ( { parentId : "parent-1" , id : "1" } ) ;
4852 } ) ) ;
4953
5054 it ( "should use the cached value" , fakeAsync ( ( ) => {
51- cache . addItem ( new FakeModel ( { id : "1" , state : "creating" , name : "Fake1" } ) ) ;
55+ cache . addItem ( new FakeModel ( { id : "1" , parentId : "parent-1" , state : "creating" , name : "Fake1" } ) ) ;
5256
5357 view . item . subscribe ( x => item = x ) ;
5458 view . fetch ( ) ;
5559 expect ( item ) . not . toBeFalsy ( ) ;
56- expect ( item ! . toJS ( ) ) . toEqual ( { id : "1" , state : "creating" , name : "Fake1" } ) ;
60+ expect ( item ! . toJS ( ) ) . toEqual ( { id : "1" , parentId : "parent-1" , state : "creating" , name : "Fake1" } ) ;
5761
5862 tick ( ) ; // This should be the return from the fetched data
59- expect ( item ! . toJS ( ) ) . toEqual ( data [ 0 ] ) ;
63+ expect ( item ! . toJS ( ) ) . toEqual ( fake1 ) ;
6064 } ) ) ;
6165
6266 it ( "Update the data when refreshing" , fakeAsync ( ( ) => {
6367 view . item . subscribe ( x => item = x ) ;
6468 view . fetch ( ) ;
6569 tick ( ) ;
66- expect ( item ! . toJS ( ) ) . toEqual ( data [ 0 ] ) ;
70+ expect ( item ! . toJS ( ) ) . toEqual ( fake1 ) ;
6771
6872 view . refresh ( ) ;
6973 tick ( ) ;
70- expect ( item ! . toJS ( ) ) . toEqual ( data [ 1 ] ) ;
74+ expect ( item ! . toJS ( ) ) . toEqual ( fake2 ) ;
7175
7276 view . refresh ( ) ;
7377 tick ( ) ;
74- expect ( item ! . toJS ( ) ) . toEqual ( data [ 2 ] ) ;
78+ expect ( item ! . toJS ( ) ) . toEqual ( fake3 ) ;
7579 expect ( dataSpy ) . toHaveBeenCalledTimes ( 3 ) ;
7680 } ) ) ;
7781
7882 it ( "Update the params" , fakeAsync ( ( ) => {
7983 view . item . subscribe ( x => item = x ) ;
80- view . params = { id : "2" } ;
84+ view . params = { parentId : "parent-1" , id : "2" } ;
8185 view . fetch ( ) ;
8286 tick ( ) ;
83- expect ( item ! . toJS ( ) ) . toEqual ( data [ 0 ] ) ;
84- expect ( dataSpy ) . toHaveBeenCalledWith ( { id : "2" } ) ;
87+ expect ( item ! . toJS ( ) ) . toEqual ( fake1 ) ;
88+ expect ( dataSpy ) . toHaveBeenCalledWith ( { parentId : "parent-1" , id : "2" } ) ;
8589 } ) ) ;
8690
8791 it ( "Update the params" , fakeAsync ( ( ) => {
8892 view . item . subscribe ( x => item = x ) ;
89- view . params = { id : "2" } ;
93+ view . params = { parentId : "parent-1" , id : "2" } ;
9094 view . fetch ( ) ;
9195 tick ( ) ;
92- expect ( item ! . toJS ( ) ) . toEqual ( data [ 0 ] ) ;
93- expect ( dataSpy ) . toHaveBeenCalledWith ( { id : "2" } ) ;
96+ expect ( item ! . toJS ( ) ) . toEqual ( fake1 ) ;
97+ expect ( dataSpy ) . toHaveBeenCalledWith ( { parentId : "parent-1" , id : "2" } ) ;
9498 } ) ) ;
9599
96100 it ( "Update the cache should update the item" , fakeAsync ( ( ) => {
97101 view . item . subscribe ( x => item = x ) ;
98102 view . fetch ( ) ;
99103 tick ( ) ;
100- expect ( item ! . toJS ( ) ) . toEqual ( data [ 0 ] ) ;
101- expect ( item ) . toEqualImmutable ( new FakeModel ( data [ 0 ] ) ) ;
104+ expect ( item ! . toJS ( ) ) . toEqual ( fake1 ) ;
102105 expect ( dataSpy ) . toHaveBeenCalledTimes ( 1 ) ;
103- expect ( dataSpy ) . toHaveBeenCalledWith ( { id : "1" } ) ;
106+ expect ( dataSpy ) . toHaveBeenCalledWith ( { parentId : "parent-1" , id : "1" } ) ;
104107
105- cache . addItem ( new FakeModel ( data [ 2 ] ) ) ;
108+ cache . addItem ( new FakeModel ( { ... data [ 2 ] , parentId : "parent-1" } ) ) ;
106109 tick ( ) ;
107- expect ( item ! . toJS ( ) ) . toEqual ( data [ 2 ] ) ;
110+ expect ( item ! . toJS ( ) ) . toEqual ( fake3 ) ;
108111 } ) ) ;
109112
110113 describe ( "When it return a 404 error" , ( ) => {
@@ -115,7 +118,7 @@ describe("EntityView", () => {
115118 item = null ;
116119 deleted = null ;
117120 const responses = [
118- from ( Promise . resolve ( data [ 0 ] ) ) ,
121+ from ( Promise . resolve ( fake1 ) ) ,
119122 throwError ( new ServerError ( { status : 404 , message : "404 not found" } as any ) ) ,
120123 ] ;
121124 dataSpy = jasmine . createSpy ( "supplyDataSpy" )
@@ -130,7 +133,7 @@ describe("EntityView", () => {
130133 cache : ( ) => cache ,
131134 getter : getter ,
132135 } ) ;
133- view . params = { id : "1" } ;
136+ view . params = { parentId : "parent-1" , id : "1" } ;
134137 } ) ;
135138
136139 it ( "should not send to delete if loading for the first time and I get a 404" , fakeAsync ( ( ) => {
@@ -143,7 +146,7 @@ describe("EntityView", () => {
143146 cache : ( ) => cache ,
144147 getter : getter ,
145148 } ) ;
146- view . params = { id : "1" } ;
149+ view . params = { parentId : "parent-1" , id : "1" } ;
147150
148151 view . item . subscribe ( x => item = x ) ;
149152 view . deleted . subscribe ( ( x ) => deleted = x ) ;
@@ -158,7 +161,7 @@ describe("EntityView", () => {
158161 cache : ( ) => cache ,
159162 getter : getter ,
160163 } ) ;
161- otherView . params = { id : "1" } ;
164+ otherView . params = { parentId : "parent-1" , id : "1" } ;
162165
163166 view . item . subscribe ( x => item = x ) ;
164167 cache . deleted . subscribe ( x => deleted = x ) ;
@@ -184,7 +187,7 @@ describe("EntityView", () => {
184187 // expect(deleted).toBe(null);
185188
186189 // This fetch should return an 404 error
187- view . params = { id : "2" } ;
190+ view . params = { parentId : "parent-1" , id : "2" } ;
188191 view . fetch ( ) ;
189192 tick ( ) ;
190193
0 commit comments