chore(webkit): driver updates for clicking/typing actions and related tests #23522
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 |
|---|---|---|
|
|
@@ -32,7 +32,7 @@ export const logger = { | |
| this._logValues(consoleProps) | ||
| this._logArgs(consoleProps) | ||
| this._logGroups(consoleProps) | ||
| this._logTables(consoleProps) | ||
| }, | ||
|
|
||
| _logValues (consoleProps: any) { | ||
|
|
@@ -118,43 +118,46 @@ export const logger = { | |
| }) | ||
| }, | ||
|
|
||
| _logTables (consoleProps: any) { | ||
| const logTable = ({ name, data, columns }) => { | ||
| let tableData = data | ||
|
|
||
| if (Cypress.isBrowser('webkit')) { | ||
| // WebKit will hang when we attempt to log element references | ||
|
There was a problem hiding this comment. Woah, major bug in webkit. |
||
| // within a table. We replace the element with a simplified display | ||
| // string in this case. | ||
| // https://bugs.webkit.org/show_bug.cgi?id=244100 | ||
|
|
||
| const getSimplifiedElementDisplay = (element: Element) => { | ||
|
There was a problem hiding this comment. This seems similar to https://github.com/cypress-io/cypress/blob/develop/packages/driver/src/dom/elements/utils.ts#L45 - or are they different enough not to warrant reuse? There was a problem hiding this comment. They are pretty close. I wrote the current version to match what Chrome renders in its tables, the util would produce slightly different results. But we could reuse if there are strong feelings either way, it's exposed in app through There was a problem hiding this comment. Up to you, I do not have strong feelings about this 💯 |
||
| let display = element.tagName.toLowerCase() | ||
|
|
||
| if (element.id) { | ||
| display += `#${element.id}` | ||
| } | ||
|
|
||
| element.classList.forEach((className) => { | ||
| display += `.${className}` | ||
| }) | ||
|
|
||
| return display | ||
| } | ||
|
|
||
| tableData = data.map((rowObj) => { | ||
| return Object.entries(rowObj).reduce((acc: any, value) => { | ||
| acc[value[0]] = _.isElement(value[1]) ? getSimplifiedElementDisplay(value[1] as Element) : value[1] | ||
|
|
||
| return acc | ||
| }, {}) | ||
| }) | ||
| } | ||
|
|
||
| console.group(name) | ||
| console.table(tableData, columns) | ||
| console.groupEnd() | ||
| } | ||
|
|
||
| _.each(_.sortBy(consoleProps.table, (val, key) => key), (getTableData: () => Table) => { | ||
| return logTable(getTableData()) | ||
| }) | ||
| }, | ||
| } | ||
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
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.
We currently log tables for keyboard and mouse events, and we were creating slightly different data structures within the consoleProps for each. These differences made the existing logic complicated (and made parsing out the elements to avoid the WebKit hang difficult).
So I normalized the inputs and simplified the parsing here a bit, while ensuring that the elements don't make it into the table for WebKit. I'm sure we could simplify this further.