Skip to content

Commit 607b6f1

Browse files
authored
Revert "chore: merge dev into 15 (#6172)" (#6174)
This reverts commit 6af2913.
1 parent 6af2913 commit 607b6f1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+332
-722
lines changed

docs/accessibility/changelog.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ sidebar_position: 200
2424

2525
## Week of 2/24/2025
2626

27-
- [Cypress Accessibility Branch Review](/accessibility/core-concepts/compare-reports) has entered beta. Read the docs to learn how to compare runs and automatically spot newly introduced issues.
27+
- [Cypress Accessibility Branch Review](/accessibility/core-concepts/comparing-reports) has entered beta. Read the docs to learn how to compare runs and automatically spot newly introduced issues.
2828

2929
## Week of 1/13/2025
3030

docs/accessibility/core-concepts/compare-reports.mdx renamed to docs/accessibility/core-concepts/comparing-reports.mdx

+43-6
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Comparing the results from different runs is useful in multiple scenarios.
2929
- **Detecting content issues**: Sometimes content editors can introduce accessibility issues unrelated to code changes. Seeing the example issues presented visually, in context, helps you quickly triage whether you are dealing with a recent code change issue, or a content authorship problem.
3030
- **Reviewing AI-generated code changes**: The increased use of AI to generate and/or review front-end code creates some increased risks of accessibility regressions making it to production. The increase or decrease of accessibility issues when reviewing a pull request helps you understand the impact of the change.
3131
- **Tracing the introduction of issues**: With dropdowns for each run, it's easy to rapidly compare different A and B runs to find the exact commit that introduced a problem.
32-
- **Demonstrating the resolution of issues**: Confirm the effect of your improvements, and share the overview with your team to more quickly review code changes.
32+
- **Demonstrating the resolution of issues**: Confirm the effect of your improvements, and share overview with your team to more quickly review code changes.
3333

3434
## Content of the report
3535

@@ -49,8 +49,47 @@ This organization of the report brings the most significant results to the top -
4949

5050
## How to compare runs
5151

52-
The first step is to get to the [Branch Review](/cloud/features/branch-review.mdx) area of Cypress Cloud, which will let you compare one branch against another - or different runs on the same branch, if needed.
53-
You can access this area by clicking the branch name associated with a run, or in several other ways. [Learn more about how to compare runs](/cloud/features/branch-review.mdx).
52+
The first step is to get to the Branch Review area of Cypress Cloud, which will let you compare one branch against another - or different runs on the same branch, if needed. We refer to be baseline fun for comparison as the `base` run, and the changes we are comparing with as the `changed` run.
53+
54+
There are a number of ways to get to Branch Review depending on where you are looking at your Cypress results. In all cases, once you've picked a `changed` run, you can adjust the automatically-selected `base` run to any branch or run in the project.
55+
56+
### From a Pull Request
57+
58+
<DocsImage
59+
src="/img/accessibility/core-concepts/branch-review-pull-request.png"
60+
alt="A pull request comment from Cypress with an arrow pointing to the 'View all changes introduced in this branch' link. Test results and some accessibility score and violation information is also visible in the comment. The project has an 86.86% accessibility score, with 9 failed elements. Failed rule counts are 1 critical, 1 serious, 3 moderate, and 0 minor."
61+
/>
62+
63+
Click the "View all changes introduced in this branch" link at the bottom of the Test Results table. You will enter branch review with the current PR's branch and latest run pre-selected as the "changed" run.
64+
65+
### From the run list
66+
67+
Click the branch name associated with the run. This will take you to Branch Review with that branch's newest run pre-selected as the `changed` run.
68+
69+
<DocsImage
70+
src="/img/accessibility/core-concepts/branch-review-run-card.png"
71+
alt="A couple of cards showing various details about Cypress test runs, including pass/fail counts and metadata. An arrow points to the branch name."
72+
/>
73+
74+
### From the project list
75+
76+
<DocsImage
77+
src="/img/accessibility/core-concepts/branch-review-project-card.png"
78+
width="40%"
79+
alt="A card showing the name of an example project and related branches to choose."
80+
/>
81+
82+
The project card shows three active branches for the project. You can click through to any of these to enter Branch Review with the newest run on that branch pre-selected as the `changed` run.
83+
84+
### From the main navigation
85+
86+
<DocsImage
87+
src="/img/accessibility/core-concepts/branch-review-side-nav.png"
88+
width="40%"
89+
alt="The main Cypress Cloud navigation showing Latest Runs, Branches, and Analytics menu items. An arrow points to Branches."
90+
/>
91+
92+
When inside of a project, you can select "Branches" in the main navigation to see a full, filterable list of available branches and choose one to set as the `changed` run.
5493

5594
## FAQ
5695

@@ -60,11 +99,9 @@ The best subjects to compare are passing runs that ran similar tests on the same
6099

61100
That said, it still possible and valid to compare runs from different points in time with different sets of test results, as long as you bear in mind all the potential sources of difference between the two runs, which you can evaluate for yourself as you explore the results.
62101

63-
In order to see unified changes for your entire test suite, you need to group all the tests together under a single Cypress run, for each report. Learn more about this in the [Branch Review Best Practices documentation](/cloud/features/branch-review#Best-Practices).
64-
65102
### What is the purpose of the Beta label?
66103

67-
This indicates the feature is ready for use and actively seeking feedback based on real usage of the current implementation. We have a few known issues to work through on our side before we consider this fully production-ready and remove the beta label. These issues only affect a subset of projects -- in most cases everything is working as intended. If you see anything unexpected, please use the feedback button and let us know.
104+
This indicates the feature is ready for use and actively seeking feedback based on real usage of the current implementation. We have a few known issues to work through on our side before we consider this fully production-ready and remove the beta label. These issues only affect a subset of projects -- in most cases everything is working as intended. If you see anything unexpected, please hit the feedback button and let us know.
68105

69106
### Why do I see some views (pages or components) changing from run-to-run?
70107

docs/accessibility/core-concepts/how-it-works.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Cypress Accessibility seamlessly integrates accessibility testing into your deve
1515
1. **Processing**: When your run completes, the final specs are processed for accessibility checks. Earlier specs have already entered processing and are likely completed by the end of the run.
1616
1. **Organizing Views**: Cypress Cloud groups Views (pages and components) rendered during the run, merging and deduplicating across tests. This ensures page-level results and live DOM snapshots are organized effectively.
1717
1. **Generating reports**: A combined "rule-level" report is created, summarizing all detected accessibility violations.
18-
1. **Displaying results**: Results are displayed in Cypress Cloud in the run details area as well as in [Branch Review](/accessibility/core-concepts/compare-reports) for comparing runs. Accessibility is also flagged in integrations (e.g., Slack, GitHub/GitLab comments), and accessible via the [Results API](/accessibility/results-api) for optional CI pipeline actions (e.g., failing builds based on unmet standards).
18+
1. **Displaying results**: Results are displayed in Cypress Cloud in the run details area as well as in [Branch Review](/accessibility/core-concepts/comparing-reports) for comparing runs. Accessibility is also flagged in integrations (e.g., Slack, GitHub/GitLab comments), and accessible via the [Results API](/accessibility/results-api) for optional CI pipeline actions (e.g., failing builds based on unmet standards).
1919

2020
## About Axe Core®
2121

docs/accessibility/get-started/introduction.mdx

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Cypress Accessibility adds detailed accessibility checks and workflows in Cypres
2727
label="See a demo"
2828
icon="action-play-small"
2929
className="!mb-2 mr-1"
30-
href="https://on.cypress.io/accessibility-demo-video"
30+
href="https://www.loom.com/share/eedb1d18c22942d39a5ed2471ae72788?sid=e39f791e-c0b3-4efc-9770-cbfac403c3b9"
3131
/>
3232
<Btn
3333
label=" Explore an example project"
@@ -75,7 +75,7 @@ From there, you can integrate with CI to set your own standards for handling the
7575
href="/accessibility/guides/detect-changes"
7676
aria-labelledby="card-title-8"
7777
>
78-
<Icon name="shield-halved" />
78+
<Icon name="chart-line" />
7979
<h3 id="card-title-8">Detect and manage changes</h3>
8080
<p>
8181
Compare reports in detail to review only _new_ accessibility issues, use

docs/accessibility/guides/detect-changes.mdx

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ sidebar_position: 70
1111

1212
Cypress Accessibility supports three main paths to observing and acting on changes in the accessibility report for your projects:
1313

14-
- Run comparisons with [Branch Review](/accessibility/core-concepts/compare-reports)
14+
- Run comparisons with [Branch Review](/accessibility/core-concepts/comparing-reports)
1515
- The [Results API](/accessibility/results-api) to fail builds or trigger alerts when results don't meet your standards
1616
- [Analytics](/cloud/features/analytics/enterprise-reporting#Cypress-Accessibility) for high-level trend-spotting and analysis
1717

@@ -33,7 +33,7 @@ Use Branch review when reviewing a pull request made by another developer or bef
3333

3434
Since this reduces the amount of violations to review to just what was affected by the PR code changes, you won't spend any time looking for what's relevant -- and if there is no difference, you'll know your PR does not affect the accessibility score and is safe to merge.
3535

36-
See the main [Accessibility Branch Review docs](/accessibility/core-concepts/compare-reports) for a video demo of this workflow.
36+
See the main [Accessibility Branch Review docs](/accessibility/core-concepts/comparing-reports) for a video demo of this workflow.
3737

3838
#### Compare reports during local development (without waiting for CI)
3939

docs/accessibility/results-api.mdx

+2-2
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ run-cypress:
322322
pipeline {
323323
agent {
324324
docker {
325-
image 'cypress/base:22.15.0'
325+
image 'cypress/base:22.12.0'
326326
}
327327
}
328328

@@ -393,7 +393,7 @@ version: 2.1
393393
jobs:
394394
linux-test:
395395
docker:
396-
- image: cypress/base:22.15.0
396+
- image: cypress/base:22.12.0
397397

398398
working_directory: ~/repo
399399
steps:

docs/api/commands/focus.mdx

-1
Original file line numberDiff line numberDiff line change
@@ -159,5 +159,4 @@ the following:
159159
- [`.blur()`](/api/commands/blur)
160160
- [`.click()`](/api/commands/click)
161161
- [`cy.focused()`](/api/commands/focused)
162-
- [`cy.press()`](/api/commands/press)
163162
- [`.type()`](/api/commands/type)

docs/api/commands/origin.mdx

+6-11
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,9 @@ doc.
4040

4141
Cypress no longer injects `document.domain` by default, which means `cy.origin()`
4242
must now be used to navigate between any two origins in the same test, even if
43-
the two origins are in the same superdomain.
44-
This behavior can be disabled by setting the
45-
[injectDocumentDomain](/app/references/configuration#injectDocumentDomain) configuration option to `true`,
46-
to allow a smooth transition of tests to the new behavior.
47-
This configuration option will be removed in a future version of Cypress.
43+
the two origins are in the same superdomain. This behavior can be disabled by setting
44+
the `injectDocumentDomain` configuration option to `true`, to allow a smooth transition
45+
of tests to the new behavior. This configuration option will be removed in a future version of Cypress.
4846

4947
:::
5048

@@ -193,7 +191,7 @@ will not work:
193191
cy.origin('https://example.cypress.io', () => {
194192
cy.visit('/')
195193
cy.get('h1') // Yields an element, which can't be serialized...
196-
}).contains('Kitchen Sink') // ...so this will fail
194+
}).contains('CYPRESS') // ...so this will fail
197195
```
198196

199197
Instead, you must explicitly yield a serializable value:
@@ -203,8 +201,8 @@ Instead, you must explicitly yield a serializable value:
203201
```js
204202
cy.origin('https://example.cypress.io', () => {
205203
cy.visit('/')
206-
cy.get('h1').invoke('text') // Yields a string...
207-
}).should('equal', 'Kitchen Sink') // 👍
204+
cy.get('h1').invoke('textContent') // Yields a string...
205+
}).should('equal', 'CYPRESS') // 👍
208206
```
209207

210208
### Navigating to secondary origin with cy.visit
@@ -369,9 +367,6 @@ Cypress.Commands.add('login', (username, password) => {
369367
In this video we walk through how to test multiple origins in a single test. We
370368
also look at how to use the `cy.session()` command to cache session information
371369
and reuse it across tests.
372-
The configuration option `experimentalSessionAndOrigin`, mentioned in the video, is not used
373-
since [Cypress 12.0.0](https://docs.cypress.io/app/references/changelog#12-0-0)
374-
and the associated functionality is enabled by default.
375370

376371
## Notes
377372

docs/api/commands/press.mdx

-134
This file was deleted.

docs/api/commands/shadow.mdx

+5-2
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,13 @@ When working with `cy.click()`, it sometimes won't click the right element in
9696
Chrome. It's happening because of
9797
[the ambiguity in spec](https://bugs.chromium.org/p/chromium/issues/detail?id=1188919&q=shadowRoot%20elementFromPoint&can=2).
9898

99-
In this case, pass `'top'` to `cy.click()` like below:
99+
In this case, pass `{ position: 'top' }` to `cy.click()` like below:
100100

101101
```js
102-
cy.get('#element').shadow().find('[data-test-id="my-button"]').click('top')
102+
cy.get('#element')
103+
.shadow()
104+
.find('[data-test-id="my-button"]')
105+
.click({ position: 'top' })
103106
```
104107

105108
## Command Log

docs/api/commands/type.mdx

-1
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,5 @@ following:
664664
- [`.clear()`](/api/commands/clear)
665665
- [`.click()`](/api/commands/click)
666666
- [`.focus()`](/api/commands/focus)
667-
- [`cy.press()`](/api/commands/press)
668667
- [`.submit()`](/api/commands/submit)
669668
- [`Cypress.Keyboard`](/api/cypress-api/keyboard-api)

docs/api/cypress-api/custom-commands.mdx

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ There are two API available for adding custom commands:
1717

1818
- [`Cypress.Commands.add()`](#Syntax) - use to add a custom command to use when
1919
writing tests
20-
- [`Cypress.Commands.overwrite()`](#Overwrite-Existing-Commands) - use to
20+
- [`Cypress.Command.overwrite()`](#Overwrite-Existing-Commands) - use to
2121
override an existing built-in Cypress command or reserved internal function.
2222
**Caution:** this overrides it for Cypress as well and could impact how
2323
Cypress behaves.

0 commit comments

Comments
 (0)