feat(common): Remove uuid and update unique id generation #1408
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1 @@ | ||
| workspaces-experimental true | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,24 +19,33 @@ Cypress.Commands.add('injectAxe', () => { | |
| }); | ||
|
|
||
| // Needed for https://github.com/Bkucera/cypress-plugin-tab/issues/46 | ||
| Cypress.Commands.overwrite('visit', (originalFn, urlOrOptions, inputOptions = {}) => { | ||
|
There was a problem hiding this comment. Changes in this file were from Cypress adding type defintions to |
||
| let options: typeof urlOrOptions; | ||
| if (typeof urlOrOptions === 'object') { | ||
| options = urlOrOptions; | ||
| } else { | ||
| options = {url: urlOrOptions, ...inputOptions}; | ||
| } | ||
|
|
||
| return originalFn({ | ||
| ...options, | ||
| onBeforeLoad(win) { | ||
| options.onBeforeLoad?.(win); | ||
| supports(); // prime the ally.js supports cache so it doesn't mess with the cypress-plugin-tab | ||
| }, | ||
| }); | ||
| }); | ||
|
|
||
| // Add better logging to cy.tab | ||
| Cypress.Commands.overwrite<'tab', 'element'>('tab', (originalFn, subject, options) => { | ||
| // Lots of `any` overrides: | ||
|
|
||
| // (cy.$$ as any) - according to the types, `cy.$$` can only take a string which isn't true. | ||
| // jQuery can wrap elements directly as well. Source: | ||
| // https://github.com/cypress-io/cypress/blob/df5687c65d82e0591256df2dea727e5680baeb82/cli/types/cypress.d.ts#L2285 | ||
|
|
||
| // (cy as any).state - `cy.state` doesn't have any types since it is considered private. | ||
| const prevSubject = (cy.$$ as any)(subject || (cy as any).state('window').document.activeElement); | ||
|
|
||
| const log = Cypress.log({ | ||
| $el: prevSubject, | ||
|
|
@@ -49,16 +58,20 @@ Cypress.Commands.overwrite('tab', (originalFn, subject, options) => { | |
|
|
||
| log.snapshot('before', {next: 'after'}); | ||
|
|
||
| return ( | ||
| Cypress.Promise.try(() => { | ||
| return originalFn(subject, options); | ||
| }) | ||
| // Cypress types are wrong and think `value` is a `Cypress.Chainable<Subject>` instead of `Subject` | ||
| // https://github.com/cypress-io/cypress/pull/19003 | ||
| .then((value: any) => { | ||
| log.set('$el', value).snapshot(); | ||
| return Cypress.$(value); | ||
| }) | ||
| .finally(() => { | ||
| log.end(); | ||
| }) as any | ||
| ); | ||
| }); | ||
|
|
||
| declare global { | ||
|
|
@@ -119,15 +132,18 @@ function isKeyOf<T>(obj: T, key: any): key is keyof T { | |
| return typeof key === 'string' && key in obj; | ||
| } | ||
|
|
||
| Cypress.Commands.overwrite<'should', 'element'>( | ||
| 'should', | ||
| (originalFn, subject, expectation, ...args) => { | ||
| const customMatchers = { | ||
| 'have.ariaDescription': haveAriaDescription(args[0]), | ||
| 'have.ariaLabel': haveAriaLabel(args[0]), | ||
| }; | ||
| // See if the expectation is a string and if it is a member of Jest's expect | ||
| if (isKeyOf(customMatchers, expectation)) { | ||
| return (originalFn as any)(subject, customMatchers[expectation]); | ||
| } | ||
|
|
||
| return originalFn(subject, expectation, ...args); | ||
| } | ||
| ); | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All these were due to a breaking change in Cypress v6.
This "fix" did find legitimate issues with our tests, but I feel like we've lost some semantics. I want to know if the element is no longer accessible to the user. Whether it is still in the DOM or just hidden is an implementation detail. Perhaps I'll make an
be.inaccessibleassertion that does this.