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

Jump to bottom

Nb/6331 fix buddybuild tests #6332

Merged
merged 2 commits into from Mar 31, 2020
Merged

Nb/6331 fix buddybuild tests #6332

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04997ce
Fix #6331 - Updated useregent tests
nbhasin2 Mar 30, 2020
43edca3
Removed webview user agent test
nbhasin2 Mar 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 3 additions & 21 deletions ClientTests/ClientTests.swift
View file
Open in desktop
Expand Up @@ -21,37 +21,19 @@ class ClientTests: XCTestCase {
XCTAssertTrue(loc != nil, "Sync UA is as expected. Was \(ua)")
}

// Simple test to make sure the WKWebView UA matches the expected FxiOS pattern.
func testUserAgent() {
func testMobileUserAgent() {
let compare: (String) -> Bool = { ua in
let range = ua.range(of: "^Mozilla/5\\.0 \\(.+\\) AppleWebKit/[0-9\\.]+ \\(KHTML, like Gecko\\)", options: .regularExpression)
return range != nil
}

XCTAssertTrue(compare(UserAgent.getUserAgent()), "User agent computes correctly.")
//XCTAssertTrue(compare(UserAgent.cachedUserAgent(checkiOSVersion: true)!), "User agent is cached correctly.")

let expectation = self.expectation(description: "Found Firefox user agent")

let webView = WKWebView()
webView.evaluateJavaScript("navigator.userAgent") { result, error in
let userAgent = result as! String
if compare(userAgent) {
expectation.fulfill()
} else {
XCTFail("User agent did not match expected pattern! \(userAgent)")
}
}

waitForExpectations(timeout: 5, handler: nil)
XCTAssertTrue(compare(UserAgent.mobileUserAgent()), "User agent computes correctly.")
}

func testDesktopUserAgent() {
let compare: (String) -> Bool = { ua in
let range = ua.range(of: "^Mozilla/5\\.0 \\(Macintosh; Intel Mac OS X [0-9\\.]+\\)", options: .regularExpression)
return range != nil
}

XCTAssertTrue(compare(UserAgent.desktopUserAgent()), "Desktop user agent computes correctly.")
}
}