From de4df8e1900f173d48eb888c153ff524fbb2c56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 1 Dec 2020 15:29:05 +0100 Subject: [PATCH 1/2] chore: wadus --- test/acceptance/transaction-test.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/test/acceptance/transaction-test.js b/test/acceptance/transaction-test.js index 8906d33cc..ea6e76107 100644 --- a/test/acceptance/transaction-test.js +++ b/test/acceptance/transaction-test.js @@ -5,15 +5,20 @@ require('../helper'); var assert = require('../support/assert'); var qs = require('querystring'); var request = require('request'); +const server = require('../../lib/server'); describe('transaction', function () { - var SERVER_PORT = 5554; - - var server; before(function (done) { - server = require('../../lib/server')(); - this.listener = server.listen(SERVER_PORT, '127.0.0.1'); - this.listener.on('listening', done); + this.listener = server.listen(0, '127.0.0.1'); + this.listener.on('error', done); + this.listener.on('listening', () => { + const { address, port } = this.listener.address(); + + this.host = address; + this.port = port; + + done(); + }); }); after(function (done) { @@ -25,7 +30,7 @@ describe('transaction', function () { }); function requestUrl (query) { - return 'http://127.0.0.1:' + SERVER_PORT + '/api/v1/sql?' + qs.stringify({ q: query }); + return `http://${this.host}:${this.port}/api/v1/sql?${qs.stringify({ q: query })}`; } var errorQuery = 'BEGIN; PREPARE _pstm AS select error; EXECUTE _pstm; COMMIT;'; From 6959ffbbe72d3f535f2b727a79c311f8f4037f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Tue, 1 Dec 2020 17:53:29 +0100 Subject: [PATCH 2/2] chore: wadus --- test/acceptance/transaction-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/acceptance/transaction-test.js b/test/acceptance/transaction-test.js index ea6e76107..803c4f1e8 100644 --- a/test/acceptance/transaction-test.js +++ b/test/acceptance/transaction-test.js @@ -9,7 +9,7 @@ const server = require('../../lib/server'); describe('transaction', function () { before(function (done) { - this.listener = server.listen(0, '127.0.0.1'); + this.listener = server().listen(0, '127.0.0.1'); this.listener.on('error', done); this.listener.on('listening', () => { const { address, port } = this.listener.address();