fixes to cypress cloud and tests

e2e/cypress-13-demo/cypress.config.ts

@@ -2,25 +2,26 @@ import { defineConfig } from "cypress";
 import currents from "cypress-cloud/plugin";
 
 module.exports = defineConfig({
-  e2e: {
-    baseUrl: "https://todomvc.com/examples/vanillajs",
-    supportFile: "cypress/support/e2e.ts",
-    specPattern: "cypress/*/**/*.spec.js",
-    setupNodeEvents(on, config) {
-      require("@cypress/grep/src/plugin")(config);
-      // require("cypress-terminal-report/src/installLogsPrinter")(on);
-      return currents(on, config);
-    },
-  },
+	video: true,
+	e2e: {
+		baseUrl: "https://todomvc.com/examples/vanillajs",
+		supportFile: "cypress/support/e2e.ts",
+		specPattern: "cypress/*/**/*.spec.js",
+		setupNodeEvents(on, config) {
+			require("@cypress/grep/src/plugin")(config);
+			// require("cypress-terminal-report/src/installLogsPrinter")(on);
+			return currents(on, config);
+		},
+	},
 
-  component: {
-    specPattern: ["pages/__tests__/*.spec.tsx"],
-    setupNodeEvents(on, config) {
-      return currents(on, config);
-    },
-    devServer: {
-      framework: "next",
-      bundler: "webpack",
-    },
-  },
+	component: {
+		specPattern: ["pages/__tests__/*.spec.tsx"],
+		setupNodeEvents(on, config) {
+			return currents(on, config);
+		},
+		devServer: {
+			framework: "next",
+			bundler: "webpack",
+		},
+	},
 });

e2e/utils/utils.ts

@@ -165,6 +165,10 @@ export const avoidablePropertiesCy13: AvoidableProperty[] = [
 		property: "config.resolved.browsers.value[1].version",
 		mustHave: true,
 	},
+	{
+		property: "spec.name",
+		mustHave: false,
+	},
 ];
 
 export const avoidableApiPropertiesCy13: AvoidableProperty[] = [
@@ -275,51 +279,72 @@ export const avoidedButNeedePropertiesCy13: AvoidableProperty[] = [
 		property: "config.resolved.videoUploadOnPasses",
 		mustHave: false,
 	},
+	// {
+	// 	property: /runs\[\d+\]\.video/,
+	// 	mustHave: true,
+	// 	isRegex: true,
+	// },
 	{
-		property: /runs\[\d+\]\.video/,
-		mustHave: true,
+		property: /runs\[\d+\]\.hooks/,
+		mustHave: false,
+		isRegex: true,
+	},
+	// {
+	// 	property: /runs\[\d+\]\.tests\[\d+\]\.body/,
+	// 	mustHave: true,
+	// 	isRegex: true,
+	// },
+	// {
+	// 	property:
+	// 		/runs\[\d+\]\.tests\[\d+\]\.attempts\[\d+\]\.timings\.after each\[1\]/,
+	// 	mustHave: true,
+	// 	isRegex: true,
+	// },
+	// {
+	// 	property:
+	// 		/runs\[\d+\]\.tests\[\d+\]\.attempts\[\d+\]\.timings\.after all/,
+	// 	mustHave: true,
+	// 	isRegex: true,
+	// },
+	{
+		property: /runs\[\d+\]\.tests\[\d+\]\.attempts\[\d+\]\.timings/,
+		mustHave: false,
 		isRegex: true,
 	},
 	{
-		property: /runs\[\d+\]\.hooks/,
+		property: "config.video",
 		mustHave: true,
-		isRegex: true,
 	},
 	{
-		property: /runs\[\d+\]\.tests\[\d+\]\.body/,
+		property: "config.videoCompression",
 		mustHave: true,
-		isRegex: true,
 	},
 	{
-		property:
-			/runs\[\d+\]\.tests\[\d+\]\.attempts\[\d+\]\.timings\.after each\[1\]/,
+		property: "config.videoUploadOnPasses",
 		mustHave: true,
-		isRegex: true,
 	},
 	{
-		property:
-			/runs\[\d+\]\.tests\[\d+\]\.attempts\[\d+\]\.timings\.after all/,
+		property: "runs[2].tests[0].attempts[0]",
 		mustHave: true,
-		isRegex: true,
 	},
 	{
-		property: "config.video",
+		property: "runs[2].tests[0].testId",
 		mustHave: true,
 	},
 	{
-		property: "config.videoCompression",
+		property: "error.codeFrame.absoluteFile",
 		mustHave: true,
 	},
 	{
-		property: "config.videoUploadOnPasses",
+		property: "timings",
 		mustHave: true,
 	},
 	{
-		property: "runs[2].tests[0].attempts[0]",
+		property: "hooks",
 		mustHave: true,
 	},
 	{
-		property: "runs[2].tests[0].testId",
+		property: "config.resolved.video.from",
 		mustHave: true,
 	},
 ];
