Skip to content

Commit

Permalink
Upgrade to node version 15 (#1176)
Browse files Browse the repository at this point in the history
* Upgrade to node version 15

* Revert changes to angular.json

* Remove sass package

* Update yarn lock and known issues

* Update codeceptjs npx run syntax as per documentation

* ignore failing test.  Due to incomplete feature added

---------

Co-authored-by: olusegun odunukan <olusegun.odunukan@hmcts.net>
  • Loading branch information
richardhenryash and olusegz07 authored Nov 7, 2023
1 parent 3a413f3 commit 1a296b4
Show file tree
Hide file tree
Showing 10 changed files with 861 additions and 148,733 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.21.3
15.14.0
147,522 changes: 0 additions & 147,522 deletions .yarn/releases/yarn-1.22.15.cjs

This file was deleted.

561 changes: 281 additions & 280 deletions .yarn/releases/yarn-3.5.0.cjs → .yarn/releases/yarn-3.6.3.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"

yarnPath: .yarn/releases/yarn-3.5.0.cjs
yarnPath: .yarn/releases/yarn-3.6.3.cjs
2 changes: 1 addition & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -212,4 +212,4 @@
"cli": {
"analytics": false
}
}
}
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"start:node": "cd api && yarn watch",
"start:node:docker": "PUI_ENV=ldocker;cd api && yarn watch",
"test": "yarn test:ng",
"test:a11y": "node ./test_codecept/backendMock/configCopy.js && NODE_CONFIG_ENV=mock TEST_TYPE=a11y PARALLEL=false npx codeceptjs --config=./test_codecept/codeceptCommon/codeceptA11y.conf.ts run",
"test:a11y": "node ./test_codecept/backendMock/configCopy.js && NODE_CONFIG_ENV=mock TEST_TYPE=a11y PARALLEL=false npx codeceptjs run --config ./test_codecept/codeceptCommon/codeceptA11y.conf.ts",
"test:a11y1": "ng e2e --protractorConfig=./test/accessibility/config/protractor.conf.js",
"test:api": "ts-node ./test_codecept/integration/tests/test.ts",
"test:can-i-deploy:consumer": "export VERSION=$(git rev-parse --short HEAD) && SSL_CERT_FILE=api/test/pact/cer/ca-bundle.crt pact-broker can-i-deploy --pacticipant 'xui_manageOrg' --version ${VERSION} --broker-base-url https://pact-broker.platform.hmcts.net",
Expand All @@ -46,15 +46,15 @@
"test:ngIntegrationMockEnv": "node -e 'require(`./test/nodeMock/availablePortFinder.js`).configureTestProxyPort()'",
"test:node:watch": "cd api && yarn test:watch",
"test:pact:run-and-publish": "yarn test-pact && yarn publish-pact",
"test:smoke": "node ./test_codecept/backendMock/configCopy.js && NODE_CONFIG_ENV=mock TEST_TYPE=smoke npx codeceptjs run --plugins retryFailedStep --config=./test_codecept/codeceptCommon/codecept.conf.ts --features",
"test:smoke": "node ./test_codecept/backendMock/configCopy.js && NODE_CONFIG_ENV=mock TEST_TYPE=smoke npx codeceptjs run --plugins cucumberJsonReporter --plugins retryFailedStep --config ./test_codecept/codeceptCommon/codecept.conf.ts --features",
"test:smoke:local": "webdriver-manager update --versions.chrome 2.40 && protractor ./test/e2e/config/smoke.conf.js --local",
"test-pact": "NODE_PATH=. NODE_ENV=pacttesting LOG_LEVEL=info mocha --timeout 10000 -r ts-node/register api/test/pact/pact-tests/**/*.spec.ts",
"test-pact": "NODE_PATH=. NODE_ENV=pacttesting LOG_LEVEL=info mocha --timeout 10000 -r ts-node/register api/test/pact/pact-tests/**/*.spec.ts",
"testx": "cd api && yarn coverage && cd .. && yarn test:ng //node tests are broken need to fix",
"test:codeceptE2EDebug": "DEBUG=true TEST_TYPE=e2e npx codeceptjs run --plugins retryFailedStep --config=./test_codecept/codeceptCommon/codecept.conf.ts --features",
"test:codeceptE2E": "TEST_TYPE=e2e npx codeceptjs run-workers --suites 6 --plugins retryFailedStep --config=./test_codecept/codeceptCommon/codecept.conf.ts --features",
"test:codeceptE2EDebug": "DEBUG=true TEST_TYPE=e2e npx codeceptjs run --plugins cucumberJsonReporter --plugins retryFailedStep --config ./test_codecept/codeceptCommon/codecept.conf.ts --features",
"test:codeceptE2E": "TEST_TYPE=e2e npx codeceptjs run-workers --suites 6 --plugins cucumberJsonReporter --plugins retryFailedStep --config ./test_codecept/codeceptCommon/codecept.conf.ts --features",
"test:backendMock": "DEBUG=true nodemon test_codecept/backendMock/app --standalone",
"test:xuiIntegrationDebug": "DEBUG=true NODE_CONFIG_ENV=mock TEST_TYPE=ngIntegration npx codeceptjs run -p pauseOnFail --config=./test_codecept/codeceptCommon/codecept.conf.ts --features",
"test:xuiIntegration": "yarn build && node ./test_codecept/backendMock/configCopy.js && NODE_CONFIG_ENV=mock TEST_TYPE=ngIntegration PARALLEL=true npx codeceptjs run-workers --suites 6 --config=./test_codecept/codeceptCommon/codecept.conf.ts --features "
"test:xuiIntegrationDebug": "DEBUG=true NODE_CONFIG_ENV=mock TEST_TYPE=ngIntegration npx codeceptjs run -p pauseOnFail --config ./test_codecept/codeceptCommon/codecept.conf.ts --features",
"test:xuiIntegration": "yarn build && node ./test_codecept/backendMock/configCopy.js && NODE_CONFIG_ENV=mock TEST_TYPE=ngIntegration PARALLEL=true npx codeceptjs run-workers --suites 6 --config ./test_codecept/codeceptCommon/codecept.conf.ts --features"
},
"private": true,
"dependencies": {
Expand Down Expand Up @@ -172,8 +172,8 @@
"allure-js-commons": "^1.3.2",
"chai": "^4.2.0",
"chai-as-promised": "7.1.1",
"codeceptjs": "3.3.7",
"codeceptjs-cucumber-json-reporter": "^1.0.11",
"codeceptjs": "3.5.6",
"codeceptjs-cucumber-json-reporter": "^1.0.14",
"codelyzer": "^5.1.2",
"cross-env": "^7.0.2",
"cucumber": "5.1.0",
Expand Down Expand Up @@ -230,5 +230,5 @@
"@stryker-mutator/mocha-runner": "^3.0.1",
"@stryker-mutator/typescript": "^4.0.0"
},
"packageManager": "yarn@3.5.0"
"packageManager": "yarn@3.6.3"
}
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ Feature: Register other org, Navigations
| Email address | Provide your contact details |
| What regulators are you (as an individual) registered with? | What regulator are you (as an individual) registered with? |

@ignore
Scenario: check your answers, chnage link and continue
When In register other org check your answers page, I click change link for field "Organisation type"
Then I am on register other org page "What type of organisation are you registering?"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Feature: Register other org, page validations
When I click continue in register other org workflow
Then I am on register other org page "What is the registered address of your organisation?"


@ignore
Scenario: Register other org, page level validations in What is the registered address of your organisation?
When In register organisation workflow, I navigate to route "registered-address/external"
When I click continue in register other org workflow
Expand Down
2 changes: 1 addition & 1 deletion yarn-audit-known-issues

Large diffs are not rendered by default.

Loading

0 comments on commit 1a296b4

Please sign in to comment.