And tests for the same for if/then/else.

Author: Julian

jsonschema/_validators.py

@@ -364,13 +364,12 @@ def not_(validator, not_schema, instance, schema):
 
 
 def if_(validator, if_schema, instance, schema):
-    # FIXME: paths
     if validator.is_valid(instance, if_schema):
         if u"then" in schema:
             then = schema[u"then"]
-            for error in validator.descend(instance, then):
+            for error in validator.descend(instance, then, schema_path="then"):
                 yield error
     elif u"else" in schema:
         else_ = schema[u"else"]
-        for error in validator.descend(instance, else_):
+        for error in validator.descend(instance, else_, schema_path="else"):
             yield error

jsonschema/tests/test_validators.py

@@ -894,6 +894,35 @@ def test_propertyNames(self):
             "%r is not allowed for %r" % ({"const": "foo"}, "foo"),
         )
         self.assertEqual(error.path, deque([]))
+        self.assertEqual(error.schema_path, deque(["propertyNames", "not"]))
+
+    def test_if_then(self):
+        schema = {
+            "if": {"const": 12},
+            "then": {"const": 13},
+        }
+
+        validator = validators.Draft7Validator(schema)
+        error, = validator.iter_errors(12)
+
+        self.assertEqual(error.validator, "const")
+        self.assertEqual(error.message, "13 was expected")
+        self.assertEqual(error.path, deque([]))
+        self.assertEqual(error.schema_path, deque(["if", "then", "const"]))
+
+    def test_if_else(self):
+        schema = {
+            "if": {"const": 12},
+            "else": {"const": 13},
+        }
+
+        validator = validators.Draft7Validator(schema)
+        error, = validator.iter_errors(15)
+
+        self.assertEqual(error.validator, "const")
+        self.assertEqual(error.message, "13 was expected")
+        self.assertEqual(error.path, deque([]))
+        self.assertEqual(error.schema_path, deque(["if", "else", "const"]))
 
 
 class MetaSchemaTestsMixin(object):