From c35fc20bc7c8dd8a3de46205a5936597e66f679f Mon Sep 17 00:00:00 2001 From: Chidi Orji Date: Tue, 21 May 2019 21:54:30 +0100 Subject: [PATCH] chore(UI js): improve code coverage - configure codeclimate reporting --- .travis.yml | 17 ++++++++++------- UI/js/loan.js | 31 +++++++++++++++---------------- UI/js/user.js | 35 +++++++++++++++++------------------ package.json | 4 ++-- 4 files changed, 44 insertions(+), 43 deletions(-) diff --git a/.travis.yml b/.travis.yml index fbfd6f9..5244158 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,13 +16,6 @@ addons: packages: - postgresql-10 - postgresql-client-10 -before_script: - - psql -c 'create database testdb;' -U postgres - - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter - - chmod +x ./cc-test-reporter - - ./cc-test-reporter before-build -after_script: - - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT before_install: - sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/*/main/pg_hba.conf - sudo service postgresql restart @@ -40,3 +33,13 @@ deploy: app: qcredit on: develop after_success: yarn coverage + +before_script: + - psql -c 'create database testdb;' -U postgres + - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter + - chmod +x ./cc-test-reporter + - ./cc-test-reporter before-build +script: + - yarn test +after_script: + - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT diff --git a/UI/js/loan.js b/UI/js/loan.js index 1daba60..b22451f 100644 --- a/UI/js/loan.js +++ b/UI/js/loan.js @@ -5,31 +5,30 @@ const reject_loan_application = document.getElementById( 'reject_loan_application' ); -approve_loan_application.addEventListener('click', e => { - e.preventDefault(); - const cont = prompt( - 'Confirm loan approval', - 'Click okay to approve this loan request'); - +const promptUser = (text, defaultText, msg) => { + const cont = prompt(text, defaultText); if (cont !== null) { - alert('Loan application was approved'); - // send email notification + alert(msg); } +}; +approve_loan_application.addEventListener('click', e => { + e.preventDefault(); + promptUser( + 'Confirm loan approval', + 'Click okay to approve this loan request', + 'Loan application was approved' + ); return; }); reject_loan_application.addEventListener('click', e => { e.preventDefault(); - const cont = prompt( + promptUser( 'Confirm loan rejection', - 'Click okay to reject this loan request'); - - if (cont !== null) { - alert('Loan application was rejected'); - // send email notification - } - + 'Click okay to reject this loan request', + 'Loan application was rejected' + ); return; }); diff --git a/UI/js/user.js b/UI/js/user.js index c205f29..8b0794f 100644 --- a/UI/js/user.js +++ b/UI/js/user.js @@ -1,32 +1,31 @@ const verify_user = document.getElementById('verify_user'); const un_verify_user = document.getElementById('un_verify_user'); -verify_user.addEventListener('click', e => { - e.preventDefault(); - const cont = prompt( - 'Please confirm if you want to verify this user', - 'Click okay to reject this loan request'); - +const promptUser = (text, defaultText, msg) => { + const cont = prompt(text, defaultText); if (cont !== null) { - // verify user - alert('User was verified.'); - // Send email notification + alert(msg); } +}; +verify_user.addEventListener('click', e => { + e.preventDefault(); + + promptUser( + 'Confirm user verification', + 'Click okay to verify this user', + 'User was verified.' + ); return; }); un_verify_user.addEventListener('click', e => { e.preventDefault(); - const cont = prompt( - "Please confirm if you want to verify revoke this user's verification", - "Click okay to revoke this user's verification"); - - if (cont !== null) { - // revoke verification - alert("User's verification was revoked."); - // Send email notification - } + promptUser( + 'Confirm revoking user verification', + "Click okay to revoke this user's verification", + "User's verification was revoked." + ); return; }); diff --git a/package.json b/package.json index 895109b..81d9e10 100644 --- a/package.json +++ b/package.json @@ -15,9 +15,9 @@ "start": "set NODE_ENV=production&node --require @babel/register ./bin/www ", "devstart": "set NODE_ENV=development&set DEBUG=dev&nodemon --exec babel-node ./bin/www", "lint": "./node_modules/.bin/eslint ./", - "test": "set NODE_ENV=test&set DEBUG=test&set DBNAME=testdb&nyc --reporter=html --reporter=text mocha -r @babel/register -r should", + "test": "set NODE_ENV=test&set DEBUG=test&set DBNAME=testdb&nyc --reporter=html --reporter=text --reporter=lcov mocha -r @babel/register -r should", "cover": "nyc report --reporter=text-lcov | coveralls", - "coverage": "nyc report --reporter=text-lcov | coveralls && rm -rf ./.nyc_output && rm -rf coverage/" + "coverage": "nyc report --reporter=text-lcov | coveralls" }, "bugs": { "url": "https://github.com/chidimo/Quick-Credit/issues"