Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/resolver.js
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
// resolve anything that is local
for(var ii = 0; ii < toResolve.length; ii++) {
(function(item, self) {
if(item.root === null) {
if(item.root === null || item.root === root) {
// local resolve
self.resolveItem(spec, _root, resolutionTable, resolvedRefs, unresolvedRefs, item);
processedCalls += 1;
Expand Down
44 changes: 37 additions & 7 deletions test/resolver.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ var Resolver = require('../lib/resolver');
var instance;

describe('swagger resolver', function () {

before(function (done) {
mock.petstore(done, function (petstore, server){
instance = server;
Expand Down Expand Up @@ -43,7 +42,7 @@ describe('swagger resolver', function () {
}
};

api.resolve(spec, 'http://localhost:8000/v2/petstore.json', function (spec) {
api.resolve(spec, 'http://localhost:8080/v2/petstore.json', function (spec) {
expect(spec.definitions.Category).toExist();
done();
});
Expand Down Expand Up @@ -131,7 +130,7 @@ describe('swagger resolver', function () {
}
};

api.resolve(spec, 'http://localhost:8000/v2/petstore.json', function (spec) {
api.resolve(spec, 'http://localhost:8080/v2/petstore.json', function (spec) {
expect(spec.definitions.Category).toExist();
done();
});
Expand All @@ -154,7 +153,7 @@ describe('swagger resolver', function () {
}
};

api.resolve(spec, 'http://localhost:8000/v2/petstore.json', function (spec) {
api.resolve(spec, 'http://localhost:8080/v2/petstore.json', function (spec) {
expect(spec.definitions.Pet).toExist();
done();
});
Expand All @@ -177,7 +176,7 @@ describe('swagger resolver', function () {
}
};

api.resolve(spec, 'http://localhost:8000/v2/petstore.json', function (spec) {
api.resolve(spec, 'http://localhost:8080/v2/petstore.json', function (spec) {
expect(spec.definitions.Pet).toExist();
expect(spec.paths['/pet'].post.responses['200'].schema.$ref).toBe('#/definitions/Pet');

Expand Down Expand Up @@ -328,7 +327,7 @@ describe('swagger resolver', function () {
}
};

api.resolve(spec, 'http://localhost:8000/v2/petstore.json', function (spec) {
api.resolve(spec, 'http://localhost:8080/v2/petstore.json', function (spec) {
var path = spec.paths['/myUsername'];
test.object(path);
test.object(path.get);
Expand Down Expand Up @@ -390,7 +389,8 @@ describe('swagger resolver', function () {
}
}
};
api.resolve(spec, 'http://localhost:8000/v2/petstore.json', function (spec) {
// we use a different URL so the resolver doesn't treat the `spec` as the *entire* spec.
api.resolve(spec, 'http://localhost:8080/v2/petstore.json', function (spec) {
var get = spec.paths['/myUsername'].get;
var response = get.responses['400'];
expect(response.description).toBe('failed');
Expand Down Expand Up @@ -696,4 +696,34 @@ describe('swagger resolver', function () {
done();
});
});

it('does not make multiple calls for parameter refs #489', function(done) {
var api = new Resolver();
var spec = {
paths: {
'/pet': {
post: {
parameters: [{
$ref: '#/parameters/sharedSkip'
}]
}
}
},
parameters: {
sharedSkip: {
name: 'skip',
in: 'query',
description: 'Results to skip',
required: false,
type: 'integer',
format: 'int32'
}
}
};

api.resolve(spec, 'http://localhost:8000/swagger.json', function (spec, unresolved) {
expect(Object.keys(unresolved).length).toBe(0);
done();
});
});
});