Skip to content

Commit 2de3d44

Browse files
committed
Merge branch 'feature/validate-transactions-v2' of github.com:postmanlabs/openapi-to-postman into feature/validate-transactions-v2
2 parents b5d764e + 60ee9d7 commit 2de3d44

File tree

2 files changed

+14
-23
lines changed

2 files changed

+14
-23
lines changed

libV2/schemaUtils.js

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1691,16 +1691,19 @@ let QUERYPARAM = 'query',
16911691
return responseAuthHelper;
16921692
},
16931693

1694-
resolveResponseForPostmanRequest = (context, operationItem, originalRequest) => {
1694+
resolveResponseForPostmanRequest = (context, operationItem, request) => {
16951695
let responses = [];
16961696

16971697
_.forOwn(operationItem.responses, (responseSchema, code) => {
16981698
let response,
16991699
{ includeAuthInfoInExample } = context.computedOptions,
17001700
responseAuthHelper,
1701-
auth = originalRequest.auth,
1701+
auth = request.auth,
17021702
{ body, contentHeader = [], bodyType } = resolveResponseBody(context, responseSchema) || {},
1703-
headers = resolveResponseHeaders(context, responseSchema.headers);
1703+
headers = resolveResponseHeaders(context, responseSchema.headers),
1704+
originalRequest = request,
1705+
reqHeaders = _.clone(request.headers) || [],
1706+
reqQueryParams = _.clone(_.get(request, 'params.queryParams', []));
17041707

17051708
if (includeAuthInfoInExample) {
17061709
if (!auth) {
@@ -1709,11 +1712,13 @@ let QUERYPARAM = 'query',
17091712

17101713
responseAuthHelper = getResponseAuthHelper(auth);
17111714

1712-
originalRequest.headers = originalRequest.headers || [];
1713-
originalRequest.headers.push(...responseAuthHelper.header);
1715+
reqHeaders.push(...responseAuthHelper.header);
1716+
reqQueryParams.push(...responseAuthHelper.query);
17141717

1715-
_.set(originalRequest, 'params.queryParams', _.get(originalRequest, 'params.queryParams', []));
1716-
originalRequest.params.queryParams.push(...responseAuthHelper.query);
1718+
originalRequest = _.assign({}, request, {
1719+
headers: reqHeaders,
1720+
params: _.assign({}, request.params, { queryParams: reqQueryParams })
1721+
});
17171722
}
17181723

17191724
response = {

test/unit/convertV2.test.js

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1946,14 +1946,7 @@ describe('The convert Function', function() {
19461946
expect(conversionResult.output[0].data.auth.apikey[1].value).to.equal('{{apiKey}}');
19471947

19481948
const item = conversionResult.output[0].data.item[0].item[0].item[0];
1949-
expect(item.request.header[0]).to.be.eql({
1950-
description: {
1951-
content: 'Added as a part of security scheme: apikey',
1952-
type: 'text/plain'
1953-
},
1954-
key: '{{apiKeyName}}',
1955-
value: '<API Key>'
1956-
});
1949+
expect(item.request.header).to.not.be.ok;
19571950
expect(item.response[0].originalRequest.header[0]).to.be.eql({
19581951
description: {
19591952
content: 'Added as a part of security scheme: apikey',
@@ -1998,14 +1991,7 @@ describe('The convert Function', function() {
19981991

19991992
const item = conversionResult.output[0].data.item[0].item[0].item[0];
20001993

2001-
expect(item.request.header[0]).to.be.eql({
2002-
description: {
2003-
content: 'Added as a part of security scheme: oauth1',
2004-
type: 'text/plain'
2005-
},
2006-
key: 'Authorization',
2007-
value: 'OAuth <credentials>'
2008-
});
1994+
expect(item.request.header).to.not.be.ok;
20091995
expect(item.response[0].originalRequest.header[0]).to.be.eql({
20101996
description: {
20111997
content: 'Added as a part of security scheme: oauth1',

0 commit comments

Comments
 (0)