@@ -12,20 +12,32 @@ describe('limit-database', () => {
1212 enabled : true ,
1313 allowDelay : false
1414 }
15- await db . save ( toAdd )
15+ const id = await db . save ( toAdd )
1616 let all : timer . limit . Rule [ ] = await db . all ( )
1717 expect ( all . length ) . toEqual ( 1 )
18- expect ( all [ 0 ] ) . toEqual ( { ...toAdd , latestDate : "" , wasteTime : 0 } )
18+ let saved = all [ 0 ]
19+ expect ( saved . cond ) . toEqual ( toAdd . cond )
20+ expect ( saved . time ) . toEqual ( toAdd . time )
21+ expect ( saved . name ) . toEqual ( toAdd . name )
22+ expect ( saved . enabled ) . toEqual ( toAdd . enabled )
23+ expect ( saved . allowDelay ) . toEqual ( toAdd . allowDelay )
1924 const toRewrite = {
25+ id,
26+ name : 'hahah' ,
2027 cond : [ '123' ] ,
2128 time : 21 ,
2229 enabled : true ,
2330 allowDelay : false
2431 }
2532 // Not rewrite
26- const id = await db . save ( toRewrite )
33+ await db . save ( toRewrite )
2734 all = await db . all ( )
28- expect ( all [ 0 ] ) . toEqual ( { ...toAdd , latestDate : "" , wasteTime : 0 } )
35+ saved = all [ 0 ]
36+ expect ( saved . cond ) . toEqual ( toAdd . cond )
37+ expect ( saved . time ) . toEqual ( toAdd . time )
38+ expect ( saved . name ) . toEqual ( toAdd . name )
39+ expect ( saved . enabled ) . toEqual ( toAdd . enabled )
40+ expect ( saved . allowDelay ) . toEqual ( toAdd . allowDelay )
2941
3042 await db . remove ( id )
3143
@@ -39,7 +51,7 @@ describe('limit-database', () => {
3951 enabled : true ,
4052 allowDelay : false ,
4153 } )
42- const id2 = await db . save ( {
54+ await db . save ( {
4355 cond : [ "*.b.com" ] ,
4456 time : 20 ,
4557 enabled : true ,
@@ -69,38 +81,22 @@ describe('limit-database', () => {
6981 allowDelay : false ,
7082 enabled : false
7183 }
72- const id1 = await db . save ( cond1 )
73- const id2 = await db . save ( cond2 )
84+ await db . save ( cond1 )
85+ await db . save ( cond2 )
7486 const data2Import = await db . storage . get ( )
75- // Set new empty
76- data2Import [ "__timer__LIMIT" ] [ "cond3" ] = { }
7787
7888 // clear
7989 storage . local . clear ( )
8090 expect ( await db . all ( ) ) . toEqual ( [ ] )
8191
82- // cond1 exists
83- await db . save ( { ...cond1 , enabled : false } )
84- await db . updateWaste ( "20220606" , { [ id1 ] : 10 } )
85-
8692 await db . importData ( data2Import )
8793 const imported = await db . all ( )
88- // Exists
89- const cond1After = imported . find ( a => a . cond ?. includes ( "cond1" ) )
90- expect ( cond1After ?. latestDate ) . toEqual ( "20220606" )
91- expect ( cond1After ?. wasteTime ) . toEqual ( 10 )
92- expect ( cond1After ?. enabled ) . toBeFalsy ( )
93- // Not exists
94+
9495 const cond2After = imported . find ( a => a . cond ?. includes ( "cond2" ) )
9596 expect ( ! ! cond2After ?. latestDate ) . toBeFalsy ( )
9697 expect ( ! ! cond2After ?. wasteTime ) . toBeFalsy ( )
9798 expect ( cond2After ?. allowDelay ) . toEqual ( cond2 . allowDelay )
9899 expect ( cond2After ?. enabled ) . toEqual ( cond2 . enabled )
99- // Not complete
100- const cond3After = imported . find ( a => a . cond ?. includes ( "cond3" ) )
101- expect ( cond3After . time ) . toBeUndefined ( )
102- expect ( cond3After . enabled ) . toBeFalsy ( )
103- expect ( cond3After . allowDelay ) . toBeFalsy ( )
104100 } )
105101
106102 test ( "import data2" , async ( ) => {
@@ -127,6 +123,6 @@ describe('limit-database', () => {
127123 expect ( all . length ) . toEqual ( 1 )
128124 const item = all [ 0 ]
129125 expect ( item . allowDelay ) . toBeTruthy ( )
130- expect ( item . cond ) . toEqual ( "cond1" )
126+ expect ( item . cond ) . toEqual ( [ "cond1" ] )
131127 } )
132128} )
0 commit comments