From fa87d6a0714eecf4a8d0755bab68382349612df5 Mon Sep 17 00:00:00 2001 From: MrFry Date: Mon, 23 Mar 2020 16:08:46 +0100 Subject: [PATCH] Post test data accepts file as param now, image comparing fix --- devel/tests/testScripts/postTestData.sh | 6 ++++-- modules/api/api.js | 1 + modules/qmining/qmining-page | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/devel/tests/testScripts/postTestData.sh b/devel/tests/testScripts/postTestData.sh index e6b2ace..9b8fe33 100755 --- a/devel/tests/testScripts/postTestData.sh +++ b/devel/tests/testScripts/postTestData.sh @@ -2,14 +2,16 @@ url=$(head -n 1 ../serverAddress) echo "Server url: $url" + if [ "$#" -ne 1 ]; then echo "1 param required: json to send to localhost, got $#" else + data=$(tr -d '\n' < "$1" | awk '$1=$1') echo sending echo "SENT DATA:" ../bin/hr.sh - echo "$1" + echo "$data" ../bin/hr.sh - curl -X POST --data "datatoadd=$1" "$url/isAdding" + curl -X POST --data "datatoadd=$data" "$url/isAdding" fi diff --git a/modules/api/api.js b/modules/api/api.js index d1097d6..eea18ec 100644 --- a/modules/api/api.js +++ b/modules/api/api.js @@ -88,6 +88,7 @@ Load() // -------------------------------------------------------------- app.get('/', function (req, res) { + logger.LogReq(req) res.redirect('https://www.youtube.com/watch?v=ieqGJgqiXFk') }) diff --git a/modules/qmining/qmining-page b/modules/qmining/qmining-page index 302741e..b22e101 160000 --- a/modules/qmining/qmining-page +++ b/modules/qmining/qmining-page @@ -1 +1 @@ -Subproject commit 302741ed69681b414a62def068f2ef69196e2c30 +Subproject commit b22e101477ef2ef87c844b91bd3c29863320bc29