From dad7132adf7780662ca4fa3c676170e9bb1e9d9e Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <e.poberezkin@me.com>
Date: Sat, 2 Dec 2017 19:35:57 +0000
Subject: [PATCH] test: fix browser tests, replace id with $id

---
 spec/ajv.spec.js           | 4 ++--
 spec/async.spec.js         | 2 +-
 spec/browser_test_suite.js | 2 ++
 spec/errors.spec.js        | 4 ++--
 spec/options.spec.js       | 4 +++-
 spec/tests/rules/if.json   | 4 ++--
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/spec/ajv.spec.js b/spec/ajv.spec.js
index 8c5e23a..e3bf766 100644
--- a/spec/ajv.spec.js
+++ b/spec/ajv.spec.js
@@ -27,8 +27,8 @@ describe('Ajv', function () {
     });
 
     it('should cache compiled functions for the same schema', function() {
-      var v1 = ajv.compile({ id: '//e.com/int.json', type: 'integer', minimum: 1 });
-      var v2 = ajv.compile({ id: '//e.com/int.json', minimum: 1, type: 'integer' });
+      var v1 = ajv.compile({ $id: '//e.com/int.json', type: 'integer', minimum: 1 });
+      var v2 = ajv.compile({ $id: '//e.com/int.json', minimum: 1, type: 'integer' });
       v1 .should.equal(v2);
     });
 
diff --git a/spec/async.spec.js b/spec/async.spec.js
index bcac5a4..e6fcba9 100644
--- a/spec/async.spec.js
+++ b/spec/async.spec.js
@@ -375,7 +375,7 @@ describe('compileAsync method', function() {
 
     it('if loadSchema returned error', function() {
       var schema = {
-        "id": "http://example.com/parent.json",
+        "$id": "http://example.com/parent.json",
         "properties": {
           "a": { "$ref": "object.json" }
         }
diff --git a/spec/browser_test_suite.js b/spec/browser_test_suite.js
index 9133433..40e138c 100644
--- a/spec/browser_test_suite.js
+++ b/spec/browser_test_suite.js
@@ -2,6 +2,8 @@
 
 module.exports = function (suite) {
   suite.forEach(function (file) {
+    if (file.name.indexOf('optional/format') == 0)
+      file.name = file.name.replace('optional/', '');
     file.test = file.module;
   });
   return suite;
diff --git a/spec/errors.spec.js b/spec/errors.spec.js
index 2c2ee4d..0a7a5fb 100644
--- a/spec/errors.spec.js
+++ b/spec/errors.spec.js
@@ -410,7 +410,7 @@ describe('Validation errors', function () {
 
   it('"items" errors should include item index without quotes in dataPath (#48)', function() {
     var schema1 = {
-      id: 'schema1',
+      $id: 'schema1',
       type: 'array',
       items: {
         type: 'integer',
@@ -445,7 +445,7 @@ describe('Validation errors', function () {
     shouldBeError(fullValidate.errors[1], 'minimum', '#/items/minimum', '/3', 'should be >= 10');
 
     var schema2 = {
-      id: 'schema2',
+      $id: 'schema2',
       type: 'array',
       items: [{ minimum: 10 }, { minimum: 9 }, { minimum: 12 }]
     };
diff --git a/spec/options.spec.js b/spec/options.spec.js
index 616a4e2..f0f949d 100644
--- a/spec/options.spec.js
+++ b/spec/options.spec.js
@@ -1153,7 +1153,9 @@ describe('Ajv Options', function () {
 
     describe('= "id"', function() {
       it('should use id and ignore $id', function() {
-        var ajv = new Ajv({schemaId: 'id'});
+        var ajv = new Ajv({schemaId: 'id', meta: false});
+        ajv.addMetaSchema(require('ajv/lib/refs/json-schema-draft-04.json'));
+        ajv._opts.defaultMeta = 'http://json-schema.org/draft-04/schema#';
 
         ajv.addSchema({ id: 'mySchema1', type: 'string' });
         var validate = ajv.getSchema('mySchema1');
diff --git a/spec/tests/rules/if.json b/spec/tests/rules/if.json
index a5bd307..87e9e7b 100644
--- a/spec/tests/rules/if.json
+++ b/spec/tests/rules/if.json
@@ -56,9 +56,9 @@
   {
     "description": "if keyword with id in sibling subschema",
     "schema": {
-      "id": "http://example.com/base_if",
+      "$id": "http://example.com/base_if",
       "if": {
-        "id": "http://example.com/if",
+        "$id": "http://example.com/if",
         "minimum": 10
       },
       "then": { "$ref": "#/definitions/def" },