enhanced the tests for PR #105

Author: JamesMessinger

lib/bundle.js

@@ -213,7 +213,7 @@ function remap (inventory) {
       entry.$ref.$ref = pathFromRoot;
     }
     else if (entry.file === file && entry.hash.indexOf(hash + '/') === 0) {
-      // This $ref points to the a sub-value as the prevous $ref, so remap it beneath that path
+      // This $ref points to a sub-value of the prevous $ref, so remap it beneath that path
       entry.$ref.$ref = Pointer.join(pathFromRoot, Pointer.parse(entry.hash.replace(hash, '#')));
     }
     else {

test/specs/bundle/bundle.spec.js

@@ -49,4 +49,3 @@ describe('Schema with deeply-nested $refs', function () {
       });
   });
 });
-

test/specs/deep/deep.spec.js

@@ -1,4 +1,3 @@
-
 User:
   type: object
   required: [name]

test/specs/bundle/inner.yaml …specs/external-multiple/definitions.yamltest/specs/bundle/inner.yaml renamed to test/specs/external-multiple/definitions.yaml test/specs/bundle/inner.yaml renamed to test/specs/external-multiple/definitions.yaml

@@ -0,0 +1,27 @@
+helper.bundled.externalMultiple = {
+  type: 'object',
+  required: ['user', 'token'],
+  properties: {
+    token: {
+      type: 'string'
+    },
+    user: {
+      type: 'object',
+      required: ['name'],
+      properties: {
+        name: {
+          type: 'string'
+        }
+      },
+      example: {
+        name: 'Homer'
+      }
+    }
+  },
+  example: {
+    token: '11111111',
+    user: {
+      $ref: '#/properties/user/example'
+    }
+  }
+};

test/specs/external-multiple/external-multiple.bundled.js

@@ -1,4 +1,4 @@
-helper.dereferenced.bundled = {
+helper.dereferenced.externalMultiple = {
   type: 'object',
   required: ['user', 'token'],
   properties: {

test/specs/bundle/bundled.dereferenced.js …ltiple/external-multiple.dereferenced.jstest/specs/bundle/bundled.dereferenced.js renamed to test/specs/external-multiple/external-multiple.dereferenced.js test/specs/bundle/bundled.dereferenced.js renamed to test/specs/external-multiple/external-multiple.dereferenced.js

@@ -0,0 +1,35 @@
+helper.parsed.externalMultiple = {
+  schema: {
+    type: 'object',
+    required: ['user', 'token'],
+    properties: {
+      token: {
+        type: 'string'
+      },
+      user: {
+        $ref: 'definitions.yaml#/User'
+      }
+    },
+    example: {
+      token: '11111111',
+      user: {
+        $ref: 'definitions.yaml#/User/example'
+      }
+    }
+  },
+
+  definitions: {
+    User: {
+      type: 'object',
+      required: ['name'],
+      properties: {
+        name: {
+          type: 'string'
+        }
+      },
+      example: {
+        name: 'Homer'
+      }
+    }
+  }
+};

test/specs/external-multiple/external-multiple.parsed.js

@@ -0,0 +1,46 @@
+describe('Schema with multiple external $refs to different parts of a file', function () {
+  'use strict';
+
+  it('should parse successfully', function () {
+    var parser = new $RefParser();
+    return parser
+      .parse(path.abs('specs/external-multiple/external-multiple.yaml'))
+      .then(function (schema) {
+        expect(schema).to.equal(parser.schema);
+        expect(schema).to.deep.equal(helper.parsed.externalMultiple.schema);
+        expect(parser.$refs.paths()).to.deep.equal([path.abs('specs/external-multiple/external-multiple.yaml')]);
+      });
+  });
+
+  it('should resolve successfully', helper.testResolve(
+    path.rel('specs/external-multiple/external-multiple.yaml'),
+    path.abs('specs/external-multiple/external-multiple.yaml'), helper.parsed.externalMultiple.schema,
+    path.abs('specs/external-multiple/definitions.yaml'), helper.parsed.externalMultiple.definitions
+  ));
+
+  it('should dereference successfully', function () {
+    var parser = new $RefParser();
+    return parser
+      .dereference(path.rel('specs/external-multiple/external-multiple.yaml'))
+      .then(function (schema) {
+        expect(schema).to.equal(parser.schema);
+        expect(schema).to.deep.equal(helper.dereferenced.externalMultiple);
+
+        // Reference equality
+        expect(schema.properties.user.example).to.equal(schema.example.user);
+
+        // The "circular" flag should NOT be set
+        expect(parser.$refs.circular).to.equal(false);
+      });
+  });
+
+  it('should bundle successfully', function () {
+    var parser = new $RefParser();
+    return parser
+      .bundle(path.rel('specs/external-multiple/external-multiple.yaml'))
+      .then(function (schema) {
+        expect(schema).to.equal(parser.schema);
+        expect(schema).to.deep.equal(helper.bundled.externalMultiple);
+      });
+  });
+});

test/specs/external-multiple/external-multiple.spec.js

@@ -1,12 +1,11 @@
-
 type: object
 required: [user, token]
 properties:
   token:
     type: string
   user:
-    $ref: './inner.yaml#/User'
+    $ref: 'definitions.yaml#/User'
 example:
   token: '11111111'
   user:
-    $ref: './inner.yaml#/User/example'
+    $ref: 'definitions.yaml#/User/example'