diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ce2b1d8..5b861b0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,7 +77,7 @@ jobs: replace-in-files --regex='"userName".*' --replacement='"userName":"${{ secrets.SASJS_USERNAME }}",' ./public/config.json replace-in-files --regex='"password".*' --replacement='"password":"${{ secrets.SASJS_PASSWORD }}",' ./public/config.json replace-in-files --regex='"serverType".*' --replacement='"serverType":"SASJS",' ./public/config.json - npm run update:adapter + # npm run update:adapter pm2 start --name sasjs-test npm -- start - name: Sleep for 10 seconds @@ -90,6 +90,7 @@ jobs: replace-in-files --regex='"sasjsTestsUrl".*' --replacement='"sasjsTestsUrl":"http://localhost:3000",' ./cypress.json replace-in-files --regex='"username".*' --replacement='"username":"${{ secrets.SASJS_USERNAME }}",' ./cypress.json replace-in-files --regex='"password".*' --replacement='"password":"${{ secrets.SASJS_PASSWORD }}",' ./cypress.json + node -v curl http://localhost:3000 sh ./sasjs-tests/sasjs-cypress-run.sh ${{ secrets.MATRIX_TOKEN }} https://github.com/${{github.repository}}/actions/runs/${{github.run_id}} diff --git a/sasjs-tests/package-lock.json b/sasjs-tests/package-lock.json index 2fbbba4..39d8b12 100644 --- a/sasjs-tests/package-lock.json +++ b/sasjs-tests/package-lock.json @@ -8,14 +8,15 @@ "name": "@sasjs/tests", "version": "1.0.0", "dependencies": { + "@sasjs/adapter": "4.3.6", "@sasjs/test-framework": "1.5.7", "@types/jest": "^26.0.20", "@types/node": "^14.14.41", - "@types/react": "^18.0.1", - "@types/react-dom": "^18.0.0", + "@types/react": "^16.0.1", + "@types/react-dom": "^16.0.0", "@types/react-router-dom": "^5.1.7", - "react": "^18.0.1", - "react-dom": "^18.0.1", + "react": "^16.0.1", + "react-dom": "^16.0.1", "react-router-dom": "^5.2.0", "react-scripts": "^5.0.1", "typescript": "^4.1.3" @@ -2900,7 +2901,6 @@ "resolved": "https://registry.npmjs.org/@sasjs/adapter/-/adapter-4.3.6.tgz", "integrity": "sha512-l6BJNqWa4k0OpLgghED/BqTzUgWCgv7BGJpKheMTdHys3f5KgyKtEqXwwloXSvCTPVn441zsRT2Z0WsS7DNWrw==", "hasInstallScript": true, - "peer": true, "dependencies": { "@sasjs/utils": "2.52.0", "axios": "0.27.2", @@ -2934,7 +2934,6 @@ "version": "2.52.0", "hasInstallScript": true, "license": "ISC", - "peer": true, "dependencies": { "@types/fs-extra": "9.0.13", "@types/prompts": "2.0.13", @@ -3313,7 +3312,6 @@ "node_modules/@types/fs-extra": { "version": "9.0.13", "license": "MIT", - "peer": true, "dependencies": { "@types/node": "*" } @@ -3410,7 +3408,6 @@ "node_modules/@types/prompts": { "version": "2.0.13", "license": "MIT", - "peer": true, "dependencies": { "@types/node": "*" } @@ -3432,9 +3429,9 @@ "license": "MIT" }, "node_modules/@types/react": { - "version": "18.2.13", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.13.tgz", - "integrity": "sha512-vJ+zElvi/Zn9cVXB5slX2xL8PZodPCwPRDpittQdw43JR2AJ5k3vKdgJJyneV/cYgIbLQUwXa9JVDvUZXGba+Q==", + "version": "16.14.43", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.43.tgz", + "integrity": "sha512-7zdjv7jvoLLQg1tTvpQsm+hyNUMT2mPlNV1+d0I8fbGhkJl82spopMyBlu4wb1dviZAxpGdk5eHu/muacknnfw==", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -3442,11 +3439,11 @@ } }, "node_modules/@types/react-dom": { - "version": "18.2.6", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.6.tgz", - "integrity": "sha512-2et4PDvg6PVCyS7fuTc4gPoksV58bW0RwSxWKcPRcHZf0PRUGq03TKcD/rUHe3azfV6/5/biUBJw+HhCQjaP0A==", + "version": "16.9.19", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.9.19.tgz", + "integrity": "sha512-xC8D280Bf6p0zguJ8g62jcEOKZiUbx9sIe6O3tT/lKfR87A7A6g65q13z6D5QUMIa/6yFPkNhqjF5z/VVZEYqQ==", "dependencies": { - "@types/react": "*" + "@types/react": "^16" } }, "node_modules/@types/react-router": { @@ -4378,7 +4375,6 @@ "node_modules/axios": { "version": "0.27.2", "license": "MIT", - "peer": true, "dependencies": { "follow-redirects": "^1.14.9", "form-data": "^4.0.0" @@ -4387,7 +4383,6 @@ "node_modules/axios-cookiejar-support": { "version": "1.0.1", "license": "MIT", - "peer": true, "dependencies": { "is-redirect": "^1.0.0", "pify": "^5.0.0" @@ -5118,7 +5113,6 @@ }, "node_modules/cli-table": { "version": "0.3.6", - "peer": true, "dependencies": { "colors": "1.0.3" }, @@ -5250,7 +5244,6 @@ "node_modules/colors": { "version": "1.0.3", "license": "MIT", - "peer": true, "engines": { "node": ">=0.1.90" } @@ -5349,8 +5342,7 @@ }, "node_modules/consola": { "version": "2.15.0", - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/console-control-strings": { "version": "1.1.0", @@ -5841,8 +5833,7 @@ }, "node_modules/csv-stringify": { "version": "5.6.5", - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/damerau-levenshtein": { "version": "1.0.8", @@ -7374,7 +7365,6 @@ "node_modules/find": { "version": "0.3.0", "license": "MIT", - "peer": true, "dependencies": { "traverse-chain": "~0.1.0" } @@ -7587,7 +7577,6 @@ "node_modules/form-data": { "version": "4.0.0", "license": "MIT", - "peer": true, "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -8368,8 +8357,7 @@ }, "node_modules/https": { "version": "1.0.0", - "license": "ISC", - "peer": true + "license": "ISC" }, "node_modules/https-proxy-agent": { "version": "5.0.1", @@ -8768,7 +8756,6 @@ "node_modules/is-redirect": { "version": "1.0.0", "license": "MIT", - "peer": true, "engines": { "node": ">=0.10.0" } @@ -10626,8 +10613,7 @@ }, "node_modules/jwt-decode": { "version": "3.1.2", - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/keyboard-key": { "version": "1.1.0", @@ -12074,7 +12060,6 @@ "node_modules/pify": { "version": "5.0.0", "license": "MIT", - "peer": true, "engines": { "node": ">=10" }, @@ -13423,11 +13408,13 @@ } }, "node_modules/react": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", - "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", + "version": "16.14.0", + "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz", + "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==", "dependencies": { - "loose-envify": "^1.1.0" + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1", + "prop-types": "^15.6.2" }, "engines": { "node": ">=0.10.0" @@ -13524,15 +13511,17 @@ } }, "node_modules/react-dom": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", - "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", + "version": "16.14.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz", + "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==", "dependencies": { "loose-envify": "^1.1.0", - "scheduler": "^0.23.0" + "object-assign": "^4.1.1", + "prop-types": "^15.6.2", + "scheduler": "^0.19.1" }, "peerDependencies": { - "react": "^18.2.0" + "react": "^16.14.0" } }, "node_modules/react-error-overlay": { @@ -14496,11 +14485,12 @@ } }, "node_modules/scheduler": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", - "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz", + "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==", "dependencies": { - "loose-envify": "^1.1.0" + "loose-envify": "^1.1.0", + "object-assign": "^4.1.1" } }, "node_modules/schema-utils": { @@ -15675,8 +15665,7 @@ }, "node_modules/traverse-chain": { "version": "0.1.0", - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/trim-newlines": { "version": "3.0.1", @@ -15988,8 +15977,7 @@ } }, "node_modules/valid-url": { - "version": "1.0.9", - "peer": true + "version": "1.0.9" }, "node_modules/validate-npm-package-license": { "version": "3.0.4", diff --git a/sasjs-tests/package.json b/sasjs-tests/package.json index 3afc585..519424a 100644 --- a/sasjs-tests/package.json +++ b/sasjs-tests/package.json @@ -5,13 +5,14 @@ "private": true, "dependencies": { "@sasjs/test-framework": "1.5.7", + "@sasjs/adapter": "4.3.6", "@types/jest": "^26.0.20", "@types/node": "^14.14.41", - "@types/react": "^18.0.1", - "@types/react-dom": "^18.0.0", + "@types/react": "^16.0.1", + "@types/react-dom": "^16.0.0", "@types/react-router-dom": "^5.1.7", - "react": "^18.0.1", - "react-dom": "^18.0.1", + "react": "^16.0.1", + "react-dom": "^16.0.1", "react-router-dom": "^5.2.0", "react-scripts": "^5.0.1", "typescript": "^4.1.3"