Skip to content

Commit ab99ffa

Browse files
committed
Merge pull request #657 from swagger-api/issue-656
fix, tests for shared params
2 parents 1379944 + fc1ec11 commit ab99ffa

File tree

4 files changed

+30
-2
lines changed

4 files changed

+30
-2
lines changed

browser/swagger-client.js

Lines changed: 4 additions & 1 deletion
Large diffs are not rendered by default.

browser/swagger-client.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/resolver.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ Resolver.prototype.resolve = function (spec, arg1, arg2, arg3) {
9595
var parameter = sharedParameters[i];
9696
parameters.unshift(parameter);
9797
}
98+
if(method !== 'parameters' && _.isObject(operation)) {
99+
operation.parameters = operation.parameters || parameters;
100+
}
98101

99102
for (i in parameters) {
100103
var parameter = parameters[i];

test/resolver.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -943,6 +943,13 @@ describe('swagger resolver', function () {
943943
description: 'ok'
944944
}
945945
}
946+
},
947+
post: {
948+
responses: {
949+
200: {
950+
description: 'ok'
951+
}
952+
}
946953
}
947954
}
948955
}
@@ -952,6 +959,10 @@ describe('swagger resolver', function () {
952959
expect(parameters[0].name).toEqual('skip');
953960
expect(parameters[1].name).toEqual('limit');
954961
expect(spec.paths['/foo'].parameters.length).toBe(0);
962+
963+
964+
parameters = spec.paths['/foo'].post.parameters;
965+
console.log(parameters);
955966
done();
956967
});
957968
});
@@ -1032,6 +1043,13 @@ describe('swagger resolver', function () {
10321043
description: 'ok'
10331044
}
10341045
}
1046+
},
1047+
post: {
1048+
responses: {
1049+
200: {
1050+
description: 'ok'
1051+
}
1052+
}
10351053
}
10361054
}
10371055
}
@@ -1041,6 +1059,10 @@ describe('swagger resolver', function () {
10411059
expect(parameters[0].name).toEqual('skip');
10421060
expect(parameters[1].name).toEqual('limit');
10431061
expect(spec.paths['/foo'].parameters.length).toBe(0);
1062+
1063+
parameters = spec.paths['/foo'].post.parameters;
1064+
expect(parameters[0].name).toEqual('skip');
1065+
expect(parameters.length).toEqual(1);
10441066
done();
10451067
});
10461068
});

0 commit comments

Comments
 (0)