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.

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

FXIOS-762 ⁃ Fix #5937: Re-enable more XCUI tests #7158

Merged
merged 1 commit into from
Aug 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
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
5 changes: 1 addition & 4 deletions XCUITests/BookmarkingTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,6 @@ class BookmarkingTests: BaseTestCase {
waitForValueContains(app.textFields["url"], value: url_3)
}

// Smoketest
// Disabling and modifying this check xcode 11.3 update Issue 5937
/*
func testBookmarksAwesomeBar() {
navigator.nowAt(BrowserTab)
navigator.goto(URLBarOpen)
Expand Down Expand Up @@ -175,7 +172,7 @@ class BookmarkingTests: BaseTestCase {
waitForExistence(app.tables["SiteTable"])
waitForExistence(app.buttons["olx.ro"])
XCTAssertNotEqual(app.tables["SiteTable"].cells.count, 0)
}*/
}

func testAddBookmark() {
addNewBookmark()
Expand Down
10 changes: 4 additions & 6 deletions XCUITests/HomePageSettingsUITest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,7 @@ class HomePageSettingsUITests: BaseTestCase {

XCTAssertEqual("Enter a webpage", value as! String)
}*/

// Disabled due to xcode 11.3 udpate Issue 5937
/*

func testSetFirefoxHomeAsHome() {
// Start by setting to History since FF Home is default
navigator.goto(HomeSettings)
Expand All @@ -136,7 +134,7 @@ class HomePageSettingsUITests: BaseTestCase {
navigator.performAction(Action.SelectHomeAsFirefoxHomePage)
navigator.performAction(Action.GoToHomePage)
waitForExistence(app.collectionViews.cells["TopSitesCell"])
}*/
}

func testSetCustomURLAsHome() {
navigator.goto(HomeSettings)
Expand All @@ -150,8 +148,8 @@ class HomePageSettingsUITests: BaseTestCase {

// Workaroud needed after xcode 11.3 update Issue 5937
// Lets check only that website is open
// waitForExistence(app.textFields["url"], timeout: 5)
// waitForValueContains(app.textFields["url"], value: "mozilla")
waitForExistence(app.textFields["url"], timeout: 5)
waitForValueContains(app.textFields["url"], value: "mozilla")
}

func testTopSitesCustomNumberOfRows() {
Expand Down
12 changes: 5 additions & 7 deletions XCUITests/SearchTest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,11 @@ class SearchTests: BaseTestCase {
func testSearchEngine() {
// Change to the each search engine and verify the search uses it
changeSearchEngine(searchEngine: "Bing")
// Lets keep only one search engine test, xcode 11.3 update Issue 5937
// changeSearchEngine(searchEngine: "DuckDuckGo")
// Temporary disabled due to intermittent issue on BB
// changeSearchEngine(searchEngine: "Google")
// changeSearchEngine(searchEngine: "Twitter")
// changeSearchEngine(searchEngine: "Wikipedia")
// changeSearchEngine(searchEngine: "Amazon.com")
changeSearchEngine(searchEngine: "DuckDuckGo")
changeSearchEngine(searchEngine: "Google")
changeSearchEngine(searchEngine: "Twitter")
changeSearchEngine(searchEngine: "Wikipedia")
changeSearchEngine(searchEngine: "Amazon.com")
}

func testDefaultSearchEngine() {
Expand Down