Remove dependency on curl in e2e

beyondessential · Jun 27, 2022 · 9f55ad1 · 9f55ad1
1 parent 36be67e
commit 9f55ad1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/packages/devops/ci/e2e.Dockerfile b/packages/devops/ci/e2e.Dockerfile
@@ -1,7 +1,5 @@
 FROM cypress/base:14.19.0
 
-RUN apk-add curl
-
 WORKDIR /tupaia
 
 # copy everything

diff --git a/packages/e2e/cypress/scripts/testE2e/testE2e.js b/packages/e2e/cypress/scripts/testE2e/testE2e.js
@@ -6,6 +6,7 @@
 import { execSync } from 'child_process';
 import {} from 'dotenv/config';
 import fs from 'fs';
+import { fetch } from 'node-fetch';
 
 import { getArgs, getLoggerInstance } from '@tupaia/utils';
 import { E2E_CONFIG_PATH } from '../../constants';
@@ -68,10 +69,9 @@ const runTestsAgainstUrl = (url, options = {}) => {
   });
 };
 
-const validateUrl = (description, url) => {
-  try {
-    execSync(`curl --output /dev/null --silent --head --fail ${url}`);
-  } catch (error) {
+const validateUrl = async (description, url) => {
+  const response = await fetch.get(url);
+  if (!response.ok) {
     throw new Error(`No deployment exists for ${description} url '${url}', cancelling e2e tests`);
   }
 };
@@ -91,13 +91,13 @@ export const testE2e = async () => {
     logger.warn(`Baseline url is empty, stopping e2e tests`);
     return;
   }
-  validateUrl('baseline', baselineUrl);
+  await validateUrl('baseline', baselineUrl);
 
   if (!compareUrl) {
     logger.warn(`Compare url is empty, stopping e2e tests`);
     return;
   }
-  validateUrl('compare', compareUrl);
+  await validateUrl('compare', compareUrl);
 
   let baseError;
   try {

diff --git a/packages/e2e/package.json b/packages/e2e/package.json
@@ -34,6 +34,7 @@
     "markdown-to-jsx": "^6.4.1",
     "moment": "^2.21.0",
     "moment-timezone": "^0.5.14",
+    "node-fetch": "^1.7.3",
     "npm-run-all": "^4.1.5",
     "regenerator-runtime": "^0.13.9"
   }

diff --git a/yarn.lock b/yarn.lock
@@ -5220,6 +5220,7 @@ __metadata:
     markdown-to-jsx: ^6.4.1
     moment: ^2.21.0
     moment-timezone: ^0.5.14
+    node-fetch: ^1.7.3
     npm-run-all: ^4.1.5
     regenerator-runtime: ^0.13.9
   languageName: unknown