Unify test scripts

Author: alebcay

.github/workflows/test.yaml

@@ -46,13 +46,10 @@ jobs:
         include:
           - lens-ref: HEAD
             node-version: 16
-            script: tools/integration_test.sh
           - lens-ref: v6.4.7
             node-version: 16
-            script: tools/integration_test.sh
           - lens-ref: v6.3.0
             node-version: 16
-            script: tools/integration_test_pre6.4.0.sh
     steps:
       - name: Check out repository
         uses: actions/checkout@v3
@@ -75,4 +72,4 @@ jobs:
 
       - name: Run integration test
         run: |-
-          EXTENSION_PATH="$(realpath out/$(ls -1 out))" LENS_REF="${{ matrix.lens-ref }}" xvfb-run --auto-servernum --server-args='-screen 0, 1600x900x24' ${{ matrix.script }}
+          EXTENSION_PATH="$(realpath out/$(ls -1 out))" LENS_REF="${{ matrix.lens-ref }}" xvfb-run --auto-servernum --server-args='-screen 0, 1600x900x24' tools/integration_test.sh

tools/integration_test.sh

@@ -4,25 +4,36 @@ set -exo pipefail
 
 [ -z "${EXTENSION_PATH}" ] && echo "EXTENSION_PATH environment variable must be set" && exit 1
 
-DIR=$(mktemp -d)
-git clone https://github.com/lensapp/lens ${DIR}/lens
-[ ! -z "${LENS_REF}" ] && git -C ${DIR}/lens checkout ${LENS_REF}
-cp tools/extensions.tests.ts ${DIR}/lens/packages/open-lens/integration/__tests__/extensions.tests.ts
-TARGET_FILE="${DIR}/lens/packages/open-lens/package.json" node tools/remove_extra_lens_targets.js
-
-pushd ${DIR}/lens
-    if [ -f "package-lock.json" ]; then
-        npm ci
+TEST_TMPDIR=$(mktemp -d)
+git clone https://github.com/lensapp/lens ${TEST_TMPDIR}/lens
+[ ! -z "${LENS_REF}" ] && git -C ${TEST_TMPDIR}/lens checkout ${LENS_REF}
+
+if [ -d "${TEST_TMPDIR}/lens/packages/open-lens" ]; then
+    OPENLENS_ROOT_DIR="${TEST_TMPDIR}/lens/packages/open-lens"
+else
+    OPENLENS_ROOT_DIR="${TEST_TMPDIR}/lens"
+fi
+
+cp tools/extensions.tests.ts "${OPENLENS_ROOT_DIR}/integration/__tests__/extensions.tests.ts"
+TARGET_FILE="${OPENLENS_ROOT_DIR}/package.json" node tools/remove_extra_lens_targets.js
+
+pushd ${TEST_TMPDIR}/lens
+    if [ -f "Makefile" ]; then
+        make build
     else
-        npm install
-    fi
+        if [ -f "package-lock.json" ]; then
+            npm ci
+        else
+            npm install
+        fi
 
-    npm run build:app
+        npm run build:app
+    fi
 
     # If left present, the snap package will be mistaken for an obsolete Jest snapshot
-    rm -f packages/open-lens/dist/*.snap
+    rm -f ${OPENLENS_ROOT_DIR}/dist/*.snap
 
-    cd packages/open-lens && npx jest --forceExit -- integration/__tests__/extensions.tests.ts
+    cd ${OPENLENS_ROOT_DIR} && npx jest --forceExit -- integration/__tests__/extensions.tests.ts
 popd
 
-rm -rf ${DIR}
+rm -rf ${TEST_TMPDIR}