Merge branch 'master' into develop

Author: ThomasKranitsas

.circleci/config.yml

@@ -8,15 +8,13 @@ parameters:
     type: boolean
 defaults: &defaults
     docker:
-      - image: cimg/python:3.11.0-browsers
+      - image: circleci/python:2.7-stretch-browsers
 install_dependency: &install_dependency
   name: Installation of build and deployment dependencies.
   command: |
-    sudo apt update
     sudo apt install jq python3-pip
-    # sudo pip install docker-compose
     sudo pip3 install awscli --upgrade
-    sudo pip3 install docker-compose
+    # sudo pip install docker-compose
 install_deploysuite: &install_deploysuite
   name: Installation of install_deploysuite.
   command: |
@@ -25,10 +23,10 @@ install_deploysuite: &install_deploysuite
     cp ./../buildscript/buildenv.sh .
     cp ./../buildscript/awsconfiguration.sh .
 restore_cache_settings_for_build: &restore_cache_settings_for_build
-  key: docker-node-modules-{{ checksum "yarn.lock" }}
+  key: docker-node-modules-{{ checksum "package-lock.json" }}
 
 save_cache_settings: &save_cache_settings
-  key: docker-node-modules-{{ checksum "yarn.lock" }}
+  key: docker-node-modules-{{ checksum "package-lock.json" }}
   paths:
     - node_modules
 
@@ -97,13 +95,12 @@ jobs:
       - run: *install_deploysuite      
       - run:
           name: 'newman test'
-          no_output_timeout: 30m
           command: |
             ./awsconfiguration.sh $DEPLOY_ENV
             source awsenvconf
             ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-qa-appvar
             source buildenvvar
-            npm install --loglevel verbose
+            npm i
             cd mock
             (npm run mock-challenge-api&)
             (NODE_ENV=test npm start&)

Verification.md

@@ -94,5 +94,4 @@ Iteration 4/4
 
 Then you can run `npm run test:newman:clear` to delete all testing data by above postman tests.  
 If 'socket hang up' appears while running the `npm run test:newman`. You can increase the `WAIT_TIME` from the `default/test.js`.
- Then run `npm run test:newman:clear` before calling `npm run test:newman` again.
- 
+ Then run `npm run test:newman:clear` before calling `npm run test:newman` again.

app-constants.js

@@ -10,8 +10,7 @@ const UserRoles = {
 }
 
 const ChallengeStatuses = {
-  Completed: 'Completed',
-  Active: 'Active'
+  Completed: 'Completed'
 }
 
 module.exports = {

config/test.js

@@ -17,7 +17,5 @@ module.exports = {
   COPILOT_CREDENTIALS_PASSWORD: process.env.COPILOT_CREDENTIALS_PASSWORD || '',
   USER_CREDENTIALS_USERNAME: process.env.USER_CREDENTIALS_USERNAME || '',
   USER_CREDENTIALS_PASSWORD: process.env.USER_CREDENTIALS_PASSWORD || '',
-  MANAGER_CREDENTIALS_USERNAME: process.env.MANAGER_CREDENTIALS_USERNAME || '',
-  MANAGER_CREDENTIALS_PASSWORD: process.env.MANAGER_CREDENTIALS_PASSWORD || '',
   AUTOMATED_TESTING_REPORTERS_FORMAT: process.env.AUTOMATED_TESTING_REPORTERS_FORMAT || ['cli', 'html']
 }

test/postman/newman.js

@@ -183,17 +183,15 @@ async function clearTestData () {
 /**
  * Run the postman tests.
  */
-clearTestData().then(() => {
-  apiTestLib.runTests(requests, require.resolve('./resource-api.postman_collection.json'),
-    require.resolve('./resource-api.postman_environment.json')).then(async () => {
-    logger.info('newman test completed!')
-    await clearTestData()
-  }).catch(async (err) => {
-    logger.logFullError(err)
+apiTestLib.runTests(requests, require.resolve('./resource-api.postman_collection.json'),
+  require.resolve('./resource-api.postman_environment.json')).then(async () => {
+  logger.info('newman test completed!')
+  await clearTestData()
+}).catch(async (err) => {
+  logger.logFullError(err)
 
-    // Only calling the clean up function when it is not validation error.
-    if (err.name !== 'ValidationError') {
-      await clearTestData()
-    }
-  })
+  // Only calling the clean up function when it is not validation error.
+  if (err.name !== 'ValidationError') {
+    await clearTestData()
+  }
 })