From 95efd7daf69b91031e995ad3309745cc976df820 Mon Sep 17 00:00:00 2001 From: hmayenve Date: Mon, 16 Sep 2019 16:45:09 -0400 Subject: [PATCH 1/4] env-test --- .env.test | 7 +++++++ config/config.js | 9 +++++++++ 2 files changed, 16 insertions(+) create mode 100644 .env.test diff --git a/.env.test b/.env.test new file mode 100644 index 0000000..da218ec --- /dev/null +++ b/.env.test @@ -0,0 +1,7 @@ +NODE_ENV=test +PORT=4040 +MONGO_HOST=mongodb://localhost/hl7-telescoper-api-server-development +MONGO_PORT=27017 +JWT_SECRET=0a6b944d-d2fb-46fc-a85e-0295c986cd9f +JWT_EXP_TIME=1h +FILE_UPLOAD_PATH=data/hl7-uploads-test \ No newline at end of file diff --git a/config/config.js b/config/config.js index b3f2954..62ef7b9 100644 --- a/config/config.js +++ b/config/config.js @@ -1,5 +1,14 @@ const Joi = require('joi'); +const dotenv = require('dotenv') +// require and configure dotenv, will load vars in .env or .env.test in PROCESS.ENV +if (process.env.NODE_ENV === 'test') { + console.log('config.js: Using .env.test') + dotenv.config({ path: '.env.test' }); +} else { + console.log('config.js: Using .env') + dotenv.config(); +} // require and configure dotenv, will load vars in .env in PROCESS.ENV require('dotenv').config(); From 95e69f78e9d3c401238a15bf5787c206c74673e3 Mon Sep 17 00:00:00 2001 From: hmayenve Date: Mon, 16 Sep 2019 16:47:22 -0400 Subject: [PATCH 2/4] update yarn.lock --- yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index a775145..7029e45 100644 --- a/yarn.lock +++ b/yarn.lock @@ -294,7 +294,7 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" -bcrypt@false3.0.6: +bcrypt@3.0.6: version "3.0.6" resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-3.0.6.tgz#f607846df62d27e60d5e795612c4f67d70206eb2" integrity sha512-taA5bCTfXe7FUjKroKky9EXpdhkVvhE5owfxfLYodbrAR1Ul3juLmIQmIQBK4L9a5BuUcE6cqmwT+Da20lF9tg== From 827fdf017e976b81121d2112ede07f8237a9e759 Mon Sep 17 00:00:00 2001 From: hmayenve Date: Tue, 17 Sep 2019 13:52:12 -0400 Subject: [PATCH 3/4] removing 500HL7Messages.txt after tests execution --- server/hl7/hl7.test.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server/hl7/hl7.test.js b/server/hl7/hl7.test.js index acff295..76a06fd 100644 --- a/server/hl7/hl7.test.js +++ b/server/hl7/hl7.test.js @@ -4,6 +4,7 @@ const httpStatus = require('http-status'); const chai = require('chai'); // eslint-disable-line import/newline-after-import const expect = chai.expect; const app = require('../../index'); +const fs = require('fs'); chai.config.includeStack = true; @@ -11,6 +12,11 @@ chai.config.includeStack = true; * root level hooks */ after((done) => { + // Deleting any sample HL7 message used for testing if they exist already before running tests + fs.unlinkSync('data/hl7-uploads-test/500HL7Messages.txt', (err) => { + if (err) throw err; + console.log('data/hl7-uploads-test/500HL7Messages.txt was deleted'); + }); // required because https://github.com/Automattic/mongoose/issues/1251#issuecomment-65793092 mongoose.models = {}; mongoose.modelSchemas = {}; @@ -46,7 +52,7 @@ before((done) => { describe('## File Upload', () => { describe('# POST /api/hl7/upload', () => { - it('should upload a file to /data/hl7-uploads', (done) => { + it('should upload a file to /data/hl7-uploads-test', (done) => { request(app) .post('/api/hl7/upload') .set('Authorization', `Bearer ${userToken}`) From 305019876fddf92401ff160c77c8b7f92024456d Mon Sep 17 00:00:00 2001 From: hmayenve Date: Tue, 17 Sep 2019 14:13:47 -0400 Subject: [PATCH 4/4] creating folder for testing uploading hl7 file .txt --- server/hl7/hl7.test.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/hl7/hl7.test.js b/server/hl7/hl7.test.js index 76a06fd..752f086 100644 --- a/server/hl7/hl7.test.js +++ b/server/hl7/hl7.test.js @@ -31,6 +31,10 @@ const user = { }; let userToken = ''; before((done) => { + if(!fs.existsSync('data/hl7-uploads-test')) { + fs.mkdirSync('data/hl7-uploads-test') + } + // create a user request(app) .post('/api/users')