@@ -487,12 +512,36 @@ export function testEachResults(
 							result.path
 						} does not exist and it should. ${result.note ?? ""}`
 					).not.to.equal("Does not exist");
+					expect(
+						result.valueB,
+						`The values at ${
+							result.path
+						} does not exist and it should. ${result.note ?? ""}`
+					).not.to.equal(undefined);
+					expect(
+						result.valueB,
+						`The values at ${
+							result.path
+						} does not exist and it should. ${result.note ?? ""}`
+					).not.to.equal(null);
+					expect(
+						result.valueB,
+						`The values at ${
+							result.path
+						} does not exist and it should. ${result.note ?? ""}`
+					).not.to.equal("");
 					expect(
 						result.valueB,
 						`The values at ${
 							result.path
 						} does not exist and it should. ${result.note ?? ""}`
 					).not.to.equal("undefined");
+					expect(
+						result.valueB,
+						`The values at ${
+							result.path
+						} does not exist and it should. ${result.note ?? ""}`
+					).not.to.equal("null");
 					return;
 				}
 			}

packages/cypress-cloud/lib/results/captureHooks.ts

@@ -1,70 +1,72 @@
 import { ExecutionState } from "../state";
+import { generateRandomString } from "../utils";
 
 export function handleScreenshotEvent(
-  screenshot: Cypress.ScreenshotDetails,
-  executionState: ExecutionState
+	screenshot: Cypress.ScreenshotDetails,
+	executionState: ExecutionState
 ) {
-  const testId = executionState.getCurrentTestID();
-  const screenshotData = {
-    ...screenshot,
-    testId,
-    height: screenshot.dimensions.height,
-    width: screenshot.dimensions.width,
-  };
-  executionState.setScreenshotsData(screenshotData);
+	const testId = executionState.getCurrentTestID();
+	const screenshotData = {
+		...screenshot,
+		testId,
+		height: screenshot.dimensions.height,
+		width: screenshot.dimensions.width,
+		screenshotId: generateRandomString(6),
+	};
+	executionState.setScreenshotsData(screenshotData);
 }
 
 export function handleTestBefore(
-  testAttempt: string,
-  executionState: ExecutionState
+	testAttempt: string,
+	executionState: ExecutionState
 ) {
-  executionState.setCurrentTestID(JSON.parse(testAttempt).id);
+	executionState.setCurrentTestID(JSON.parse(testAttempt).id);
 }
 
 export function handleTestAfter(
-  testAttempt: string,
-  executionState: ExecutionState
+	testAttempt: string,
+	executionState: ExecutionState
 ) {
-  const test = JSON.parse(testAttempt);
-  const {
-    title,
-    body,
-    retries,
-    _currentRetry,
-    pending,
-    type,
-    invocationDetails,
-    id,
-    hooks,
-    order,
-    wallClockStartedAt,
-    timings,
-    _events,
-    _eventsCount,
-    duration,
-    err,
-    state,
-    fullTitle,
-  } = test;
-  const attempt = {
-    title,
-    fullTitle,
-    body,
-    retries,
-    _currentRetry,
-    pending,
-    type,
-    invocationDetails,
-    id,
-    hooks,
-    order,
-    wallClockStartedAt,
-    timings,
-    _events,
-    _eventsCount,
-    duration,
-    err,
-    state,
-  };
-  executionState.setAttemptsData(attempt);
+	const test = JSON.parse(testAttempt);
+	const {
+		title,
+		body,
+		retries,
+		_currentRetry,
+		pending,
+		type,
+		invocationDetails,
+		id,
+		hooks,
+		order,
+		wallClockStartedAt,
+		timings,
+		_events,
+		_eventsCount,
+		duration,
+		err,
+		state,
+		fullTitle,
+	} = test;
+	const attempt = {
+		title,
+		fullTitle,
+		body,
+		retries,
+		_currentRetry,
+		pending,
+		type,
+		invocationDetails,
+		id,
+		hooks,
+		order,
+		wallClockStartedAt,
+		timings,
+		_events,
+		_eventsCount,
+		duration,
+		err,
+		state,
+	};
+	executionState.setAttemptsData(attempt);
 }