From 045ccf9d5d093b48b397080d05ba4c6d8c11904c Mon Sep 17 00:00:00 2001 From: Bill Glesias Date: Fri, 19 May 2023 09:48:41 -0400 Subject: [PATCH 1/2] chore: rename upload results to upload screenshots & videos --- cli/CHANGELOG.md | 1 + ...tml => CLOUD_CANNOT_UPLOAD_ARTIFACTS.html} | 2 +- packages/errors/src/errors.ts | 4 +- .../test/unit/visualSnapshotErrors_spec.ts | 2 +- packages/graphql/schemas/schema.graphql | 2 +- packages/server/lib/modes/record.js | 4 +- system-tests/__snapshots__/record_spec.js | 50 +++++++++---------- system-tests/lib/normalizeStdout.ts | 4 +- 8 files changed, 35 insertions(+), 34 deletions(-) rename packages/errors/__snapshot-html__/{CLOUD_CANNOT_UPLOAD_RESULTS.html => CLOUD_CANNOT_UPLOAD_ARTIFACTS.html} (94%) diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md index e9bc9df20ae7..610120d7cec0 100644 --- a/cli/CHANGELOG.md +++ b/cli/CHANGELOG.md @@ -18,6 +18,7 @@ _Released 05/23/2023 (PENDING)_ - Updated styling & content of Cypress Cloud slideshows when not logged in or no runs have been recorded. Addresses [#26181](https://github.com/cypress-io/cypress/issues/26181). - Changed the nomenclature of 'processing' to 'compressing' when terminal video output is printed during a run. Addresses [#26657](https://github.com/cypress-io/cypress/issues/26657). +- Changed the nomenclature of 'Upload Results' to 'Uploading Screenshots & Videos' when terminal output is printed during a run. Addresses [#26759](https://github.com/cypress-io/cypress/issues/26759). ## 12.12.0 diff --git a/packages/errors/__snapshot-html__/CLOUD_CANNOT_UPLOAD_RESULTS.html b/packages/errors/__snapshot-html__/CLOUD_CANNOT_UPLOAD_ARTIFACTS.html similarity index 94% rename from packages/errors/__snapshot-html__/CLOUD_CANNOT_UPLOAD_RESULTS.html rename to packages/errors/__snapshot-html__/CLOUD_CANNOT_UPLOAD_ARTIFACTS.html index 3068e21d2321..e8d2ceec9ecb 100644 --- a/packages/errors/__snapshot-html__/CLOUD_CANNOT_UPLOAD_RESULTS.html +++ b/packages/errors/__snapshot-html__/CLOUD_CANNOT_UPLOAD_ARTIFACTS.html @@ -34,7 +34,7 @@ - 
Warning: We encountered an error while uploading results from your run.
+    
Warning: We encountered an error while uploading screenshots & videos from your run.
 
 These results will not be recorded.
 
diff --git a/packages/errors/src/errors.ts b/packages/errors/src/errors.ts
index e6ba8c58d1c2..b913aa2c3462 100644
--- a/packages/errors/src/errors.ts
+++ b/packages/errors/src/errors.ts
@@ -520,9 +520,9 @@ export const AllCypressErrors = {
 
         This error will not affect or change the exit code.`
   },
-  CLOUD_CANNOT_UPLOAD_RESULTS: (apiErr: Error) => {
+  CLOUD_CANNOT_UPLOAD_ARTIFACTS: (apiErr: Error) => {
     return errTemplate`\
-        Warning: We encountered an error while uploading results from your run.
+        Warning: We encountered an error while uploading screenshots & videos from your run.
 
         These results will not be recorded.
 
diff --git a/packages/errors/test/unit/visualSnapshotErrors_spec.ts b/packages/errors/test/unit/visualSnapshotErrors_spec.ts
index daaea744b39a..e5f0b656decd 100644
--- a/packages/errors/test/unit/visualSnapshotErrors_spec.ts
+++ b/packages/errors/test/unit/visualSnapshotErrors_spec.ts
@@ -625,7 +625,7 @@ describe('visual error templates', () => {
         default: [],
       }
     },
-    CLOUD_CANNOT_UPLOAD_RESULTS: () => {
+    CLOUD_CANNOT_UPLOAD_ARTIFACTS: () => {
       const err = makeApiErr()
 
       return {
diff --git a/packages/graphql/schemas/schema.graphql b/packages/graphql/schemas/schema.graphql
index fddc1ab227dd..1fbab1c5811c 100644
--- a/packages/graphql/schemas/schema.graphql
+++ b/packages/graphql/schemas/schema.graphql
@@ -1126,7 +1126,7 @@ enum ErrorTypeEnum {
   CLOUD_CANNOT_CREATE_RUN_OR_INSTANCE
   CLOUD_CANNOT_PROCEED_IN_PARALLEL
   CLOUD_CANNOT_PROCEED_IN_SERIAL
-  CLOUD_CANNOT_UPLOAD_RESULTS
+  CLOUD_CANNOT_UPLOAD_ARTIFACTS
   CLOUD_GRAPHQL_ERROR
   CLOUD_INVALID_RUN_REQUEST
   CLOUD_PARALLEL_DISALLOWED
diff --git a/packages/server/lib/modes/record.js b/packages/server/lib/modes/record.js
index 0d52e25c7b08..912cfa41ba4b 100644
--- a/packages/server/lib/modes/record.js
+++ b/packages/server/lib/modes/record.js
@@ -166,7 +166,7 @@ const uploadArtifacts = (options = {}) => {
   return Promise
   .all(uploads)
   .catch((err) => {
-    errors.warning('CLOUD_CANNOT_UPLOAD_RESULTS', err)
+    errors.warning('CLOUD_CANNOT_UPLOAD_ARTIFACTS', err)
 
     return exception.create(err)
   })
@@ -690,7 +690,7 @@ const createRunAndRecordSpecs = (options = {}) => {
           // eslint-disable-next-line no-console
           console.log('')
 
-          terminal.header('Uploading Results', {
+          terminal.header('Uploading Screenshots & Videos', {
             color: ['blue'],
           })
 
diff --git a/system-tests/__snapshots__/record_spec.js b/system-tests/__snapshots__/record_spec.js
index b8af5699d8b9..2c5748342595 100644
--- a/system-tests/__snapshots__/record_spec.js
+++ b/system-tests/__snapshots__/record_spec.js
@@ -73,7 +73,7 @@ Fix the error in your code and re-run your tests.
   -  Video output: /XXX/XXX/XXX/cypress/videos/record_error.cy.js.mp4
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/videos/record_error.cy.js.mp4
 
@@ -130,7 +130,7 @@ Because this error occurred during a \`before each\` hook we are skipping the re
   -  Video output: /XXX/XXX/XXX/cypress/videos/record_fail.cy.js.mp4
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Done Uploading (*/2) /foo/bar/.projects/e2e/cypress/screenshots/record_fail.cy.js/record fails -- fails 1 -- before each hook (failed).png
   - Done Uploading (*/2) /foo/bar/.projects/e2e/cypress/videos/record_fail.cy.js.mp4
@@ -172,7 +172,7 @@ plugin stdout
   -  /XXX/XXX/XXX/cypress/screenshots/record_pass.cy.js/yay it passes.png                 (400x1022)
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass.cy.js/yay it passes.png
 
@@ -232,7 +232,7 @@ We dynamically generated a new test to display this failure.
   -  Video output: /XXX/XXX/XXX/cypress/videos/record_uncaught.cy.js.mp4
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Done Uploading (*/2) /foo/bar/.projects/e2e/cypress/screenshots/record_uncaught.cy.js/An uncaught error was detected outside of a test (failed).png
   - Done Uploading (*/2) /foo/bar/.projects/e2e/cypress/videos/record_uncaught.cy.js.mp4
@@ -329,7 +329,7 @@ exports['e2e record api interaction errors update instance stdout warns but proc
   -  /XXX/XXX/XXX/cypress/screenshots/record_pass.cy.js/yay it passes.png                 (400x1022)
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass.cy.js/yay it passes.png
 Warning: We encountered an error communicating with our servers.
@@ -450,7 +450,7 @@ exports['e2e record api interaction errors uploading assets warns but proceeds 1
   -  /XXX/XXX/XXX/cypress/screenshots/record_pass.cy.js/yay it passes.png                 (400x1022)
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Failed Uploading (*/2) /foo/bar/.projects/e2e/cypress/screenshots/record_pass.cy.js/yay it passes.png
   - Failed Uploading (*/2) /foo/bar/.projects/e2e/cypress/videos/record_pass.cy.js.mp4
@@ -674,7 +674,7 @@ exports['e2e record api interaction errors update instance 500 does not proceed
   -  /XXX/XXX/XXX/cypress/screenshots/record_pass.cy.js/yay it passes.png                 (400x1022)
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
 We encountered an unexpected error communicating with our servers.
 
@@ -763,7 +763,7 @@ We will retry 3 more times in X second(s)...
   -  /XXX/XXX/XXX/cypress/screenshots/record_pass.cy.js/yay it passes.png                 (400x1022)
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass.cy.js/yay it passes.png
 
@@ -963,7 +963,7 @@ https://on.cypress.io/dashboard/organizations/org-id-1234/billing
   -  /XXX/XXX/XXX/cypress/screenshots/record_pass.cy.js/yay it passes.png                 (400x1022)
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass.cy.js/yay it passes.png
 
@@ -1043,7 +1043,7 @@ https://on.cypress.io/dashboard/organizations/org-id-1234/billing
   -  /XXX/XXX/XXX/cypress/screenshots/record_pass.cy.js/yay it passes.png                 (400x1022)
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass.cy.js/yay it passes.png
 
@@ -1128,7 +1128,7 @@ Details:
   -  /XXX/XXX/XXX/cypress/screenshots/record_pass.cy.js/yay it passes.png                 (400x1022)
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass.cy.js/yay it passes.png
 
@@ -1464,7 +1464,7 @@ https://on.cypress.io/dashboard/organizations/org-id-1234/billing
   -  /XXX/XXX/XXX/cypress/screenshots/record_pass.cy.js/yay it passes.png                 (400x1022)
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass.cy.js/yay it passes.png
 
@@ -1546,7 +1546,7 @@ https://on.cypress.io/dashboard/organizations/org-id-1234/billing
   -  /XXX/XXX/XXX/cypress/screenshots/record_pass.cy.js/yay it passes.png                 (400x1022)
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass.cy.js/yay it passes.png
 
@@ -1626,7 +1626,7 @@ https://on.cypress.io/dashboard/organizations/org-id-1234/billing
   -  /XXX/XXX/XXX/cypress/screenshots/record_pass.cy.js/yay it passes.png                 (400x1022)
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass.cy.js/yay it passes.png
 
@@ -1706,7 +1706,7 @@ https://on.cypress.io/dashboard/organizations/org-id-1234/billing
   -  /XXX/XXX/XXX/cypress/screenshots/record_pass.cy.js/yay it passes.png                 (400x1022)
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass.cy.js/yay it passes.png
 
@@ -1786,7 +1786,7 @@ https://on.cypress.io/dashboard/organizations/org-id-1234/billing
   -  /XXX/XXX/XXX/cypress/screenshots/record_pass.cy.js/yay it passes.png                 (400x1022)
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass.cy.js/yay it passes.png
 
@@ -1980,7 +1980,7 @@ exports['e2e record api interaction errors postInstanceResults errors and exits
   -  /XXX/XXX/XXX/cypress/screenshots/record_pass.cy.js/yay it passes.png                 (400x1022)
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
 We encountered an unexpected error communicating with our servers.
 
@@ -2040,7 +2040,7 @@ exports['e2e record api skips specs records tests and exits without executing 1'
   └────────────────────────────────────────────────────────────────────────────────────────────────┘
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Nothing to Upload
 
@@ -2119,7 +2119,7 @@ exports['e2e record api skips specs records tests and exits without executing in
   └────────────────────────────────────────────────────────────────────────────────────────────────┘
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Nothing to Upload
 
@@ -2187,7 +2187,7 @@ exports['e2e record empty specs succeeds when empty spec file 1'] = `
   └────────────────────────────────────────────────────────────────────────────────────────────────┘
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Nothing to Upload
 
@@ -2216,7 +2216,7 @@ exports['e2e record empty specs succeeds when empty spec file 1'] = `
   └────────────────────────────────────────────────────────────────────────────────────────────────┘
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Nothing to Upload
 
@@ -2363,7 +2363,7 @@ Because this error occurred during a \`before each\` hook we are skipping the re
   -  Video output: /XXX/XXX/XXX/cypress/videos/record_fail.cy.js.mp4
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Done Uploading (*/2) /foo/bar/.projects/e2e/cypress/screenshots/record_fail.cy.js/record fails -- fails 1 -- before each hook (failed).png
   - Done Uploading (*/2) /foo/bar/.projects/e2e/cypress/videos/record_fail.cy.js.mp4
@@ -2405,7 +2405,7 @@ plugin stdout
   -  /XXX/XXX/XXX/cypress/screenshots/record_pass.cy.js/yay it passes.png                 (400x1022)
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass.cy.js/yay it passes.png
 
@@ -2483,7 +2483,7 @@ plugin stdout
   -  /XXX/XXX/XXX/cypress/screenshots/record_pass.cy.js/yay it passes.png                 (400x1022)
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass.cy.js/yay it passes.png
 
@@ -2690,7 +2690,7 @@ https://on.cypress.io/dashboard/organizations/org-id-1234/billing
   -  /XXX/XXX/XXX/cypress/screenshots/record_pass.cy.js/yay it passes.png                 (400x1022)
 
 
-  (Uploading Results)
+  (Uploading Screenshots & Videos)
 
   - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass.cy.js/yay it passes.png
 
diff --git a/system-tests/lib/normalizeStdout.ts b/system-tests/lib/normalizeStdout.ts
index fa4ad67d1b9b..5aea86b7f972 100644
--- a/system-tests/lib/normalizeStdout.ts
+++ b/system-tests/lib/normalizeStdout.ts
@@ -150,8 +150,8 @@ export const normalizeStdout = function (str: string, options: any = {}) {
   // 15 seconds -> XX seconds
   .replace(/((\d+ minutes?,\s+)?\d+ seconds? *)/g, replaceTime)
   .replace(/\r/g, '')
-  // replaces multiple lines of uploading results (since order not guaranteed)
-  .replace(/(Uploading Results.*?\n\n)((.*-.*[\s\S\r]){2,}?)(\n\n)/g, replaceUploadingResults)
+  // replaces multiple lines of uploading screenshots & results (since order not guaranteed)
+  .replace(/(Uploading Screenshots & Videos.*?\n\n)((.*-.*[\s\S\r]){2,}?)(\n\n)/g, replaceUploadingResults)
   // fix "Require stacks" for CI
   .replace(/^(\- )(\/.*\/packages\/server\/)(.*)$/gm, '$1$3')
   // Different browsers have different cross-origin error messages

From b5f3f67f45f65ec06aab5ccbd594ce78fb3abc38 Mon Sep 17 00:00:00 2001
From: Bill Glesias 
Date: Fri, 19 May 2023 13:59:57 -0400
Subject: [PATCH 2/2] run ci