Squashed 'json/' changes from 69acf529..fd9bcfbd

fd9bcfbd Merge pull request #421 from willson-chen/bug601_addtestcase 13685a6c Forward port the nested ref test. 5be19e21 Give the nested ref schema a clearer name, and fix refs to it. e9db2e58 subschema nested ref in remote ref git-subtree-dir: json git-subtree-split: fd9bcfbdb9a04a3203ad6b91140c8cf48836e44b
python-jsonschema · Jul 25, 2022 · 999ff68 · 999ff68
1 parent c09578b
commit 999ff68
Show file tree

Hide file tree

Showing 7 changed files with 134 additions and 0 deletions.
diff --git a/remotes/nested/foo-ref-string.json b/remotes/nested/foo-ref-string.json
@@ -0,0 +1,6 @@
+{
+    "type": "object",
+    "properties": {
+        "foo": {"$ref": "string.json"}
+    }
+}
diff --git a/remotes/nested/string.json b/remotes/nested/string.json
@@ -0,0 +1,3 @@
+{
+    "type": "string"
+}
diff --git a/tests/draft-next/refRemote.json b/tests/draft-next/refRemote.json
@@ -204,5 +204,30 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "retrieved nested refs resolve relative to their URI not $id",
+        "schema": {
+            "$id": "http://localhost:1234/some-id",
+            "properties": {
+                "name": {"$ref": "nested/foo-ref-string.json"}
+            }
+        },
+        "tests": [
+            {
+                "description": "number is invalid",
+                "data": {
+                    "name": {"foo":  1}
+                },
+                "valid": false
+            },
+            {
+                "description": "string is valid",
+                "data": {
+                    "name": {"foo":  "a"}
+                },
+                "valid": true
+            }
+        ]
     }
 ]
diff --git a/tests/draft2019-09/refRemote.json b/tests/draft2019-09/refRemote.json
@@ -204,5 +204,30 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "retrieved nested refs resolve relative to their URI not $id",
+        "schema": {
+            "$id": "http://localhost:1234/some-id",
+            "properties": {
+                "name": {"$ref": "nested/foo-ref-string.json"}
+            }
+        },
+        "tests": [
+            {
+                "description": "number is invalid",
+                "data": {
+                    "name": {"foo":  1}
+                },
+                "valid": false
+            },
+            {
+                "description": "string is valid",
+                "data": {
+                    "name": {"foo":  "a"}
+                },
+                "valid": true
+            }
+        ]
     }
 ]
diff --git a/tests/draft2020-12/refRemote.json b/tests/draft2020-12/refRemote.json
@@ -204,5 +204,30 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "retrieved nested refs resolve relative to their URI not $id",
+        "schema": {
+            "$id": "http://localhost:1234/some-id",
+            "properties": {
+                "name": {"$ref": "nested/foo-ref-string.json"}
+            }
+        },
+        "tests": [
+            {
+                "description": "number is invalid",
+                "data": {
+                    "name": {"foo":  1}
+                },
+                "valid": false
+            },
+            {
+                "description": "string is valid",
+                "data": {
+                    "name": {"foo":  "a"}
+                },
+                "valid": true
+            }
+        ]
     }
 ]
diff --git a/tests/draft6/refRemote.json b/tests/draft6/refRemote.json
@@ -210,5 +210,30 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "retrieved nested refs resolve relative to their URI not $id",
+        "schema": {
+            "$id": "http://localhost:1234/some-id",
+            "properties": {
+                "name": {"$ref": "nested/foo-ref-string.json"}
+            }
+        },
+        "tests": [
+            {
+                "description": "number is invalid",
+                "data": {
+                    "name": {"foo":  1}
+                },
+                "valid": false
+            },
+            {
+                "description": "string is valid",
+                "data": {
+                    "name": {"foo":  "a"}
+                },
+                "valid": true
+            }
+        ]
     }
 ]
diff --git a/tests/draft7/refRemote.json b/tests/draft7/refRemote.json
@@ -210,5 +210,30 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "retrieved nested refs resolve relative to their URI not $id",
+        "schema": {
+            "$id": "http://localhost:1234/some-id",
+            "properties": {
+                "name": {"$ref": "nested/foo-ref-string.json"}
+            }
+        },
+        "tests": [
+            {
+                "description": "number is invalid",
+                "data": {
+                    "name": {"foo":  1}
+                },
+                "valid": false
+            },
+            {
+                "description": "string is valid",
+                "data": {
+                    "name": {"foo":  "a"}
+                },
+                "valid": true
+            }
+        ]
     }
 ]