Squashed 'json/' changes from 27f8c84..728066f

Julian · Julian · commit 678570a91d6c · 2017-10-29T17:21:53.000-04:00
728066f Merge pull request #188 from json-schema-org/sequences-and-objects c47341a Flesh out some more ignore cases for object validators. f339360 make test descriptions unique and no longer than 60 chars 6820a83 Merge branch 'CroniD-master' aaa32d8 test: update "json-pointer" format to exclude fragments 85a552f added some more tests for json-pointer format b7b79fc extended tests for json-pointer format git-subtree-dir: json git-subtree-split: 728066f9c5c258ba3b1804a22a5b998f2ec77ec0
diff --git a/json/index.js b/json/index.js
@@ -15,7 +15,10 @@ runTest(4);
 runTest(6);
 
 function runTest(draft) {
-  var opts = {format: 'full'};
+  var opts = {
+    format: 'full',
+    formats: {'json-pointer': /^(?:\/(?:[^~\/]|~0|~1)*)*$/}
+  };
   if (draft == 4) opts.meta = false;
   var ajv = new Ajv(opts);
   ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-04.json'));
diff --git a/json/tests/draft3/additionalProperties.json b/json/tests/draft3/additionalProperties.json
@@ -19,10 +19,20 @@
                 "valid": false
             },
             {
-                "description": "ignores non-objects",
+                "description": "ignores arrays",
                 "data": [1, 2, 3],
                 "valid": true
             },
+            {
+                "description": "ignores strings",
+                "data": "foobarbaz",
+                "valid": true
+            },
+            {
+                "description": "ignores other non-objects",
+                "data": 12,
+                "valid": true
+            },
             {
                 "description": "patternProperties are not additional properties",
                 "data": {"foo":1, "vroom": 2},
diff --git a/json/tests/draft3/dependencies.json b/json/tests/draft3/dependencies.json
@@ -26,8 +26,18 @@
                 "valid": false
             },
             {
-                "description": "ignores non-objects",
-                "data": "foo",
+                "description": "ignores arrays",
+                "data": ["bar"],
+                "valid": true
+            },
+            {
+                "description": "ignores strings",
+                "data": "foobar",
+                "valid": true
+            },
+            {
+                "description": "ignores other non-objects",
+                "data": 12,
                 "valid": true
             }
         ]
diff --git a/json/tests/draft3/patternProperties.json b/json/tests/draft3/patternProperties.json
@@ -29,7 +29,12 @@
                 "valid": false
             },
             {
-                "description": "ignores non-objects",
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores other non-objects",
                 "data": 12,
                 "valid": true
             }
diff --git a/json/tests/draft3/properties.json b/json/tests/draft3/properties.json
@@ -29,9 +29,14 @@
                 "valid": true
             },
             {
-                "description": "ignores non-objects",
+                "description": "ignores arrays",
                 "data": [],
                 "valid": true
+            },
+            {
+                "description": "ignores other non-objects",
+                "data": 12,
+                "valid": true
             }
         ]
     },
diff --git a/json/tests/draft4/additionalProperties.json b/json/tests/draft4/additionalProperties.json
@@ -19,10 +19,20 @@
                 "valid": false
             },
             {
-                "description": "ignores non-objects",
+                "description": "ignores arrays",
                 "data": [1, 2, 3],
                 "valid": true
             },
+            {
+                "description": "ignores strings",
+                "data": "foobarbaz",
+                "valid": true
+            },
+            {
+                "description": "ignores other non-objects",
+                "data": 12,
+                "valid": true
+            },
             {
                 "description": "patternProperties are not additional properties",
                 "data": {"foo":1, "vroom": 2},
diff --git a/json/tests/draft4/dependencies.json b/json/tests/draft4/dependencies.json
@@ -26,8 +26,18 @@
                 "valid": false
             },
             {
-                "description": "ignores non-objects",
-                "data": "foo",
+                "description": "ignores arrays",
+                "data": ["bar"],
+                "valid": true
+            },
+            {
+                "description": "ignores strings",
+                "data": "foobar",
+                "valid": true
+            },
+            {
+                "description": "ignores other non-objects",
+                "data": 12,
                 "valid": true
             }
         ]
diff --git a/json/tests/draft4/maxProperties.json b/json/tests/draft4/maxProperties.json
@@ -19,9 +19,19 @@
                 "valid": false
             },
             {
-                "description": "ignores non-objects",
+                "description": "ignores arrays",
+                "data": [1, 2, 3],
+                "valid": true
+            },
+            {
+                "description": "ignores strings",
                 "data": "foobar",
                 "valid": true
+            },
+            {
+                "description": "ignores other non-objects",
+                "data": 12,
+                "valid": true
             }
         ]
     }
diff --git a/json/tests/draft4/minProperties.json b/json/tests/draft4/minProperties.json
@@ -19,9 +19,19 @@
                 "valid": false
             },
             {
-                "description": "ignores non-objects",
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores strings",
                 "data": "",
                 "valid": true
+            },
+            {
+                "description": "ignores other non-objects",
+                "data": 12,
+                "valid": true
             }
         ]
     }
diff --git a/json/tests/draft4/patternProperties.json b/json/tests/draft4/patternProperties.json
@@ -29,7 +29,17 @@
                 "valid": false
             },
             {
-                "description": "ignores non-objects",
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores strings",
+                "data": "",
+                "valid": true
+            },
+            {
+                "description": "ignores other non-objects",
                 "data": 12,
                 "valid": true
             }
