From a800ff1156572a08331581926a554072837a657c Mon Sep 17 00:00:00 2001 From: Amir Rustamzadeh Date: Tue, 9 Mar 2021 11:42:12 -0500 Subject: [PATCH] refactor "test recordings" to "test results" --- packages/desktop-gui/src/runs/runs-list.jsx | 2 +- .../server/__snapshots__/7_record_spec.js | 670 +++++++++--------- packages/server/lib/errors.js | 12 +- packages/server/lib/modes/record.js | 2 +- packages/server/test/e2e/7_record_spec.js | 12 +- 5 files changed, 349 insertions(+), 349 deletions(-) diff --git a/packages/desktop-gui/src/runs/runs-list.jsx b/packages/desktop-gui/src/runs/runs-list.jsx index 4aaac89e49c3..10da2028310a 100644 --- a/packages/desktop-gui/src/runs/runs-list.jsx +++ b/packages/desktop-gui/src/runs/runs-list.jsx @@ -277,7 +277,7 @@ class RunsList extends Component { return (
-

Log in to see test recordings here!

+

Log in to see test results here!

After logging in, you will see recorded runs here and on the Cypress Dashboard.
diff --git a/packages/server/__snapshots__/7_record_spec.js b/packages/server/__snapshots__/7_record_spec.js index ba2569c33648..45b8bd92988b 100644 --- a/packages/server/__snapshots__/7_record_spec.js +++ b/packages/server/__snapshots__/7_record_spec.js @@ -1552,7 +1552,7 @@ This error will not alter the exit code. ` exports['e2e record api interaction errors create run 402 - free plan exceeds monthly private tests errors and exits when on free plan and over recorded runs limit 1'] = ` -You've exceeded the limit of private test recordings under your free plan this month. The limit is 500 private test recordings. +You've exceeded the limit of private test results under your free plan this month. The limit is 500 private test results. To continue recording tests this month you must upgrade your account. Please visit your billing to upgrade to another billing plan. @@ -1587,7 +1587,7 @@ StatusCodeError: 402 ` exports['e2e record api interaction errors create run 402 - free plan exceeds monthly tests errors and exits when on free plan and over recorded tests limit 1'] = ` -You've exceeded the limit of test recordings under your free plan this month. The limit is 500 test recordings. +You've exceeded the limit of test results under your free plan this month. The limit is 500 test results. To continue recording tests this month you must upgrade your account. Please visit your billing to upgrade to another billing plan. @@ -1682,168 +1682,6 @@ https://on.cypress.io/dashboard/organizations/org-id-1234/billing Recorded Run: https://dashboard.cypress.io/projects/cjvoj7/runs/12 -` - -exports['e2e record api interaction warnings create run warnings grace period - over private tests limit warns when over private test recordings 1'] = ` -You've exceeded the limit of private test recordings under your free plan this month. The limit is 500 private test recordings. - -Your plan is now in a grace period, which means your tests will still be recorded until 2999-12-31. Please upgrade your plan to continue recording tests on the Cypress Dashboard in the future. - -https://on.cypress.io/dashboard/organizations/org-id-1234/billing - -==================================================================================================== - - (Run Starting) - - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ Cypress: 1.2.3 │ - │ Browser: FooBrowser 88 │ - │ Specs: 1 found (record_pass_spec.js) │ - │ Searched: cypress/integration/record_pass* │ - │ Params: Tag: false, Group: false, Parallel: false │ - │ Run URL: https://dashboard.cypress.io/projects/cjvoj7/runs/12 │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - - -──────────────────────────────────────────────────────────────────────────────────────────────────── - - Running: record_pass_spec.js (1 of 1) - Estimated: 8 seconds - - - record pass - ✓ passes - - is pending - - - 1 passing - 1 pending - - - (Results) - - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ Tests: 2 │ - │ Passing: 1 │ - │ Failing: 0 │ - │ Pending: 1 │ - │ Skipped: 0 │ - │ Screenshots: 1 │ - │ Video: true │ - │ Duration: X seconds │ - │ Estimated: 8 seconds │ - │ Spec Ran: record_pass_spec.js │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - - - (Screenshots) - - - /XXX/XXX/XXX/cypress/screenshots/record_pass_spec.js/yay it passes.png (400x1022) - - - (Uploading Results) - - - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass_spec.js/yay it passes.png - -==================================================================================================== - - (Run Finished) - - - Spec Tests Passing Failing Pending Skipped - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ ✔ record_pass_spec.js XX:XX 2 1 - 1 - │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - ✔ All specs passed! XX:XX 2 1 - 1 - - - -─────────────────────────────────────────────────────────────────────────────────────────────────────── - - Recorded Run: https://dashboard.cypress.io/projects/cjvoj7/runs/12 - - -` - -exports['e2e record api interaction warnings create run warnings grace period - over tests limit warns when over test recordings 1'] = ` -You've exceeded the limit of test recordings under your free plan this month. The limit is 500 test recordings. - -Your plan is now in a grace period, which means you will have the full benefits of your current plan until 2999-12-31. - -Please visit your billing to upgrade your plan. - -https://on.cypress.io/dashboard/organizations/org-id-1234/billing - -==================================================================================================== - - (Run Starting) - - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ Cypress: 1.2.3 │ - │ Browser: FooBrowser 88 │ - │ Specs: 1 found (record_pass_spec.js) │ - │ Searched: cypress/integration/record_pass* │ - │ Params: Tag: false, Group: false, Parallel: false │ - │ Run URL: https://dashboard.cypress.io/projects/cjvoj7/runs/12 │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - - -──────────────────────────────────────────────────────────────────────────────────────────────────── - - Running: record_pass_spec.js (1 of 1) - Estimated: 8 seconds - - - record pass - ✓ passes - - is pending - - - 1 passing - 1 pending - - - (Results) - - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ Tests: 2 │ - │ Passing: 1 │ - │ Failing: 0 │ - │ Pending: 1 │ - │ Skipped: 0 │ - │ Screenshots: 1 │ - │ Video: true │ - │ Duration: X seconds │ - │ Estimated: 8 seconds │ - │ Spec Ran: record_pass_spec.js │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - - - (Screenshots) - - - /XXX/XXX/XXX/cypress/screenshots/record_pass_spec.js/yay it passes.png (400x1022) - - - (Uploading Results) - - - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass_spec.js/yay it passes.png - -==================================================================================================== - - (Run Finished) - - - Spec Tests Passing Failing Pending Skipped - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ ✔ record_pass_spec.js XX:XX 2 1 - 1 - │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - ✔ All specs passed! XX:XX 2 1 - 1 - - - -─────────────────────────────────────────────────────────────────────────────────────────────────────── - - Recorded Run: https://dashboard.cypress.io/projects/cjvoj7/runs/12 - - ` exports['e2e record api interaction warnings create run warnings grace period - parallel feature warns when using parallel feature 1'] = ` @@ -1926,176 +1764,16 @@ https://on.cypress.io/dashboard/organizations/org-id-1234/billing ` -exports['e2e record api interaction warnings create run warnings paid plan - over private tests limit warns when over private test recordings 1'] = ` -You've exceeded the limit of test recordings under your current billing plan this month. The limit is 500 private test recordings. - -To continue getting the full benefits of your current plan, please visit your billing to upgrade. - -https://on.cypress.io/dashboard/organizations/org-id-1234/billing - -==================================================================================================== - - (Run Starting) - - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ Cypress: 1.2.3 │ - │ Browser: FooBrowser 88 │ - │ Specs: 1 found (record_pass_spec.js) │ - │ Searched: cypress/integration/record_pass* │ - │ Params: Tag: false, Group: false, Parallel: false │ - │ Run URL: https://dashboard.cypress.io/projects/cjvoj7/runs/12 │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - - -──────────────────────────────────────────────────────────────────────────────────────────────────── - - Running: record_pass_spec.js (1 of 1) - Estimated: 8 seconds - - - record pass - ✓ passes - - is pending - - - 1 passing - 1 pending - - - (Results) - - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ Tests: 2 │ - │ Passing: 1 │ - │ Failing: 0 │ - │ Pending: 1 │ - │ Skipped: 0 │ - │ Screenshots: 1 │ - │ Video: true │ - │ Duration: X seconds │ - │ Estimated: 8 seconds │ - │ Spec Ran: record_pass_spec.js │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - - - (Screenshots) - - - /XXX/XXX/XXX/cypress/screenshots/record_pass_spec.js/yay it passes.png (400x1022) - - - (Uploading Results) - - - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass_spec.js/yay it passes.png - -==================================================================================================== - - (Run Finished) - - - Spec Tests Passing Failing Pending Skipped - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ ✔ record_pass_spec.js XX:XX 2 1 - 1 - │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - ✔ All specs passed! XX:XX 2 1 - 1 - - - -─────────────────────────────────────────────────────────────────────────────────────────────────────── - - Recorded Run: https://dashboard.cypress.io/projects/cjvoj7/runs/12 - - -` - -exports['e2e record api interaction warnings create run warnings paid plan - over tests limit warns when over test recordings 1'] = ` -You've exceeded the limit of test recordings under your current billing plan this month. The limit is 500 test recordings. - -To continue getting the full benefits of your current plan, please visit your billing to upgrade. +exports['e2e record api interaction warnings create run warnings unknown warning warns with unknown warning code 1'] = ` +Warning from Cypress Dashboard: You are almost out of time -https://on.cypress.io/dashboard/organizations/org-id-1234/billing - -==================================================================================================== - - (Run Starting) - - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ Cypress: 1.2.3 │ - │ Browser: FooBrowser 88 │ - │ Specs: 1 found (record_pass_spec.js) │ - │ Searched: cypress/integration/record_pass* │ - │ Params: Tag: false, Group: false, Parallel: false │ - │ Run URL: https://dashboard.cypress.io/projects/cjvoj7/runs/12 │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - - -──────────────────────────────────────────────────────────────────────────────────────────────────── - - Running: record_pass_spec.js (1 of 1) - Estimated: 8 seconds - - - record pass - ✓ passes - - is pending - - - 1 passing - 1 pending - - - (Results) - - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ Tests: 2 │ - │ Passing: 1 │ - │ Failing: 0 │ - │ Pending: 1 │ - │ Skipped: 0 │ - │ Screenshots: 1 │ - │ Video: true │ - │ Duration: X seconds │ - │ Estimated: 8 seconds │ - │ Spec Ran: record_pass_spec.js │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - - - (Screenshots) - - - /XXX/XXX/XXX/cypress/screenshots/record_pass_spec.js/yay it passes.png (400x1022) - - - (Uploading Results) - - - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass_spec.js/yay it passes.png - -==================================================================================================== - - (Run Finished) - - - Spec Tests Passing Failing Pending Skipped - ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ - │ ✔ record_pass_spec.js XX:XX 2 1 - 1 - │ - └────────────────────────────────────────────────────────────────────────────────────────────────┘ - ✔ All specs passed! XX:XX 2 1 - 1 - - - -─────────────────────────────────────────────────────────────────────────────────────────────────────── - - Recorded Run: https://dashboard.cypress.io/projects/cjvoj7/runs/12 - - -` - -exports['e2e record api interaction warnings create run warnings unknown warning warns with unknown warning code 1'] = ` -Warning from Cypress Dashboard: You are almost out of time - -Details: -{ - "code": "OUT_OF_TIME", - "name": "OutOfTime", - "hadTime": 1000, - "spentTime": 999 -} +Details: +{ + "code": "OUT_OF_TIME", + "name": "OutOfTime", + "hadTime": 1000, + "spentTime": 999 +} ==================================================================================================== @@ -2453,8 +2131,330 @@ exports['e2e record passing passes 2'] = [ } ] -exports['e2e record api interaction warnings create run warnings free plan - over tests limit v2 warns when over test recordings 1'] = ` -You've exceeded the limit of test recordings under your free billing plan this month. The limit is 500 test recordings. +exports['e2e record api interaction warnings create run warnings grace period - over private tests limit warns when over private test results 1'] = ` +You've exceeded the limit of private test results under your free plan this month. The limit is 500 private test results. + +Your plan is now in a grace period, which means your tests will still be recorded until 2999-12-31. Please upgrade your plan to continue recording tests on the Cypress Dashboard in the future. + +https://on.cypress.io/dashboard/organizations/org-id-1234/billing + +==================================================================================================== + + (Run Starting) + + ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ + │ Cypress: 1.2.3 │ + │ Browser: FooBrowser 88 │ + │ Specs: 1 found (record_pass_spec.js) │ + │ Searched: cypress/integration/record_pass* │ + │ Params: Tag: false, Group: false, Parallel: false │ + │ Run URL: https://dashboard.cypress.io/projects/cjvoj7/runs/12 │ + └────────────────────────────────────────────────────────────────────────────────────────────────┘ + + +──────────────────────────────────────────────────────────────────────────────────────────────────── + + Running: record_pass_spec.js (1 of 1) + Estimated: 8 seconds + + + record pass + ✓ passes + - is pending + + + 1 passing + 1 pending + + + (Results) + + ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ + │ Tests: 2 │ + │ Passing: 1 │ + │ Failing: 0 │ + │ Pending: 1 │ + │ Skipped: 0 │ + │ Screenshots: 1 │ + │ Video: true │ + │ Duration: X seconds │ + │ Estimated: 8 seconds │ + │ Spec Ran: record_pass_spec.js │ + └────────────────────────────────────────────────────────────────────────────────────────────────┘ + + + (Screenshots) + + - /XXX/XXX/XXX/cypress/screenshots/record_pass_spec.js/yay it passes.png (400x1022) + + + (Uploading Results) + + - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass_spec.js/yay it passes.png + +==================================================================================================== + + (Run Finished) + + + Spec Tests Passing Failing Pending Skipped + ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ + │ ✔ record_pass_spec.js XX:XX 2 1 - 1 - │ + └────────────────────────────────────────────────────────────────────────────────────────────────┘ + ✔ All specs passed! XX:XX 2 1 - 1 - + + +─────────────────────────────────────────────────────────────────────────────────────────────────────── + + Recorded Run: https://dashboard.cypress.io/projects/cjvoj7/runs/12 + + +` + +exports['e2e record api interaction warnings create run warnings grace period - over tests limit warns when over test results 1'] = ` +You've exceeded the limit of test results under your free plan this month. The limit is 500 test results. + +Your plan is now in a grace period, which means you will have the full benefits of your current plan until 2999-12-31. + +Please visit your billing to upgrade your plan. + +https://on.cypress.io/dashboard/organizations/org-id-1234/billing + +==================================================================================================== + + (Run Starting) + + ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ + │ Cypress: 1.2.3 │ + │ Browser: FooBrowser 88 │ + │ Specs: 1 found (record_pass_spec.js) │ + │ Searched: cypress/integration/record_pass* │ + │ Params: Tag: false, Group: false, Parallel: false │ + │ Run URL: https://dashboard.cypress.io/projects/cjvoj7/runs/12 │ + └────────────────────────────────────────────────────────────────────────────────────────────────┘ + + +──────────────────────────────────────────────────────────────────────────────────────────────────── + + Running: record_pass_spec.js (1 of 1) + Estimated: 8 seconds + + + record pass + ✓ passes + - is pending + + + 1 passing + 1 pending + + + (Results) + + ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ + │ Tests: 2 │ + │ Passing: 1 │ + │ Failing: 0 │ + │ Pending: 1 │ + │ Skipped: 0 │ + │ Screenshots: 1 │ + │ Video: true │ + │ Duration: X seconds │ + │ Estimated: 8 seconds │ + │ Spec Ran: record_pass_spec.js │ + └────────────────────────────────────────────────────────────────────────────────────────────────┘ + + + (Screenshots) + + - /XXX/XXX/XXX/cypress/screenshots/record_pass_spec.js/yay it passes.png (400x1022) + + + (Uploading Results) + + - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass_spec.js/yay it passes.png + +==================================================================================================== + + (Run Finished) + + + Spec Tests Passing Failing Pending Skipped + ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ + │ ✔ record_pass_spec.js XX:XX 2 1 - 1 - │ + └────────────────────────────────────────────────────────────────────────────────────────────────┘ + ✔ All specs passed! XX:XX 2 1 - 1 - + + +─────────────────────────────────────────────────────────────────────────────────────────────────────── + + Recorded Run: https://dashboard.cypress.io/projects/cjvoj7/runs/12 + + +` + +exports['e2e record api interaction warnings create run warnings paid plan - over private tests limit warns when over private test results 1'] = ` +You've exceeded the limit of test results under your current billing plan this month. The limit is 500 private test results. + +To continue getting the full benefits of your current plan, please visit your billing to upgrade. + +https://on.cypress.io/dashboard/organizations/org-id-1234/billing + +==================================================================================================== + + (Run Starting) + + ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ + │ Cypress: 1.2.3 │ + │ Browser: FooBrowser 88 │ + │ Specs: 1 found (record_pass_spec.js) │ + │ Searched: cypress/integration/record_pass* │ + │ Params: Tag: false, Group: false, Parallel: false │ + │ Run URL: https://dashboard.cypress.io/projects/cjvoj7/runs/12 │ + └────────────────────────────────────────────────────────────────────────────────────────────────┘ + + +──────────────────────────────────────────────────────────────────────────────────────────────────── + + Running: record_pass_spec.js (1 of 1) + Estimated: 8 seconds + + + record pass + ✓ passes + - is pending + + + 1 passing + 1 pending + + + (Results) + + ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ + │ Tests: 2 │ + │ Passing: 1 │ + │ Failing: 0 │ + │ Pending: 1 │ + │ Skipped: 0 │ + │ Screenshots: 1 │ + │ Video: true │ + │ Duration: X seconds │ + │ Estimated: 8 seconds │ + │ Spec Ran: record_pass_spec.js │ + └────────────────────────────────────────────────────────────────────────────────────────────────┘ + + + (Screenshots) + + - /XXX/XXX/XXX/cypress/screenshots/record_pass_spec.js/yay it passes.png (400x1022) + + + (Uploading Results) + + - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass_spec.js/yay it passes.png + +==================================================================================================== + + (Run Finished) + + + Spec Tests Passing Failing Pending Skipped + ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ + │ ✔ record_pass_spec.js XX:XX 2 1 - 1 - │ + └────────────────────────────────────────────────────────────────────────────────────────────────┘ + ✔ All specs passed! XX:XX 2 1 - 1 - + + +─────────────────────────────────────────────────────────────────────────────────────────────────────── + + Recorded Run: https://dashboard.cypress.io/projects/cjvoj7/runs/12 + + +` + +exports['e2e record api interaction warnings create run warnings paid plan - over tests limit warns when over test results 1'] = ` +You've exceeded the limit of test results under your current billing plan this month. The limit is 500 test results. + +To continue getting the full benefits of your current plan, please visit your billing to upgrade. + +https://on.cypress.io/dashboard/organizations/org-id-1234/billing + +==================================================================================================== + + (Run Starting) + + ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ + │ Cypress: 1.2.3 │ + │ Browser: FooBrowser 88 │ + │ Specs: 1 found (record_pass_spec.js) │ + │ Searched: cypress/integration/record_pass* │ + │ Params: Tag: false, Group: false, Parallel: false │ + │ Run URL: https://dashboard.cypress.io/projects/cjvoj7/runs/12 │ + └────────────────────────────────────────────────────────────────────────────────────────────────┘ + + +──────────────────────────────────────────────────────────────────────────────────────────────────── + + Running: record_pass_spec.js (1 of 1) + Estimated: 8 seconds + + + record pass + ✓ passes + - is pending + + + 1 passing + 1 pending + + + (Results) + + ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ + │ Tests: 2 │ + │ Passing: 1 │ + │ Failing: 0 │ + │ Pending: 1 │ + │ Skipped: 0 │ + │ Screenshots: 1 │ + │ Video: true │ + │ Duration: X seconds │ + │ Estimated: 8 seconds │ + │ Spec Ran: record_pass_spec.js │ + └────────────────────────────────────────────────────────────────────────────────────────────────┘ + + + (Screenshots) + + - /XXX/XXX/XXX/cypress/screenshots/record_pass_spec.js/yay it passes.png (400x1022) + + + (Uploading Results) + + - Done Uploading (1/1) /foo/bar/.projects/e2e/cypress/screenshots/record_pass_spec.js/yay it passes.png + +==================================================================================================== + + (Run Finished) + + + Spec Tests Passing Failing Pending Skipped + ┌────────────────────────────────────────────────────────────────────────────────────────────────┐ + │ ✔ record_pass_spec.js XX:XX 2 1 - 1 - │ + └────────────────────────────────────────────────────────────────────────────────────────────────┘ + ✔ All specs passed! XX:XX 2 1 - 1 - + + +─────────────────────────────────────────────────────────────────────────────────────────────────────── + + Recorded Run: https://dashboard.cypress.io/projects/cjvoj7/runs/12 + + +` + +exports['e2e record api interaction warnings create run warnings free plan - over tests limit v2 warns when over test results 1'] = ` +You've exceeded the limit of test results under your free billing plan this month. The limit is 500 test results. To continue getting the full benefits of your current plan, please visit your billing to upgrade. diff --git a/packages/server/lib/errors.js b/packages/server/lib/errors.js index 8578134e39da..ebfa23086ba9 100644 --- a/packages/server/lib/errors.js +++ b/packages/server/lib/errors.js @@ -704,35 +704,35 @@ const getMsgByType = function (type, arg1 = {}, arg2, arg3) { return `Warning: Multiple attempts to register the following task(s): ${chalk.blue(arg1)}. Only the last attempt will be registered.` case 'FREE_PLAN_EXCEEDS_MONTHLY_PRIVATE_TESTS': return stripIndent`\ - You've exceeded the limit of private test recordings under your free plan this month. ${arg1.usedTestsMessage} + You've exceeded the limit of private test results under your free plan this month. ${arg1.usedTestsMessage} To continue recording tests this month you must upgrade your account. Please visit your billing to upgrade to another billing plan. ${arg1.link}` case 'FREE_PLAN_IN_GRACE_PERIOD_EXCEEDS_MONTHLY_PRIVATE_TESTS': return stripIndent`\ - You've exceeded the limit of private test recordings under your free plan this month. ${arg1.usedTestsMessage} + You've exceeded the limit of private test results under your free plan this month. ${arg1.usedTestsMessage} Your plan is now in a grace period, which means your tests will still be recorded until ${arg1.gracePeriodMessage}. Please upgrade your plan to continue recording tests on the Cypress Dashboard in the future. ${arg1.link}` case 'PAID_PLAN_EXCEEDS_MONTHLY_PRIVATE_TESTS': return stripIndent`\ - You've exceeded the limit of private test recordings under your current billing plan this month. ${arg1.usedTestsMessage} + You've exceeded the limit of private test results under your current billing plan this month. ${arg1.usedTestsMessage} To upgrade your account, please visit your billing to upgrade to another billing plan. ${arg1.link}` case 'FREE_PLAN_EXCEEDS_MONTHLY_TESTS': return stripIndent`\ - You've exceeded the limit of test recordings under your free plan this month. ${arg1.usedTestsMessage} + You've exceeded the limit of test results under your free plan this month. ${arg1.usedTestsMessage} To continue recording tests this month you must upgrade your account. Please visit your billing to upgrade to another billing plan. ${arg1.link}` case 'FREE_PLAN_IN_GRACE_PERIOD_EXCEEDS_MONTHLY_TESTS': return stripIndent`\ - You've exceeded the limit of test recordings under your free plan this month. ${arg1.usedTestsMessage} + You've exceeded the limit of test results under your free plan this month. ${arg1.usedTestsMessage} Your plan is now in a grace period, which means you will have the full benefits of your current plan until ${arg1.gracePeriodMessage}. @@ -741,7 +741,7 @@ const getMsgByType = function (type, arg1 = {}, arg2, arg3) { ${arg1.link}` case 'PLAN_EXCEEDS_MONTHLY_TESTS': return stripIndent`\ - You've exceeded the limit of test recordings under your ${arg1.planType} billing plan this month. ${arg1.usedTestsMessage} + You've exceeded the limit of test results under your ${arg1.planType} billing plan this month. ${arg1.usedTestsMessage} To continue getting the full benefits of your current plan, please visit your billing to upgrade. diff --git a/packages/server/lib/modes/record.js b/packages/server/lib/modes/record.js index 5594568bed09..4be7dfd8fb87 100644 --- a/packages/server/lib/modes/record.js +++ b/packages/server/lib/modes/record.js @@ -260,7 +260,7 @@ const getCommitFromGitOrCi = (git) => { const usedTestsMessage = (limit, phrase) => { if (_.isFinite(limit)) { - return `The limit is ${chalk.blue(limit)} ${phrase} recordings.` + return `The limit is ${chalk.blue(limit)} ${phrase} results.` } return '' diff --git a/packages/server/test/e2e/7_record_spec.js b/packages/server/test/e2e/7_record_spec.js index 51d4c02c79a5..e88d20bef65e 100644 --- a/packages/server/test/e2e/7_record_spec.js +++ b/packages/server/test/e2e/7_record_spec.js @@ -1474,7 +1474,7 @@ describe('e2e record', () => { setup(routes) - it('warns when over private test recordings', function () { + it('warns when over private test results', function () { return e2e.exec(this, { key: 'f858a2bc-b469-4e48-be67-0876339ee7e1', spec: 'record_pass*', @@ -1513,7 +1513,7 @@ describe('e2e record', () => { setup(routes) - it('warns when over test recordings', function () { + it('warns when over test results', function () { return e2e.exec(this, { key: 'f858a2bc-b469-4e48-be67-0876339ee7e1', spec: 'record_pass*', @@ -1628,7 +1628,7 @@ describe('e2e record', () => { setup(routes) - it('warns when over private test recordings', function () { + it('warns when over private test results', function () { return e2e.exec(this, { key: 'f858a2bc-b469-4e48-be67-0876339ee7e1', spec: 'record_pass*', @@ -1667,7 +1667,7 @@ describe('e2e record', () => { setup(routes) - it('warns when over test recordings', function () { + it('warns when over test results', function () { return e2e.exec(this, { key: 'f858a2bc-b469-4e48-be67-0876339ee7e1', spec: 'record_pass*', @@ -1694,7 +1694,7 @@ describe('e2e record', () => { tags, warnings: [{ name: 'FreePlanExceedsMonthlyTests', - message: 'Warning from Cypress Dashboard: Organization with free plan has exceeded monthly test recordings limit.', + message: 'Warning from Cypress Dashboard: Organization with free plan has exceeded monthly test results limit.', code: 'FREE_PLAN_EXCEEDS_MONTHLY_TESTS_V2', used: 700, limit: 500, @@ -1706,7 +1706,7 @@ describe('e2e record', () => { setup(routes) - it('warns when over test recordings', function () { + it('warns when over test results', function () { return e2e.exec(this, { key: 'f858a2bc-b469-4e48-be67-0876339ee7e1', spec: 'record_pass*',