Merge pull request #788 from parthverma1/feature/bump-postman-collection-v5

Bump postman-collection to 5.0.0

Author: VShingala

Diff for: .eslintignore

@@ -0,0 +1 @@
+**/ci-install.sh

Diff for: .github/workflows/test.yml

@@ -10,18 +10,28 @@ on:
 jobs:
   Unit-Tests:
     runs-on: ubuntu-20.04
+    strategy:
+      max-parallel: 10
+      matrix:
+        node-version: [ 18.x, 20.x ]
+        language-variant: [ 'csharp-httpclient', 'csharp-restsharp', 'curl', 'dart-dio', 'dart-http', 'golang', 'http',
+                   'java-okhttp', 'java-unirest', 'js-fetch', 'js-jquery', 'js-xhr', 'kotlin-okhttp', 'libcurl',
+                   'nodejs-axios', 'nodejs-native', 'nodejs-request', 'nodejs-unirest', 'objective-c', 'ocaml-cohttp',
+                   'php-curl', 'php-guzzle', 'php-httprequest2', 'php-pecl-http', 'powershell-restmethod',
+                   'python-http.client', 'python-requests', 'r-httr', 'r-rcurl', 'ruby', 'rust-reqwest',
+                   'shell-httpie', 'shell-wget', 'swift' ]
     steps:
       - name: Get Code
         uses: actions/checkout@v3
-      - name: Setup Node JS
+      - name: Use Node JS ${{ matrix.node-version }}
         uses: actions/setup-node@v1
         with:
-          node-version: '12.x'
-      - name: Install system dependencies
-        run: npm run cirequirements
+          node-version: ${{ matrix.node-version }}
       - name: Install package dependencies
         run: npm install
+      - name: Install system dependencies
+        run: npm run cirequirements ${{ matrix.language-variant }}
       - name: Install dependencies for individual codegens
         run: npm run deepinstall dev
       - name: Run tests
-        run: npm run test
+        run: npm run test ${{ matrix.language-variant }}

Diff for: codegens/csharp-httpclient/test/ci-install.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -ev; # stop on error
+
+sudo apt-get update
+echo "Installing dependencies required for tests in codegens/csharp-httpclient"
+# Install latest .net6.0 sdk
+pushd ./codegens/csharp-httpclient &>/dev/null;
+  wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
+  sudo dpkg -i packages-microsoft-prod.deb
+  sudo apt-get install apt-transport-https
+  sudo apt-get update
+  sudo apt-get install dotnet-sdk-6.0
+  dotnet new console -o testProject -f net6.0
+  # no extra packages needed
+popd &>/dev/null;

Diff for: codegens/csharp-restsharp/test/ci-install.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -ev; # stop on error
+
+sudo apt-get update
+echo "Installing dependencies required for tests in codegens/csharp-restsharp"
+pushd ./codegens/csharp-restsharp &>/dev/null;
+  wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
+  sudo dpkg -i packages-microsoft-prod.deb
+  sudo apt-get install apt-transport-https
+  sudo apt-get update
+  sudo apt-get install dotnet-sdk-6.0
+  dotnet new console -o testProject -f net6.0
+  pushd ./testProject &>/dev/null;
+  dotnet add package RestSharp --version 112.0.0
+  popd &>/dev/null;
+popd &>/dev/null;
+
+sudo apt-get install -y mono-complete

Diff for: codegens/curl/test/ci-install.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+set -ev; # stop on error
+
+echo "Installing curl"
+sudo apt-get install -y curl

Diff for: codegens/dart-dio/test/ci-install.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -ev; # stop on error
+
+echo "Installing dependencies required for tests in codegens/dart-dio"
+pushd ./codegens/dart-dio &>/dev/null;
+  wget -q https://storage.googleapis.com/dart-archive/channels/stable/release/3.0.4/linux_packages/dart_3.0.4-1_amd64.deb
+  sudo dpkg -i dart_3.0.4-1_amd64.deb
+  echo '''name: test
+version: 1.0.0
+environment:
+  sdk: ^3.0.3
+dependencies:
+  dio: ^5.2.0
+  ''' > pubspec.yaml
+    dart pub get
+popd &>/dev/null;

