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

SDKS-3304 Fix failing "browser login" tests #290

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

SDKS-3304 Fix failing "browser login" tests #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f82754
Uncomment browser login tests
spetrov Jul 11, 2024
6652add
Run only FRUserBrowserTests
spetrov Jul 15, 2024
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
91 changes: 53 additions & 38 deletions FRAuth/FRAuthTests/FRAuthSwiftTests/FRAuth/Browser/BrowserTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ class BrowserTests: FRAuthBaseTest {

@available(iOS 13, *)
func test_03_browser_login_already_in_progress_from_another_instance() throws {
try XCTSkipIf(true) // Skip this test - see SDKS-3304


// Start SDK
self.startSDK()

Expand Down Expand Up @@ -128,6 +127,8 @@ class BrowserTests: FRAuthBaseTest {

ex.fulfill()
}
// Sleep for 1 second
sleep(1)
waitForExpectations(timeout: 60, handler: nil)
}

Expand Down Expand Up @@ -324,7 +325,6 @@ class BrowserTests: FRAuthBaseTest {

@available(iOS 13, *)
func test_08_login_auth_session_cancelled() throws {
try XCTSkipIf(true) // Skip this test - see SDKS-3304

// Start SDK
self.startSDK()
Expand Down Expand Up @@ -371,49 +371,64 @@ class BrowserTests: FRAuthBaseTest {

ex.fulfill()
}
// Sleep for 1 second
sleep(1)
browser.cancel()
// Sleep for 1 second
sleep(1)
waitForExpectations(timeout: 60, handler: nil)
}


func test_09_login_native_browser_cancelled() {

// TODO: - Temporarily disable this test due to UI issue
// // Start SDK
// self.startSDK()
//
// // Construct Browser
// guard let oAuth2Client = self.config.oAuth2Client, let sessionManager = self.config.sessionManager else {
// XCTFail("Failed to retrieve OAuth2Client, and/or SessionManager instance after SDK init")
// return
// }
//
// // Given with SFSafariViewController type of Browser object
// let browser = Browser(.nativeBrowserApp, oAuth2Client, sessionManager, UIViewController())
// Browser.currentBrowser = browser
//
// let ex = self.expectation(description: "Browser Login")
// browser.login { (user, error) in
// XCTAssertNil(user)
// XCTAssertNotNil(error)
//
// if let browserError = error as? BrowserError {
// switch browserError {
// case .externalUserAgentCancelled:
// break
// default:
// XCTFail("While expecting BrowserError.externalUserAgentCancelled; failed with different error \(browserError.localizedDescription)")
// break
// }
// }
// else {
// XCTFail("While expecting BrowserError.externalUserAgentCancelled; failed with different error \(error?.localizedDescription ?? "")")
// }
//
// ex.fulfill()
// }
// browser.cancel()
// waitForExpectations(timeout: 60, handler: nil)
// Start SDK
self.startSDK()

// Construct Browser
guard let oAuth2Client = self.config.oAuth2Client, let keychainManager = self.config.keychainManager else {
XCTFail("Failed to retrieve OAuth2Client, and/or KeychainManager instance after SDK init")
return
}

let keyWindow = UIApplication.shared.windows.filter {$0.isKeyWindow}.first
var topVC = keyWindow?.rootViewController
while let presentedViewController = topVC?.presentedViewController {
topVC = presentedViewController
}

guard let vc = topVC else {
XCTFail("Failed to retrieve top most ViewController")
return
}

// Given with nativeBrowserApp type of Browser object
let browser = Browser(.nativeBrowserApp, oAuth2Client, keychainManager, vc)
Browser.currentBrowser = browser

let ex = self.expectation(description: "Browser Login")
browser.login { (user, error) in
XCTAssertNil(user)
XCTAssertNotNil(error)

if let browserError = error as? BrowserError {
switch browserError {
case .externalUserAgentCancelled:
break
default:
XCTFail("While expecting BrowserError.externalUserAgentCancelled; failed with different error \(browserError.localizedDescription)")
break
}
}
else {
XCTFail("While expecting BrowserError.externalUserAgentCancelled; failed with different error \(error?.localizedDescription ?? "")")
}

ex.fulfill()
}
browser.cancel()
waitForExpectations(timeout: 60, handler: nil)
}


Expand Down
5 changes: 1 addition & 4 deletions FRAuth/FRAuthTests/FRAuthSwiftTests/FRAuth/Model/User/FRUserBrowserTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ class FRUserBrowserTests: FRAuthBaseTest {

@available(iOS 13, *)
func test_02_fruser_browser_login_and_logout_success() throws {
try XCTSkipIf(true) // Skip this test - see SDKS-3304


// SDK init
self.startSDK()

Expand Down Expand Up @@ -87,8 +86,6 @@ class FRUserBrowserTests: FRAuthBaseTest {

@available(iOS 13, *)
func test_03_fruser_browser_login_and_logout_end_session_failure() throws {
try XCTSkipIf(true) // Skip this test - see SDKS-3304

// SDK init
self.startSDK()

Expand Down
Loading
Loading