From c1a0d4ba8967afb2041620d23bf7384c5cd085dd Mon Sep 17 00:00:00 2001 From: Fraz Arshad Date: Fri, 8 Nov 2024 18:28:17 +0500 Subject: [PATCH] build: remove http-get usage --- docker-compose.ci.keplr.yml | 15 ++++++++++++++- package.json | 9 --------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/docker-compose.ci.keplr.yml b/docker-compose.ci.keplr.yml index 7e2dfa29a..3948ec3cb 100644 --- a/docker-compose.ci.keplr.yml +++ b/docker-compose.ci.keplr.yml @@ -44,7 +44,20 @@ services: - ./docker/videos:/app/tests/e2e/videos - ./docker/screenshots:/app/tests/e2e/screenshots command: > - bash -c 'echo -n "======> local noVNC URL: http://localhost:8080/vnc.html?autoconnect=true " && pnpm wait-on http://display:8080 && echo -n "======> remote noVNC URL: " && curl -s ngrok:4040/api/tunnels | jq -r .tunnels[0].public_url && pnpm test:e2e:ci:keplr' + bash -c ' + echo -n "======> local noVNC URL: http://localhost:8080/vnc.html?autoconnect=true " && + pnpm wait-on http://display:8080 && + echo -n "======> remote noVNC URL: " && + curl -s ngrok:4040/api/tunnels | jq -r .tunnels[0].public_url && + + # Start development server and wait for it to be ready + VITE_RUN_ENV=agoric_chain pnpm start:ui & sleep 5 && + + # start json server + pnpm start:json-server & sleep 5 && + + # Run end-to-end tests + pnpm synpress:run:keplr' networks: - x11 diff --git a/package.json b/package.json index ad3e10912..38134df40 100644 --- a/package.json +++ b/package.json @@ -52,16 +52,7 @@ "start:ui": "cd tools/ui && pnpm dev", "start:json-server": "json-server tools/json-server-db.json --port 3004", "synpress:run:metamask": "CYPRESS_SPEC_PATTERN=tests/e2e/specs/metamask/** EXTENSION=metamask SKIP_EXTENSION_SETUP=true SYNPRESS_LOCAL_TEST=true node synpress.js run --configFile=synpress.config.js", - "test:e2e:metamask": "start-server-and-test 'pnpm start:server' http-get://localhost:3000 'pnpm synpress:run:metamask'", - "test:e2e:anvil": "start-server-and-test 'turbo start:server' http-get://localhost:3000 'CYPRESS_USE_ANVIL=true pnpm synpress:run'", - "test:e2e:headless": "start-server-and-test 'turbo start:server' http-get://localhost:3000 'pnpm synpress:run --headless'", - "test:e2e:headless:anvil": "start-server-and-test 'turbo start:server' http-get://localhost:3000 'CYPRESS_USE_ANVIL=true pnpm synpress:run --headless'", - "test:e2e:ci": "start-server-and-test 'VITE_RUN_ENV=agoric_chain pnpm start:ui' http-get://localhost:3000 'pnpm start:json-server' http-get://localhost:3004 'pnpm synpress:run --record --group'", - "test:e2e:ci:keplr": "start-server-and-test 'VITE_RUN_ENV=agoric_chain pnpm start:ui' http-get://localhost:3000 'pnpm start:json-server' http-get://localhost:3004 'pnpm synpress:run:keplr'", - "test:e2e:ci:anvil": "start-server-and-test 'turbo start:server' http-get://localhost:3000 'CYPRESS_USE_ANVIL=true pnpm synpress:run --record --group'", - "test:e2e:ci:cypress-action": "CYPRESS_USE_ANVIL=true pnpm synpress:run", "synpress:run:keplr": "CYPRESS_SPEC_PATTERN=tests/e2e/specs/keplr/** EXTENSION=keplr SKIP_EXTENSION_SETUP=true SYNPRESS_LOCAL_TEST=true node synpress.js run --configFile=synpress.config.js", - "test:e2e:keplr": "start-server-and-test 'pnpm start:ui' http-get://localhost:3000 'pnpm start:json-server' http-get://localhost:3004 'pnpm synpress:run:keplr'", "prepare": "husky" }, "dependencies": {