From dbcc684a4682a80cb2fb69c717af0c0b73fb9b05 Mon Sep 17 00:00:00 2001 From: browniecab Date: Fri, 31 Aug 2018 12:34:43 -0400 Subject: [PATCH] Fixes (cherry picked from commit 359fff4c28c58bb5d047993ae91cf2b65f03eaa6) --- bigbluebutton-html5/test-html5.sh | 2 ++ bigbluebutton-html5/tests/puppeteer/html5-check.js | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/bigbluebutton-html5/test-html5.sh b/bigbluebutton-html5/test-html5.sh index a01532a018..d96e5c3039 100755 --- a/bigbluebutton-html5/test-html5.sh +++ b/bigbluebutton-html5/test-html5.sh @@ -1,3 +1,5 @@ +export BBB_SERVER_URL="http://localhost/bigbluebutton/api" + # Change to HTML5 directory cd $(dirname $0) echo "Working directory: $PWD" diff --git a/bigbluebutton-html5/tests/puppeteer/html5-check.js b/bigbluebutton-html5/tests/puppeteer/html5-check.js index a49d2ead44..c2a0c9f8c2 100644 --- a/bigbluebutton-html5/tests/puppeteer/html5-check.js +++ b/bigbluebutton-html5/tests/puppeteer/html5-check.js @@ -1,7 +1,10 @@ require('dotenv').config(); const axios = require('axios'); +const path = require('path'); const url = require('url'); const helper = require('./helper'); +const httpPath = path.join(path.dirname(require.resolve('axios')),'lib/adapters/http'); +const http = require(httpPath); (async () => { @@ -15,7 +18,7 @@ const helper = require('./helper'); { try { - var response = await axios.get(check); + var response = await axios.get(check, {adapter: http}); var status = response.data.html5clientStatus console.log(response.data); if(status === 'running')