From 67bc08b720bd66f251300506305c7bfeb65d4624 Mon Sep 17 00:00:00 2001 From: Kevin Gartland Date: Mon, 13 Nov 2023 15:17:34 -0500 Subject: [PATCH] separate windows --- test/cy/justfile | 7 ++++++- test/cy/package.json | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/test/cy/justfile b/test/cy/justfile index 7c937c6c0..aa059c36b 100644 --- a/test/cy/justfile +++ b/test/cy/justfile @@ -78,4 +78,9 @@ test-deploy: pip install -r ../setup/requirements.txt export CONNECT_SERVER="$(python ../setup/connect_setup.py)" export CONNECT_API_KEY="$(python ../setup/gen_apikey.py 'admin')" - CYPRESS_CONNECT_ADDRESS="${CONNECT_SERVER}/connect/\#/login" npm run test-deploy + export CYPRESS_CONNECT_ADDRESS="${CONNECT_SERVER}/connect/\#/login" + if [[ "$(expr substr $(uname -s) 1 10)" =~ "MINGW" ]]; then + npm run test-deploy-windows + else + npm run test-deploy + fi diff --git a/test/cy/package.json b/test/cy/package.json index d45be5774..0b55f46e9 100644 --- a/test/cy/package.json +++ b/test/cy/package.json @@ -6,9 +6,11 @@ "start": "just ../../run publish-ui --listen 127.0.0.1:9000 --token=token -n env ./test/sample-content/fastapi-simple", "test": "start-server-and-test --expect 401 start http-get://127.0.0.1:9000 run", "test-deploy": "start-server-and-test --expect 401 start http-get://127.0.0.1:9000 run-deploy", + "test-deploy-windows": "start-server-and-test --expect 401 start http-get://127.0.0.1:9000 run-deploy-windows", "open": "cypress open", "run": "cypress run --spec ./cypress/e2e/publish-ui/*.cy.js --env token=token", - "run-deploy": "if \"%OS%\"==\"Windows_NT\"; then cypress run --spec ./cypress/e2e/deploy/*.cy.js --env token=token,CYPRESS_CONNECT_ADDRESS=%CYPRESS_CONNECT_ADDRESS%; else cypress run --spec ./cypress/e2e/deploy/*.cy.js --env token=token,CYPRESS_CONNECT_ADDRESS=$CYPRESS_CONNECT_ADDRESS; fi" + "run-deploy": "cypress run --spec ./cypress/e2e/deploy/*.cy.js --env token=token,CYPRESS_CONNECT_ADDRESS=$CYPRESS_CONNECT_ADDRESS", + "run-deploy-windows": "cypress run --spec ./cypress/e2e/deploy/*.cy.js --env token=token,CYPRESS_CONNECT_ADDRESS=%CYPRESS_CONNECT_ADDRESS%" }, "devDependencies": { "cross-env": "^7.0.3",