Use test ext dir

prisma · Apr 23, 2024 · 80bf59b · 80bf59b
1 parent fdb847f
commit 80bf59b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/scripts/e2eTestsOnVsix/install_extension.js b/scripts/e2eTestsOnVsix/install_extension.js
@@ -22,7 +22,7 @@ async function installExtension({ extensionType, extensionVersion }) {
     console.debug({ cli })
     console.debug({ args })
 
-    const result = spawnVscode(cli, ['--install-extension', `${extensionName}@${extensionVersion}`])
+    const result = spawnVscode(cli, [...args, '--install-extension', `${extensionName}@${extensionVersion}`])
     console.log(result)
     if (result.stderr.includes('Failed')) {
       console.log("It's not ready to be installed yet.")

diff --git a/scripts/e2eTestsOnVsix/test.sh b/scripts/e2eTestsOnVsix/test.sh
@@ -2,6 +2,7 @@
 
 set -eu
 
+DIR=$(dirname $0)
 EXTENSION_TYPE=$1
 echo "EXTENSION_TYPE: $EXTENSION_TYPE"
 
@@ -19,7 +20,7 @@ fi
 
 echo "EXTENSION_FOLDER_NAME: $EXTENSION_FOLDER_NAME"
 
-EXTENSION_INSTALL_PATH="$HOME/.vscode/extensions/$EXTENSION_FOLDER_NAME"
+EXTENSION_INSTALL_PATH=$(cd $DIR/../../.vscode-test/extensions/$EXTENSION_FOLDER_NAME; pwd)
 
 echo "Path to installed extension $EXTENSION_INSTALL_PATH"