Diff for: codegens/dart-http/test/ci-install.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -ev; # stop on error
+
+echo "Installing dependencies required for tests in codegens/dart-http"
+pushd ./codegens/dart-http &>/dev/null;
+  wget -q https://storage.googleapis.com/dart-archive/channels/stable/release/3.0.4/linux_packages/dart_3.0.4-1_amd64.deb
+  sudo dpkg -i dart_3.0.4-1_amd64.deb
+  echo '''name: test
+version: 1.0.0
+environment:
+  sdk: ^3.0.3
+dependencies:
+  http: ^1.0.0
+''' > pubspec.yaml
+  dart pub get
+popd &>/dev/null;

Diff for: codegens/http/npm-shrinkwrap.json

@@ -21,7 +21,7 @@
   "license": "Apache-2.0",
   "homepage": "https://github.com/postmanlabs/code-generators/tree/master/codegens/http",
   "dependencies": {
-    "postman-collection": "^4.4.0"
+    "postman-collection": "^5.0.0"
   },
   "scripts": {
     "test": "node npm/test.js",

Diff for: codegens/http/package.json

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -ev; # stop on error
+
+echo "Installing dependencies required for tests in codegens/java-okhttp"
+pushd ./codegens/java-okhttp &>/dev/null;
+  sudo add-apt-repository ppa:openjdk-r/ppa -y
+  sudo rm -rf /var/lib/apt/lists/*
+  sudo apt-get update
+  sudo apt-get install -y openjdk-8-jdk
+  unzip test/unit/fixtures/dependencies.zip
+popd &>/dev/null;

Diff for: codegens/java-okhttp/test/ci-install.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -ev; # stop on error
+
+echo "Installing dependencies required for tests in codegens/java-unirest"
+pushd ./codegens/java-unirest &>/dev/null;
+  unzip test/unit/fixtures/dependencies.zip
+popd &>/dev/null;

Diff for: codegens/java-unirest/test/ci-install.sh

@@ -28,8 +28,9 @@
   "homepage": "https://github.com/postmanlabs/code-generators/tree/master/codegens/js-fetch",
   "dependencies": {},
   "devDependencies": {
-    "form-data": "2.5.1",
-    "node-fetch": "2.6.7"
+    "formdata-node": "6.0.3",
+    "node-fetch2": "npm:[email protected]",
+    "node-fetch": "3.3.2"
   },
   "engines": {
     "node": ">=8"

Diff for: codegens/js-fetch/npm-shrinkwrap.json

@@ -1,19 +1,33 @@
 var runNewmanTest = require('../../../../test/codegen/newman/newmanTestUtil').runNewmanTest,
-  convert = require('../../lib/index').convert;
+  convert = require('../../lib/index').convert,
+  NODE_VERSION = process.versions.node.split('.')[0];
 
 describe('Convert for different types of request', function () {
-  var testSnippet = 'var fetch = require(\'node-fetch\'),\nFormData = require(\'form-data\'),\n',
-    testConfig = {
+  var testConfig = {
       compileScript: null,
       runScript: 'node snippet.js',
       fileName: 'snippet.js',
       skipCollections: ['formdataFileCollection']
     },
     options = {
       multiLine: true
-    };
-  testSnippet += 'Headers = require(\'node-fetch\').Headers,\n';
-  testSnippet += 'URLSearchParams = require(\'url\').URLSearchParams;\n\n';
+    },
+    testSnippet;
+
+  if (NODE_VERSION < 21) {
+    testSnippet = 'var fetch = require(\'node-fetch2\');\n';
+  }
+  else {
+    testSnippet = 'var fetch = (...args) => import(\'node-fetch\').then(({default: fetch}) => fetch(...args));';
+  }
+
+  if (NODE_VERSION < 21) {
+    // Newer node versions ship with built-in FormData, Headers and URLSearchParams class
+    testSnippet += '\nvar FormData = require(\'formdata-node\').FormData,\n';
+    testSnippet += 'Headers = require(\'node-fetch2\').Headers,\n';
+    testSnippet += 'URLSearchParams = require(\'url\').URLSearchParams;\n\n';
+  }
+
   testConfig.headerSnippet = testSnippet;
   runNewmanTest(convert, options, testConfig);
 });