From d3767309a67e43ca41643aa5a095345a35911081 Mon Sep 17 00:00:00 2001 From: Pedro Teixeira Date: Wed, 22 Nov 2017 09:23:08 +0000 Subject: [PATCH 1/3] Fixed config.replace. Should fix #633 --- src/config/replace.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/config/replace.js b/src/config/replace.js index f6a41df97..24f9f0b00 100644 --- a/src/config/replace.js +++ b/src/config/replace.js @@ -2,17 +2,15 @@ const streamifier = require('streamifier') const promisify = require('promisify-es6') +const SendOneFile = require('../utils/send-one-file') module.exports = (send) => { + const sendOneFile = SendOneFile(send, 'config/replace') return promisify((config, callback) => { if (typeof config === 'object') { config = streamifier.createReadStream(Buffer.from(JSON.stringify(config))) } - send({ - path: 'config/replace', - files: config, - buffer: true - }, callback) + sendOneFile(config, {}, callback) }) } From ac329f15eae36549ae52df4f1090944e5a201eba Mon Sep 17 00:00:00 2001 From: Pedro Teixeira Date: Wed, 22 Nov 2017 09:46:38 +0000 Subject: [PATCH 2/3] not expecting anuy response any more when sending one file --- src/utils/send-one-file.js | 3 --- test/request-api.spec.js | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/utils/send-one-file.js b/src/utils/send-one-file.js index 80de20842..7b510f19d 100644 --- a/src/utils/send-one-file.js +++ b/src/utils/send-one-file.js @@ -9,9 +9,6 @@ module.exports = (send, path) => { if (err) { return callback(err) } - if (results.length !== 1) { - return callback(new Error('expected 1 result and had ' + results.length)) - } callback(null, results[0]) }) } diff --git a/test/request-api.spec.js b/test/request-api.spec.js index 5edfafba4..cd676b83b 100644 --- a/test/request-api.spec.js +++ b/test/request-api.spec.js @@ -11,7 +11,7 @@ const ndjson = require('ndjson') const pump = require('pump') describe('\'deal with HTTP weirdness\' tests', () => { - it('does not crash if no content-type header is provided', (done) => { + it.only('does not crash if no content-type header is provided', (done) => { if (!isNode) { return done() } From ece41ef207cd907c2eefe01d75d961cab76a35f1 Mon Sep 17 00:00:00 2001 From: Pedro Teixeira Date: Wed, 22 Nov 2017 09:51:22 +0000 Subject: [PATCH 3/3] un-only test --- test/request-api.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/request-api.spec.js b/test/request-api.spec.js index cd676b83b..5edfafba4 100644 --- a/test/request-api.spec.js +++ b/test/request-api.spec.js @@ -11,7 +11,7 @@ const ndjson = require('ndjson') const pump = require('pump') describe('\'deal with HTTP weirdness\' tests', () => { - it.only('does not crash if no content-type header is provided', (done) => { + it('does not crash if no content-type header is provided', (done) => { if (!isNode) { return done() }