Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'trunk' into gutenberg/move-undo-redo-buttons
# Conflicts:
#	Gutenberg/version.rb
#	Podfile.lock
#	WordPress/UITestsFoundation/Screens/Editor/BlockEditorScreen.swift
  • Loading branch information
Gerardo committed Jul 7, 2023
commit ac921c75d6cc5e2b667cffb6f31d2e76f08ec837
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ public class BlockEditorScreen: ScreenObject {
// expect to encase the screen.
try super.init(
expectedElementGetters: [ editorCloseButtonGetter, undoButtonGetter, redoButtonGetter, addBlockButtonGetter ],
app: app,
waitTimeout: 10
app: app
)
}

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.