55 provinceRegex ,
66 regencyRegex ,
77} from './helper/data-regex' ;
8- import { expectIdFromMongo , getEncodedSymbols } from './helper/utils' ;
8+ import { getEncodedSymbols } from './helper/utils' ;
99
1010describe ( 'District (e2e)' , ( ) => {
1111 const baseUrl = '/districts' ;
@@ -23,13 +23,11 @@ describe('District (e2e)', () => {
2323 const districts = await tester . expectData < District [ ] > ( baseUrl ) ;
2424
2525 for ( const district of districts ) {
26- expect ( district ) . toEqual (
27- expectIdFromMongo ( {
28- code : expect . stringMatching ( districtRegex . code ) ,
29- name : expect . stringMatching ( districtRegex . name ) ,
30- regencyCode : district . code . slice ( 0 , 4 ) ,
31- } ) ,
32- ) ;
26+ expect ( district ) . toEqual ( {
27+ code : expect . stringMatching ( districtRegex . code ) ,
28+ name : expect . stringMatching ( districtRegex . name ) ,
29+ regencyCode : district . code . slice ( 0 , 4 ) ,
30+ } ) ;
3331 }
3432 } ) ;
3533
@@ -66,13 +64,11 @@ describe('District (e2e)', () => {
6664 ) ;
6765
6866 for ( const district of districts ) {
69- expect ( district ) . toEqual (
70- expectIdFromMongo ( {
71- code : expect . stringMatching ( districtRegex . code ) ,
72- name : expect . stringMatching ( new RegExp ( testName , 'i' ) ) ,
73- regencyCode : district . code . slice ( 0 , 4 ) ,
74- } ) ,
75- ) ;
67+ expect ( district ) . toEqual ( {
68+ code : expect . stringMatching ( districtRegex . code ) ,
69+ name : expect . stringMatching ( new RegExp ( testName , 'i' ) ) ,
70+ regencyCode : district . code . slice ( 0 , 4 ) ,
71+ } ) ;
7672 }
7773 } ) ;
7874
@@ -83,13 +79,11 @@ describe('District (e2e)', () => {
8379 ) ;
8480
8581 for ( const district of districts ) {
86- expect ( district ) . toEqual (
87- expectIdFromMongo ( {
88- code : expect . stringMatching ( districtRegex . code ) ,
89- name : expect . stringMatching ( districtRegex . name ) ,
90- regencyCode,
91- } ) ,
92- ) ;
82+ expect ( district ) . toEqual ( {
83+ code : expect . stringMatching ( districtRegex . code ) ,
84+ name : expect . stringMatching ( districtRegex . name ) ,
85+ regencyCode,
86+ } ) ;
9387 }
9488 } ) ;
9589 } ) ;
@@ -111,24 +105,22 @@ describe('District (e2e)', () => {
111105 `${ baseUrl } /${ testCode } ` ,
112106 ) ;
113107
114- expect ( district ) . toEqual (
115- expectIdFromMongo ( {
116- code : testCode ,
117- name : expect . stringMatching ( districtRegex . name ) ,
118- regencyCode : testCode . slice ( 0 , 4 ) ,
119- parent : {
120- regency : expectIdFromMongo ( {
121- code : testCode . slice ( 0 , 4 ) ,
122- name : expect . stringMatching ( regencyRegex . name ) ,
123- provinceCode : testCode . slice ( 0 , 2 ) ,
124- } ) ,
125- province : expectIdFromMongo ( {
126- code : testCode . slice ( 0 , 2 ) ,
127- name : expect . stringMatching ( provinceRegex . name ) ,
128- } ) ,
108+ expect ( district ) . toEqual ( {
109+ code : testCode ,
110+ name : expect . stringMatching ( districtRegex . name ) ,
111+ regencyCode : testCode . slice ( 0 , 4 ) ,
112+ parent : {
113+ regency : {
114+ code : testCode . slice ( 0 , 4 ) ,
115+ name : expect . stringMatching ( regencyRegex . name ) ,
116+ provinceCode : testCode . slice ( 0 , 2 ) ,
129117 } ,
130- } ) ,
131- ) ;
118+ province : {
119+ code : testCode . slice ( 0 , 2 ) ,
120+ name : expect . stringMatching ( provinceRegex . name ) ,
121+ } ,
122+ } ,
123+ } ) ;
132124 } ) ;
133125 } ) ;
134126
0 commit comments