Skip to content

Commit

Permalink
Uncomment browser login tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@spetrov
spetrov committed Jul 11, 2024
1 parent b954e2b commit 2f82754
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 44 deletions.
91 changes: 53 additions & 38 deletions FRAuth/FRAuthTests/FRAuthSwiftTests/FRAuth/Browser/BrowserTests.swift
View file
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
33 changes: 27 additions & 6 deletions FRAuth/FRAuthTests/FRAuthSwiftTests/FRAuth/Model/User/FRUserBrowserTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ 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 All @@ -62,12 +60,25 @@ class FRUserBrowserTests: FRAuthBaseTest {
"OAuth2_Token_Revoke_Success",
"OAuth2_EndSession_Success"])

// Get top VC
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
}

let ex = self.expectation(description: "Browser Login")
let _ = FRUser.browser()?.set(browserType: .ephemeralAuthSession).build().login(completion: { (user, error) in
let _ = FRUser.browser()?.set(browserType: .ephemeralAuthSession).set(presentingViewController: vc).build().login(completion: { (user, error) in
XCTAssertNil(error)
XCTAssertNotNil(user)
ex.fulfill()
})
// Sleep for 1 second
sleep(1)
// Inject authorization_code to mimic browser authentication
let _ = Browser.validateBrowserLogin(url: URL(string: "frauth://com.forgerock.ios/login?code=testcode")!)
waitForExpectations(timeout: 60, handler: nil)
Expand All @@ -87,22 +98,32 @@ 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()

// Set mock responses
self.loadMockResponses(["OAuth2_Token_Success",
"OAuth2_Token_Revoke_Success",
"OAuth2_EndSession_Failure"])

// Get top VC
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
}

let ex = self.expectation(description: "Browser Login")
let _ = FRUser.browser()?.set(browserType: .ephemeralAuthSession).build().login(completion: { (user, error) in
let _ = FRUser.browser()?.set(browserType: .ephemeralAuthSession).set(presentingViewController: vc).build().login(completion: { (user, error) in
XCTAssertNotNil(user)
XCTAssertNil(error)
ex.fulfill()
})

// Inject authorization_code to mimic browser authentication
let _ = Browser.validateBrowserLogin(url: URL(string: "frauth://com.forgerock.ios/login?code=testcode")!)
waitForExpectations(timeout: 60, handler: nil)
Expand Down

0 comments on commit 2f82754

Please sign in to comment.