Skip to content

Commit 3dbffe1

Browse files
committed
chore: Fixed node-fetch versioning for js-fetch tests
1 parent 6389566 commit 3dbffe1

File tree

3 files changed

+63
-41
lines changed

3 files changed

+63
-41
lines changed

codegens/js-fetch/npm-shrinkwrap.json

Lines changed: 40 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

codegens/js-fetch/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@
2828
"homepage": "https://github.com/postmanlabs/code-generators/tree/master/codegens/js-fetch",
2929
"dependencies": {},
3030
"devDependencies": {
31-
"form-data": "2.5.3",
32-
"node-fetch": "2.6.7"
31+
"formdata-node": "6.0.3",
32+
"node-fetch2": "npm:node-fetch@2.7.0",
33+
"node-fetch": "3.3.2"
3334
},
3435
"engines": {
3536
"node": ">=8"
Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,33 @@
11
var runNewmanTest = require('../../../../test/codegen/newman/newmanTestUtil').runNewmanTest,
2-
convert = require('../../lib/index').convert;
2+
convert = require('../../lib/index').convert,
3+
NODE_VERSION = process.versions.node.split('.')[0];
34

45
describe('Convert for different types of request', function () {
5-
var testSnippet = 'var fetch = require(\'node-fetch\'),\nFormData = require(\'form-data\'),\n',
6-
testConfig = {
6+
var testConfig = {
77
compileScript: null,
88
runScript: 'node snippet.js',
99
fileName: 'snippet.js',
1010
skipCollections: ['formdataFileCollection']
1111
},
1212
options = {
1313
multiLine: true
14-
};
15-
testSnippet += 'Headers = require(\'node-fetch\').Headers,\n';
16-
testSnippet += 'URLSearchParams = require(\'url\').URLSearchParams;\n\n';
14+
},
15+
testSnippet;
16+
17+
if (NODE_VERSION < 21) {
18+
testSnippet = 'var fetch = require(\'node-fetch2\');\n';
19+
}
20+
else {
21+
testSnippet = 'var fetch = (...args) => import(\'node-fetch\').then(({default: fetch}) => fetch(...args));';
22+
}
23+
24+
if (NODE_VERSION < 21) {
25+
// Newer node versions ship with built-in FormData, Headers and URLSearchParams class
26+
testSnippet += '\nvar FormData = require(\'formdata-node\').FormData,\n';
27+
testSnippet += 'Headers = require(\'node-fetch2\').Headers,\n';
28+
testSnippet += 'URLSearchParams = require(\'url\').URLSearchParams;\n\n';
29+
}
30+
1731
testConfig.headerSnippet = testSnippet;
1832
runNewmanTest(convert, options, testConfig);
1933
});

0 commit comments

Comments
 (0)