fixed bug in remote ref resolution, closes #70

ajv-validator · Nov 7, 2015 · 368332a · 368332a
1 parent 73f48e6
commit 368332a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -57,6 +57,6 @@ module.exports = function(config) {
     // if true, Karma captures browsers, runs the tests and exits
     singleRun: true,
 
-    browserNoActivityTimeout: 30000
+    browserNoActivityTimeout: 90000
   });
 };
diff --git a/karma.sauce.js b/karma.sauce.js
@@ -126,7 +126,7 @@ module.exports = function(config) {
       testName: 'Ajv'
     },
     captureTimeout: 600000,
-    browserNoActivityTimeout: 240000,
+    browserNoActivityTimeout: 300000,
 
     customLaunchers: customLaunchers,
 

diff --git a/lib/compile/resolve.js b/lib/compile/resolve.js
@@ -108,6 +108,7 @@ function getJsonPointer(parsedRef, baseId, schema, root) {
         if (res) {
           schema = res.schema;
           root = res.root;
+          baseId = res.baseId;
         }
       }
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ajv",
-  "version": "1.4.8",
+  "version": "1.4.9",
   "description": "Another JSON Schema Validator",
   "main": "lib/ajv.js",
   "files": [

diff --git a/spec/tests/issues/70_1_recursive_hash_ref_in_remote_ref.json b/spec/tests/issues/70_1_recursive_hash_ref_in_remote_ref.json
@@ -39,7 +39,6 @@
     ]
   },
   {
-    "skip": true,
     "description": "local hash ref with remote hash ref that has inner hash ref (#70)",
     "schema": {
       "definitions": {

diff --git a/spec/tests/issues/70_swagger_schema.json b/spec/tests/issues/70_swagger_schema.json
@@ -1,6 +1,5 @@
 [
   {
-    "skip": true,
     "description": "Swagger api schema does not compile (#70)",
     "schema": {
       "title": "A JSON Schema for Swagger 2.0 API.",
@@ -1595,8 +1594,20 @@
     },
     "tests": [
       {
-        "description": "empty object is valid",
+        "description": "empty object is invalid",
         "data": {},
+        "valid": false
+      },
+      {
+        "description": "minimal valid object",
+        "data": {
+          "swagger": "2.0",
+          "info": {
+            "title": "sample api definition",
+            "version": "0.1"
+          },
+          "paths": {}
+        },
         "valid": true
       }
     ]