haven-cypress-integration 2.1.5 → 2.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haven-cypress-integration",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "Seamless Cypress integration with HAVEN test case management",
   "main": "index.js",
   "bin": {

package/templates/run-filtered.sh

@@ -245,11 +245,20 @@ if [ -n "$E2E_COMMAND" ]; then
   
   # If E2E_COMMAND contains "cypress run", inject --env args
   if echo "$E2E_COMMAND" | grep -q "cypress run"; then
-    # Replace "cypress run" with "cypress run --env <args>"
-    MODIFIED_COMMAND="${E2E_COMMAND/cypress run/cypress run --env ${FINAL_ENV_ARGS}}"
-    echo "Modified command with env args:"
-    echo "$MODIFIED_COMMAND"
-    eval "$MODIFIED_COMMAND" 2>&1 | tee ${RESULTS_DIR}/logs.txt
+    # Build the full command with proper quoting for special characters
+    echo "Final env args: $FINAL_ENV_ARGS"
+    echo "Running: npm install && cypress run --env '$FINAL_ENV_ARGS'"
+    
+    # Execute npm install first, then cypress run with env args
+    eval "npm install" 2>&1 | tee ${RESULTS_DIR}/logs.txt
+    INSTALL_EXIT=$?
+    
+    if [ $INSTALL_EXIT -eq 0 ]; then
+      echo "npm install succeeded, running cypress..."
+      npx cypress run --env "$FINAL_ENV_ARGS" 2>&1 | tee -a ${RESULTS_DIR}/logs.txt
+    else
+      echo "npm install failed with exit code $INSTALL_EXIT"
+    fi
   else
     # For npm scripts like "npm run test:cy", env vars are already exported with CYPRESS_ prefix
     echo "Note: Custom command doesn't contain 'cypress run'. CYPRESS_* env vars exported as fallback."