From 87efdfff2e9eedb2030c074600ccc317a9cceb30 Mon Sep 17 00:00:00 2001 From: mulahasanovic Date: Wed, 8 Apr 2026 12:53:15 +0200 Subject: [PATCH] fix(ci): set correct loginMechanism and fix test reload --- .github/workflows/server-tests.yml | 1 + cypress/integration/sasjs.tests.ts | 2 +- sasjs-tests/sasjs/sasjsconfig.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/server-tests.yml b/.github/workflows/server-tests.yml index f2f3742..89f4dc4 100644 --- a/.github/workflows/server-tests.yml +++ b/.github/workflows/server-tests.yml @@ -97,6 +97,7 @@ jobs: npm i jq '.sasJsConfig.serverUrl |= "${{ secrets.SASJS_SERVER_URL }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json jq '.sasJsConfig.serverType |= "SASJS"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json + jq '.sasJsConfig.loginMechanism |= "Default"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json jq '.userName |= "${{ secrets.SASJS_USERNAME }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json jq '.password |= "${{ secrets.SASJS_PASSWORD }}"' ./public/config.json > ./public/config.temp && mv ./public/config.temp ./public/config.json diff --git a/cypress/integration/sasjs.tests.ts b/cypress/integration/sasjs.tests.ts index 5ed0d90..07d82a3 100644 --- a/cypress/integration/sasjs.tests.ts +++ b/cypress/integration/sasjs.tests.ts @@ -9,7 +9,7 @@ context('sasjs-tests', function () { }) beforeEach(() => { - cy.reload() + cy.visit(sasjsTestsUrl) }) function loginIfNeeded() { diff --git a/sasjs-tests/sasjs/sasjsconfig.json b/sasjs-tests/sasjs/sasjsconfig.json index bb61281..530c5f7 100644 --- a/sasjs-tests/sasjs/sasjsconfig.json +++ b/sasjs-tests/sasjs/sasjsconfig.json @@ -7,7 +7,7 @@ "targets": [ { "name": "4gl", - "serverUrl": "https://sas9.4gl.io", + "serverUrl": "https://sas.4gl.io", "serverType": "SASJS", "httpsAgentOptions": { "allowInsecureRequests": false