@@ -102,54 +102,44 @@ describe('SchemaValidation', () => {
102102 } )
103103
104104 it ( 'validates content that conforms to schema' , async ( ) => {
105- await expect ( ( ) => {
106- schemaValidator . validateSchema ( CONTENT_VALID , MODEL_DEFINITION . schema , SCHEMA_COMMIT_ID )
107- } ) . resolves
105+ await expect ( schemaValidator . validateSchema ( CONTENT_VALID , MODEL_DEFINITION . schema , SCHEMA_COMMIT_ID ) ) . resolves
108106 } )
109107
110108 it ( 'throws when required properties are missing' , async ( ) => {
111- await expect ( ( ) => {
112- schemaValidator . validateSchema (
113- CONTENT_NO_REQ_PROPS ,
114- MODEL_DEFINITION . schema ,
115- SCHEMA_COMMIT_ID
116- )
117- } ) . rejects . toThrow (
109+ await expect ( schemaValidator . validateSchema (
110+ CONTENT_NO_REQ_PROPS ,
111+ MODEL_DEFINITION . schema ,
112+ SCHEMA_COMMIT_ID
113+ ) ) . rejects . toMatch (
118114 / d a t a m u s t h a v e r e q u i r e d p r o p e r t y ' a r r a y P r o p e r t y ' , d a t a m u s t h a v e r e q u i r e d p r o p e r t y ' s t r i n g A r r a y P r o p e r t y ' , d a t a m u s t h a v e r e q u i r e d p r o p e r t y ' s t r i n g P r o p e r t y ' , d a t a m u s t h a v e r e q u i r e d p r o p e r t y ' i n t P r o p e r t y ' , d a t a m u s t h a v e r e q u i r e d p r o p e r t y ' f l o a t P r o p e r t y ' /
119115 )
120116 } )
121117
122118 it ( 'throws when min values requirements are not respected' , async ( ) => {
123- await expect ( ( ) => {
124- schemaValidator . validateSchema (
125- CONTENT_MINS_NOT_RESPECTED ,
126- MODEL_DEFINITION . schema ,
127- SCHEMA_COMMIT_ID
128- )
129- } ) . rejects . toThrow (
119+ await expect ( schemaValidator . validateSchema (
120+ CONTENT_MINS_NOT_RESPECTED ,
121+ MODEL_DEFINITION . schema ,
122+ SCHEMA_COMMIT_ID
123+ ) ) . rejects . toMatch (
130124 / d a t a \/ a r r a y P r o p e r t y m u s t N O T h a v e f e w e r t h a n 2 i t e m s , d a t a \/ s t r i n g A r r a y P r o p e r t y \/ 0 m u s t N O T h a v e f e w e r t h a n 2 c h a r a c t e r s , d a t a \/ s t r i n g P r o p e r t y m u s t N O T h a v e f e w e r t h a n 3 c h a r a c t e r s , d a t a \/ i n t P r o p e r t y m u s t b e > = 2 , d a t a \/ f l o a t P r o p e r t y m u s t b e > = 3 /
131125 )
132126 } )
133127
134128 it ( 'throws when max values requirements are not respected' , async ( ) => {
135- await expect ( ( ) => {
136- schemaValidator . validateSchema (
137- CONTENT_MAXS_NOT_RESPECTED ,
138- MODEL_DEFINITION . schema ,
139- SCHEMA_COMMIT_ID
140- )
141- } ) . rejects . toThrow (
129+ await expect ( schemaValidator . validateSchema (
130+ CONTENT_MAXS_NOT_RESPECTED ,
131+ MODEL_DEFINITION . schema ,
132+ SCHEMA_COMMIT_ID
133+ ) ) . rejects . toMatch (
142134 / d a t a \/ a r r a y P r o p e r t y m u s t N O T h a v e m o r e t h a n 4 i t e m s , d a t a \/ s t r i n g A r r a y P r o p e r t y \/ 0 m u s t N O T h a v e m o r e t h a n 6 c h a r a c t e r s , d a t a \/ s t r i n g P r o p e r t y m u s t N O T h a v e m o r e t h a n 8 c h a r a c t e r s , d a t a \/ i n t P r o p e r t y m u s t b e < = 1 0 0 , d a t a \/ f l o a t P r o p e r t y m u s t b e < = 1 1 0 /
143135 )
144136 } )
145137
146138 it ( 'throws when additional values are given' , async ( ) => {
147- await expect ( ( ) => {
148- schemaValidator . validateSchema (
149- CONTENT_WITH_ADDITIONAL_PROPERTY ,
150- MODEL_DEFINITION . schema ,
151- SCHEMA_COMMIT_ID
152- )
153- } ) . rejects . toThrow ( / d a t a m u s t N O T h a v e a d d i t i o n a l p r o p e r t i e s / )
139+ await expect ( schemaValidator . validateSchema (
140+ CONTENT_WITH_ADDITIONAL_PROPERTY ,
141+ MODEL_DEFINITION . schema ,
142+ SCHEMA_COMMIT_ID
143+ ) ) . rejects . toMatch ( / d a t a m u s t N O T h a v e a d d i t i o n a l p r o p e r t i e s / )
154144 } )
155145} )
0 commit comments