pmpact 0.4.13 → 0.5.0

package/app/app.js

@@ -1,6 +1,5 @@
 const fs = require('fs');
 const path = require('path');
-const axios = require('axios');
 const debug = require('debug')('pmpact:app');
 
 const isUrl = (value) => /^(?:\w+:)?\/\/(\S+)$/.test(value);
@@ -15,7 +14,14 @@ const getContent = async (source, headers) => {
         if (headers) {
             options.headers = JSON.parse(headers);
         }
-        return (await axios.get(source, options)).data;
+        const response = await fetch(source, options);
+        if (!response.ok) {
+            const responseBody = await response.text();
+            const bodyMessage = responseBody ? ` - ${responseBody}` : '';
+            throw new Error(`Request failed with status ${response.status} ${response.statusText}${bodyMessage}`);
+
+        }
+        return await response.json();
     }
     else {
         debug(`Require file: ${source}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmpact",
-  "version": "0.4.13",
+  "version": "0.5.0",
   "description": "A command line tool to convert Pact files to Postman collections.",
   "main": "index.js",
   "scripts": {
@@ -30,11 +30,9 @@
   },
   "homepage": "https://github.com/ITV/pmpact#readme",
   "dependencies": {
-    "axios": "1.15.0",
     "commander": "4.1.1",
     "debug": "4.3.4",
-    "http-status": "1.6.2",
-    "lodash": "4.18.1"
+    "http-status": "1.6.2"
   },
   "devDependencies": {
     "execa": "5.1.1",

package/tests/unit/app/app.js

@@ -1,4 +1,4 @@
-import { it, describe } from 'node:test';
+import { it, describe, afterEach } from 'node:test';
 import assert from 'node:assert/strict';
 import simplePactV2Json from '../../fixtures/v2/simple-pact.json' with { type: 'json' };
 import simplePactV3Json from '../../fixtures/v3/simple-pact.json' with { type: 'json' };
@@ -9,9 +9,12 @@ const proxyquire = require('proxyquire');
 
 
 describe('pmpact > app', () => {
-
-    let axiosStub;
     let fsStub;
+    let originalFetch;
+
+    afterEach(() => {
+        global.fetch = originalFetch;
+    });
 
     const SIMPLE_PACT_URL_V2 = 'http://simple-pact-v2';
     const SIMPLE_PACT_URL_V3 = 'http://simple-pact-v3';
@@ -21,18 +24,18 @@ describe('pmpact > app', () => {
     };
 
     const getApp = async () => {
-        axiosStub = {
-            get: (url) => {
-                if (url === SIMPLE_PACT_URL_V2) return { data: simplePactV2Json };
-                if (url === SIMPLE_PACT_URL_V3) return { data: simplePactV3Json };
-            }
+        originalFetch = global.fetch;
+        global.fetch = (url) => {
+            let data;
+            if (url === SIMPLE_PACT_URL_V2) data = simplePactV2Json;
+            if (url === SIMPLE_PACT_URL_V3) data = simplePactV3Json;
+            return Promise.resolve({ ok: true, json: () => Promise.resolve(data) });
         };
 
         fsStub = {
             writeFile: (path, data, opts, cb) => cb()
         };
         const Application = proxyquire('../../../app/app.js', {
-            'axios': axiosStub,
             'fs': fsStub
         });
         return new Application();
@@ -129,4 +132,40 @@ describe('pmpact > app', () => {
             assert.ok(err.message.indexOf('Invalid pact-parser version supplied') !== -1);
         }
     });
+
+    it('should throw an error with body message when url request fails with a response body', async () => {
+        originalFetch = global.fetch;
+        global.fetch = () => Promise.resolve({
+            ok: false,
+            status: 404,
+            statusText: 'Not Found',
+            text: () => Promise.resolve('Pact broker not found')
+        });
+        const Application = proxyquire('../../../app/app.js', { 'fs': fsStub });
+        const app = new Application();
+        try {
+            await app.parse('http://some-pact-broker/pact');
+            assert.ok(0, 'Should not resolve');
+        } catch (err) {
+            assert.ok(err.message.indexOf('Request failed with status 404 Not Found - Pact broker not found') !== -1);
+        }
+    });
+
+    it('should throw an error without body message when url request fails with an empty response body', async () => {
+        originalFetch = global.fetch;
+        global.fetch = () => Promise.resolve({
+            ok: false,
+            status: 500,
+            statusText: 'Internal Server Error',
+            text: () => Promise.resolve('')
+        });
+        const Application = proxyquire('../../../app/app.js', { 'fs': fsStub });
+        const app = new Application();
+        try {
+            await app.parse('http://some-pact-broker/pact');
+            assert.ok(0, 'Should not resolve');
+        } catch (err) {
+            assert.ok(err.message.indexOf('Request failed with status 500 Internal Server Error') !== -1);
+        }
+    });
 });