Fix/zoom out mode hook conflicts controlled #67040
Closed
Conversation
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
jeryj
changed the base branch from
trunk
to
fix/zoom-out-mode-hook-conflicts
|
Size Change: +31 B (0%) Total Size: 1.82 MB
ℹ️ View Unchanged
|
|
Flaky tests detected in 2f77abf. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/11859941292
|
getdave
reviewed
Nov 28, 2024
There was a problem hiding this comment.
On initial testing I wasn't able to replicate the original Issue.
Moreover, this PR adds greater test coverage which will help avoid future regressions and allow us to capture and codify any future expectations about behaviour within the tests.
Great job here @jeryj. When you're ready for a final review let me know 🙇
Comment on lines
+81
to
+84
| await expect( patternsTab ).toHaveAttribute( | ||
| 'data-active-item', | ||
| 'true' | ||
| ); |
There was a problem hiding this comment.
Should we use aria-selected? It's a more user perceivable attribute whereas data-* is purely for developers.
I checked to see if there was an isSelected() but there isn't.
You can do this I believe but you'd have to modify your helper utils to accept options.
getByRole('button', {
selected: true,
});
| 'data-active-item', | ||
| 'true' | ||
| ); | ||
| await expect( await InserterUtils.getZoomCanvas() ).toBeVisible(); |
There was a problem hiding this comment.
Nit: this feels a bit cumbersome. Moreover, this is only ever used for asserting on the active state of Zoom Out rather than retrieving a reference to the Zoom Out canvas itself.
Therefore it might be a clearer to have an API something like this (maybe via a dedicated ZoomOut helper?):
Suggested change
| await expect( await InserterUtils.getZoomCanvas() ).toBeVisible(); | |
| await expect( await ZoomOutUtils.isActive() ); |
Not a deal breaker but I think it would improve the readability of the tests.
Comment on lines
+91
to
+92
| // We should still be in Zoom Out | ||
| await expect( await InserterUtils.getZoomCanvas() ).toBeVisible(); |
There was a problem hiding this comment.
The fact we need this comment is a clue that the API isn't quite right (see other comment).
| await expect( await InserterUtils.getZoomCanvas() ).toBeVisible(); | ||
| } ); | ||
|
|
||
| test( 'should enter zoom out from patterns tab and exit zoom out when closing the inserter', async ( { |
There was a problem hiding this comment.
Suggested change
| test( 'should enter zoom out from patterns tab and exit zoom out when closing the inserter', async ( { | |
| test( 'should enter zoom out when activating the patterns tab and exit zoom out when closing the inserter', async ( { |
|
|
||
| await expect( blockLibrary ).toBeHidden(); | ||
|
|
||
| await expect( await InserterUtils.getZoomCanvas() ).toBeHidden(); |
There was a problem hiding this comment.
Suggested change
| await expect( await InserterUtils.getZoomCanvas() ).toBeHidden(); | |
| await expect( await ZoomOut.isInactive() ); |
Maybe something like this?
Comment on lines
+157
to
+158
| // We should stayin zoom out since the inserter was opened with | ||
| // zoom out engaged |
There was a problem hiding this comment.
Suggested change
| // We should stayin zoom out since the inserter was opened with | |
| // zoom out engaged | |
| // Zoom Out should remain active since the inserter was opened with | |
| // Zoom Out already engaged. |
| } ); | ||
|
|
||
| // Test for https://github.com/WordPress/gutenberg/issues/66328 | ||
| test( 'should not return you to zoom out if manually disengaged', async ( { |
There was a problem hiding this comment.
Suggested change
| test( 'should not return you to zoom out if manually disengaged', async ( { | |
| test( 'should not re-activate Zoom Out if manually disengaged', async ( { |
|
|
||
| await expect( blockLibrary ).toBeHidden(); | ||
|
|
||
| // We should not return to zoom out since it was manually disengaged |
There was a problem hiding this comment.
Suggested change
| // We should not return to zoom out since it was manually disengaged | |
| // Zoom Out should remain inactive since it was manually disengaged |
| await expect( await InserterUtils.getZoomCanvas() ).toBeHidden(); | ||
| } ); | ||
|
|
||
| // Similar test to the above but starting from not zoomed in |
There was a problem hiding this comment.
Suggested change
| // Similar test to the above but starting from not zoomed in | |
| // Similar test to the above but starting with Zoom Out inactive |
|
|
||
| await expect( blockLibrary ).toBeHidden(); | ||
|
|
||
| // We should stay in zoomed out state since it was manually engaged |
There was a problem hiding this comment.
Suggested change
| // We should stay in zoomed out state since it was manually engaged | |
| // Zoom Out should remain active since it was manually engaged |
|
Closing in favor of #67591 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What?
Some potentially useful commits to use in #67033
Closes #66328
Why?
How?
Testing Instructions
Testing Instructions for Keyboard
Screenshots or screencast