haven-cypress-integration 1.4.0 → 1.5.0

package/package.json

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

package/templates/Dockerfile

@@ -16,9 +16,9 @@ RUN apt-get update && \
     ./aws/install && \
     rm -rf aws awscliv2.zip
 
-# ✅ Install Node deps
-RUN npm ci
-RUN npm install --no-save aws-sdk
+# ✅ Install Node deps (including dev dependencies for mochawesome)
+RUN npm ci --include=dev
+RUN npm install --no-save aws-sdk mochawesome mochawesome-merge mochawesome-report-generator
 
 # ✅ Ensure script is executable
 COPY run-filtered.sh /app/run-filtered.sh

package/templates/run-filtered.sh

@@ -64,7 +64,11 @@ MERGED_JSON="results/results.json"
 REPORT_HTML="${MOCHAWESOME_DIR}/report.html"
 
 echo "🛠️ Attempting to merge mochawesome JSON files..."
-npx mochawesome-merge ${MOCHAWESOME_DIR}/*.json > "${MERGED_JSON}"
+echo "📁 Contents of ${MOCHAWESOME_DIR}:"
+ls -la ${MOCHAWESOME_DIR}/ || echo "❌ Directory not found"
+echo "🔍 JSON files found:"
+ls ${MOCHAWESOME_DIR}/*.json 2>/dev/null || echo "❌ No JSON files found"
+npx mochawesome-merge ${MOCHAWESOME_DIR}/*.json > "${MERGED_JSON}" 2>&1 || echo "❌ Merge failed"
 
 if [ -s "${MERGED_JSON}" ]; then
   echo "✅ Merge successful. Generating report from merged JSON."
@@ -96,14 +100,17 @@ ZIP_PATH="/tmp/${ZIP_NAME}"
 
 if [ -d "${MOCHAWESOME_DIR}" ]; then
   echo "📦 Zipping mochawesome report and screenshots..."
-  zip -r "${ZIP_PATH}" "${MOCHAWESOME_DIR}" > /dev/null
+  echo "📁 Contents to zip:"
+  ls -la "${MOCHAWESOME_DIR}/"
+  zip -r "${ZIP_PATH}" "${MOCHAWESOME_DIR}" || echo "❌ ZIP creation failed"
+  echo "✅ ZIP created: ${ZIP_PATH} ($(ls -lh ${ZIP_PATH} 2>/dev/null | awk '{print $5}'))"
 else
   echo "❌ Mochawesome report folder not found: ${MOCHAWESOME_DIR}"
 fi
 
 # Upload zipped report to S3
 if [ -f "${ZIP_PATH}" ]; then
-  S3_BASE_KEY="artifacts/${PLAN_ID}/automation/${RUN_ID}"
+  S3_BASE_KEY="artifacts/${PRODUCT_NAME}/${PLAN_ID}/automation/${RUN_ID}"
   S3_ZIP_KEY="${S3_BASE_KEY}/${ZIP_NAME}"
   echo "☁️ Uploading ZIP to s3://${BUCKET_NAME}/${S3_ZIP_KEY}"
   aws s3 cp "${ZIP_PATH}" "s3://${BUCKET_NAME}/${S3_ZIP_KEY}" || echo "❌ S3 ZIP upload failed"

package/templates/syncCypressResults.js

@@ -205,7 +205,7 @@ async function uploadLogToS3(planId, runId) {
     return null;
   }
 
-  const key = `artifacts/${planId}/automation/${runId}/run_log`;
+  const key = `artifacts/${process.env.PRODUCT_NAME}/${planId}/automation/${runId}/run_log`;
   const fileStream = fs.createReadStream(logsPath);
 
   try {