Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UI Tests] - Fix failing testAddMediaBlocks() test #21582

Merged
merged 5 commits into from
Sep 15, 2023
Merged

[UI Tests] - Fix failing testAddMediaBlocks() test #21582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6df8a89
swipeDown instead of tap since button is removed
jostnes Sep 15, 2023
c94fdf2
tap top of screen to dismiss block instead of swipe down
jostnes Sep 15, 2023
ae59afc
adjust tap coordinate
jostnes Sep 15, 2023
1e825da
skip test on iPhone
jostnes Sep 15, 2023
09d9f20
skip test on iPhone after testing add image
jostnes Sep 15, 2023
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
5 changes: 5 additions & 0 deletions WordPress/UITests/Tests/EditorGutenbergTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,11 @@ class EditorGutenbergTests: XCTestCase {
func testAddMediaBlocks() throws {
try BlockEditorScreen()
.addImage()
.verifyImageBlockDisplayed()

try XCTSkipIf(!XCUIDevice.isPad, "Test currently fails on iPhone in CI for add video and audio from URL - Tapping on the coordinate location results in a blank screen. Skipping rest of test on iPhone while investigation is in progress")

try BlockEditorScreen()
.addVideoFromUrl(urlPath: videoUrlPath)
.addAudioFromUrl(urlPath: audioUrlPath)
.verifyMediaBlocksDisplayed()
Expand Down
5 changes: 5 additions & 0 deletions WordPress/UITestsFoundation/Globals.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ public func navigateBack() {
}
}

public func tapTopOfScreen() {
let app = XCUIApplication()
app.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.2)).tap()
}

public func pullToRefresh(app: XCUIApplication = XCUIApplication()) {
let top = app.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.2))
let bottom = app.coordinate(withNormalizedOffset: CGVector(dx: 0.5, dy: 0.8))
Expand Down
17 changes: 11 additions & 6 deletions WordPress/UITestsFoundation/Screens/Editor/BlockEditorScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ public class BlockEditorScreen: ScreenObject {
$0.buttons["add-block-button"]
}

private let applyButtonGetter: (XCUIApplication) -> XCUIElement = {
$0.buttons["Apply"]
}

private let chooseFromDeviceButtonGetter: (XCUIApplication) -> XCUIElement = {
$0.buttons["Choose from device"]
}
Expand Down Expand Up @@ -93,7 +89,6 @@ public class BlockEditorScreen: ScreenObject {
}

var addBlockButton: XCUIElement { addBlockButtonGetter(app) }
var applyButton: XCUIElement { applyButtonGetter(app) }
var chooseFromDeviceButton: XCUIElement { chooseFromDeviceButtonGetter(app) }
var closeButton: XCUIElement { closeButtonGetter(app) }
var discardButton: XCUIElement { discardButtonGetter(app) }
Expand Down Expand Up @@ -192,7 +187,17 @@ public class BlockEditorScreen: ScreenObject {
addBlock(blockType)
insertFromUrlButton.tap()
app.textFields.element.typeText(UrlPath)
applyButton.tap()
// to dismiss media block URL prompt
tapTopOfScreen()
}

// Can be removed once `testAddMediaBlocks()` test is fixed on iPhone
@discardableResult
public func verifyImageBlockDisplayed() -> Self {
let imagePredicate = NSPredicate(format: "label == 'Image Block. Row 1'")
XCTAssertTrue(app.buttons.containing(imagePredicate).firstMatch.waitForExistence(timeout: 5))

return self
}

@discardableResult
Expand Down