diff --git a/json/tests/draft4/properties.json b/json/tests/draft4/properties.json
@@ -29,9 +29,14 @@
                 "valid": true
             },
             {
-                "description": "ignores non-objects",
+                "description": "ignores arrays",
                 "data": [],
                 "valid": true
+            },
+            {
+                "description": "ignores other non-objects",
+                "data": 12,
+                "valid": true
             }
         ]
     },
diff --git a/json/tests/draft4/required.json b/json/tests/draft4/required.json
@@ -20,7 +20,17 @@
                 "valid": false
             },
             {
-                "description": "ignores non-objects",
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores strings",
+                "data": "",
+                "valid": true
+            },
+            {
+                "description": "ignores other non-objects",
                 "data": 12,
                 "valid": true
             }
diff --git a/json/tests/draft6/additionalProperties.json b/json/tests/draft6/additionalProperties.json
@@ -19,10 +19,20 @@
                 "valid": false
             },
             {
-                "description": "ignores non-objects",
+                "description": "ignores arrays",
                 "data": [1, 2, 3],
                 "valid": true
             },
+            {
+                "description": "ignores strings",
+                "data": "foobarbaz",
+                "valid": true
+            },
+            {
+                "description": "ignores other non-objects",
+                "data": 12,
+                "valid": true
+            },
             {
                 "description": "patternProperties are not additional properties",
                 "data": {"foo":1, "vroom": 2},
diff --git a/json/tests/draft6/dependencies.json b/json/tests/draft6/dependencies.json
@@ -26,8 +26,18 @@
                 "valid": false
             },
             {
-                "description": "ignores non-objects",
-                "data": "foo",
+                "description": "ignores arrays",
+                "data": ["bar"],
+                "valid": true
+            },
+            {
+                "description": "ignores strings",
+                "data": "foobar",
+                "valid": true
+            },
+            {
+                "description": "ignores other non-objects",
+                "data": 12,
                 "valid": true
             }
         ]
diff --git a/json/tests/draft6/maxProperties.json b/json/tests/draft6/maxProperties.json
@@ -19,9 +19,19 @@
                 "valid": false
             },
             {
-                "description": "ignores non-objects",
+                "description": "ignores arrays",
+                "data": [1, 2, 3],
+                "valid": true
+            },
+            {
+                "description": "ignores strings",
                 "data": "foobar",
                 "valid": true
+            },
+            {
+                "description": "ignores other non-objects",
+                "data": 12,
+                "valid": true
             }
         ]
     }
diff --git a/json/tests/draft6/minProperties.json b/json/tests/draft6/minProperties.json
@@ -19,9 +19,19 @@
                 "valid": false
             },
             {
-                "description": "ignores non-objects",
+                "description": "ignores arrays",
+                "data": [],
+                "valid": true
+            },
+            {
+                "description": "ignores strings",
                 "data": "",
                 "valid": true
+            },
+            {
+                "description": "ignores other non-objects",
+                "data": 12,
+                "valid": true
             }
         ]
     }
diff --git a/json/tests/draft6/optional/format.json b/json/tests/draft6/optional/format.json
diff --git a/json/tests/draft6/patternProperties.json b/json/tests/draft6/patternProperties.json
diff --git a/json/tests/draft6/properties.json b/json/tests/draft6/properties.json
diff --git a/json/tests/draft6/propertyNames.json b/json/tests/draft6/propertyNames.json
diff --git a/json/tests/draft6/required.json b/json/tests/draft6/required.json

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,12 @@`
`29`	`29`	`"valid": false`
`30`	`30`	`},`
`31`	`31`	`{`
`32`		`- "description": "ignores non-objects",`
	`32`	`+ "description": "ignores arrays",`
	`33`	`+ "data": [],`
	`34`	`+ "valid": true`
	`35`	`+ },`
	`36`	`+ {`
	`37`	`+ "description": "ignores other non-objects",`
`33`	`38`	`"data": 12,`
`34`	`39`	`"valid": true`
`35`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,14 @@`
`29`	`29`	`"valid": true`
`30`	`30`	`},`
`31`	`31`	`{`
`32`		`- "description": "ignores non-objects",`
	`32`	`+ "description": "ignores arrays",`
`33`	`33`	`"data": [],`
`34`	`34`	`"valid": true`
	`35`	`+ },`
	`36`	`+ {`
	`37`	`+ "description": "ignores other non-objects",`
	`38`	`+ "data": 12,`
	`39`	`+ "valid": true`
`35`	`40`	`}`
`36`	`41`	`]`
`37`	`42`	`},`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,19 @@`
`19`	`19`	`"valid": false`
`20`	`20`	`},`
`21`	`21`	`{`
`22`		`- "description": "ignores non-objects",`
	`22`	`+ "description": "ignores arrays",`
	`23`	`+ "data": [1, 2, 3],`
	`24`	`+ "valid": true`
	`25`	`+ },`
	`26`	`+ {`
	`27`	`+ "description": "ignores strings",`
`23`	`28`	`"data": "foobar",`
`24`	`29`	`"valid": true`
	`30`	`+ },`
	`31`	`+ {`
	`32`	`+ "description": "ignores other non-objects",`
	`33`	`+ "data": 12,`
	`34`	`+ "valid": true`
`25`	`35`	`}`
`26`	`36`	`]`
`27`	`37`	`}`