From da8ba1492ab8143ce54d33150a3b62c576c9fb0b Mon Sep 17 00:00:00 2001 From: Nicolas Thouvenin Date: Fri, 22 Nov 2024 13:28:23 +0100 Subject: [PATCH] fix tests again --- packages/basics/test/basics.js | 1 - packages/basics/test/url-fetch.js | 4 ++++ packages/core/src/index.js | 4 ++-- packages/core/test/expand.js | 8 +++++++- packages/core/test/overturn.js | 8 ++++++-- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/packages/basics/test/basics.js b/packages/basics/test/basics.js index b4adcbf74..8ac171139 100644 --- a/packages/basics/test/basics.js +++ b/packages/basics/test/basics.js @@ -115,7 +115,6 @@ describe('test', () => { res.push(chunk); }) .on('end', () => { - console.log(res); assert.equal(3, res.length); assert.equal('"a";"b";"c"\r\n', res[0]); assert.equal('"1";"2";"3"\r\n', res[1]); diff --git a/packages/basics/test/url-fetch.js b/packages/basics/test/url-fetch.js index b7809ff55..6cd6ea4e0 100644 --- a/packages/basics/test/url-fetch.js +++ b/packages/basics/test/url-fetch.js @@ -43,6 +43,10 @@ httpbin .post('/status/400') .reply(400); +httpbin + .get('/status/400') + .reply(400); + httpbin .post('/status/503') .reply(503); diff --git a/packages/core/src/index.js b/packages/core/src/index.js index 85da1e3f6..f7be26feb 100644 --- a/packages/core/src/index.js +++ b/packages/core/src/index.js @@ -116,11 +116,11 @@ ezs.createPipeline = (input, commands, trap) => { } return output .pipe(ezs.catch((e) => { - trap.write(e.toJSON()); // see engine.js createErrorWith + trap.write(JSON.parse(ezs.serializeError(e))); // see engine.js createErrorWith return false; // do not catch the error })) .once('error', (e) => { - trap.write(e.toJSON()); // see engine.js createErrorWith + trap.write(JSON.parse(ezs.serializeError(e))); // see engine.js createErrorWith trap.end(); }) .once('end', () => { diff --git a/packages/core/test/expand.js b/packages/core/test/expand.js index 530d159e1..1d2512286 100644 --- a/packages/core/test/expand.js +++ b/packages/core/test/expand.js @@ -1,4 +1,5 @@ import fs from 'fs'; +import debug from 'debug'; import from from 'from'; import { PassThrough } from 'stream'; import ezs from '../src'; @@ -513,7 +514,12 @@ test('with a buggy script', (done) => { output.push(chunk); }) .on('error', (e) => { - expect(e.message).toEqual(expect.stringContaining('BADVAL is not defined')); + try { + expect(e.message).toEqual(expect.stringContaining('Lodash')); + } + catch (ee) { + done(ee); + } expect(output.length).toEqual(0); done(); }) diff --git a/packages/core/test/overturn.js b/packages/core/test/overturn.js index f81f89e3f..b94301734 100644 --- a/packages/core/test/overturn.js +++ b/packages/core/test/overturn.js @@ -205,8 +205,12 @@ test('with a buggy script', (done) => { output.push(chunk); }) .on('error', (e) => { - expect(e.message).toEqual(expect.stringContaining('BADVAL is not defined')); - expect(output.length).toEqual(0); + try { + expect(e.message).toEqual(expect.stringContaining('Lodash')); + expect(output.length).toEqual(0); + } catch (ee) { + done(ee); + } done(); }) .on('end', () => {