fixup! build: remove http-get usage

build: remove extra commands
agoric-labs · Nov 12, 2024 · af594d0 · af594d0
1 parent 1a27986
commit af594d0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git 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
+        pnpm dev & sleep 5 &&
+        
+        # start json server
+        pnpm start:json-server & sleep 5 &&
+        
+        # Run end-to-end tests
+        pnpm test:e2e:ci:keplr'
     networks:
       - x11
 

diff --git 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' '' 'pnpm synpress:run:metamask'",
-    "test:e2e:anvil": "start-server-and-test 'turbo start:server' '' 'CYPRESS_USE_ANVIL=true pnpm synpress:run'",
-    "test:e2e:headless": "start-server-and-test 'turbo start:server' '' 'pnpm synpress:run --headless'",
-    "test:e2e:headless:anvil": "start-server-and-test 'turbo start:server' '' 'CYPRESS_USE_ANVIL=true pnpm synpress:run --headless'",
-    "test:e2e:ci": "start-server-and-test 'VITE_RUN_ENV=agoric_chain pnpm start:ui' '' 'pnpm start:json-server' '' 'pnpm synpress:run --record --group'",
-    "test:e2e:ci:keplr": "start-server-and-test 'VITE_RUN_ENV=agoric_chain pnpm start:ui' '' 'pnpm start:json-server' '' 'pnpm synpress:run:keplr'",
-    "test:e2e:ci:anvil": "start-server-and-test 'turbo start:server' '' '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' '' 'pnpm start:json-server' '' 'pnpm synpress:run:keplr'",
     "prepare": "husky"
   },
   "dependencies": {