diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 570989a..b0de28a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,8 +74,8 @@ jobs: replace-in-files --regex='"@sasjs/adapter".*' --replacement='"@sasjs/adapter":"latest",' ./package.json npm i --legacy-peer-deps replace-in-files --regex='"serverUrl".*' --replacement='"serverUrl":"${{ secrets.SASJS_SERVER_URL }}",' ./public/config.json - # 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='"userName".*' --replacement='"userName":"${{ secrets.SASJS_USERNAME_DEV }}",' ./public/config.json + replace-in-files --regex='"password".*' --replacement='"password":"${{ secrets.SASJS_PASSWORD_DEV }}",' ./public/config.json replace-in-files --regex='"serverType".*' --replacement='"serverType":"SASJS",' ./public/config.json # npm run update:adapter pm2 start --name sasjs-test npm -- start @@ -91,8 +91,8 @@ jobs: run: | ss -lntu 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 + replace-in-files --regex='"username".*' --replacement='"username":"${{ secrets.SASJS_USERNAME_DEV }}",' ./cypress.json + replace-in-files --regex='"password".*' --replacement='"password":"${{ secrets.SASJS_PASSWORD_DEV }}",' ./cypress.json sh ./sasjs-tests/sasjs-cypress-run.sh ${{ secrets.MATRIX_TOKEN }} https://github.com/${{github.repository}}/actions/runs/${{github.run_id}} # For some reason if coverage report action is run before other commands, those commands can't access the directories and files on which they depend on diff --git a/cypress.json b/cypress.json index 7f2fb2b..ddb5a1c 100644 --- a/cypress.json +++ b/cypress.json @@ -3,8 +3,8 @@ "defaultCommandTimeout": 20000, "env": { "sasjsTestsUrl": "", - "username": "sasjstests", - "password": "sasjs1stheBe$t", + "username": "", + "password": "", "screenshotOnRunFailure": false, "testingFinishTimeout": 240000 } diff --git a/sasjs-tests/public/config.json b/sasjs-tests/public/config.json index 1f5bcb9..2692520 100644 --- a/sasjs-tests/public/config.json +++ b/sasjs-tests/public/config.json @@ -1,6 +1,6 @@ { - "userName": "sasjstests", - "password": "sasjs1stheBe$t", + "userName": "", + "password": "", "sasJsConfig": { "serverUrl": "https://sas9.4gl.io", "appLoc": "/Public/app/adapter-tests/services",