[Identity] Fix test mode return value (stripe#2988)

wpkyoto · Oct 16, 2023 · 40796f9 · 40796f9
1 parent ceedf66
commit 40796f9
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 14 deletions.
diff --git a/...ity/StripeIdentity/Source/NativeComponents/Coordinators/VerificationSheetController.swift b/...ity/StripeIdentity/Source/NativeComponents/Coordinators/VerificationSheetController.swift
@@ -71,11 +71,13 @@ protocol VerificationSheetControllerProtocol: AnyObject {
     )
 
     func verifyAndTransition(
-        simulateDelay: Bool
+        simulateDelay: Bool,
+        completion: @escaping () -> Void
     )
 
     func unverifyAndTransition(
-        simulateDelay: Bool
+        simulateDelay: Bool,
+        completion: @escaping () -> Void
     )
 
     /// Request a new phoneOtp, transition to error view controller if request failed, callback on successCallback otherwise.
@@ -357,22 +359,28 @@ final class VerificationSheetController: VerificationSheetControllerProtocol {
     }
 
     func verifyAndTransition(
-        simulateDelay: Bool
+        simulateDelay: Bool,
+        completion: @escaping () -> Void
     ) {
         apiClient.verifyTestVerificationSession(
             simulateDelay: simulateDelay
         ).observe(on: .main) { [weak self] result in
+            self?.overrideTestModeReturnValue(result: .flowCompleted)
             self?.transitionWithVerificaionPageDataResult(result)
+            completion()
         }
     }
 
     func unverifyAndTransition(
-        simulateDelay: Bool
+        simulateDelay: Bool,
+        completion: @escaping () -> Void
     ) {
         apiClient.unverifyTestVerificationSession(
             simulateDelay: simulateDelay
         ).observe(on: .main) { [weak self] result in
+            self?.overrideTestModeReturnValue(result: .flowCompleted)
             self?.transitionWithVerificaionPageDataResult(result)
+            completion()
         }
     }
 

diff --git a/...Identity/StripeIdentity/Source/NativeComponents/ViewControllers/DebugViewController.swift b/...Identity/StripeIdentity/Source/NativeComponents/ViewControllers/DebugViewController.swift
@@ -44,13 +44,13 @@ final class DebugViewController: IdentityFlowViewController {
         case .submit(let completeOption):
             switch completeOption {
             case .success:
-                self.sheetController?.verifyAndTransition(simulateDelay: false)
+                self.sheetController?.verifyAndTransition(simulateDelay: false, completion: {})
             case .failure:
-                self.sheetController?.unverifyAndTransition(simulateDelay: false)
+                self.sheetController?.unverifyAndTransition(simulateDelay: false, completion: {})
             case .successAsync:
-                self.sheetController?.verifyAndTransition(simulateDelay: true)
+                self.sheetController?.verifyAndTransition(simulateDelay: true, completion: {})
             case .failureAsync:
-                self.sheetController?.unverifyAndTransition(simulateDelay: true)
+                self.sheetController?.unverifyAndTransition(simulateDelay: true, completion: {})
             }
         case .cancelled:
             finishWithResult(result: .flowCanceled)

diff --git a/StripeIdentity/StripeIdentityTests/Helpers/VerificationSheetControllerMock.swift b/StripeIdentity/StripeIdentityTests/Helpers/VerificationSheetControllerMock.swift
@@ -152,11 +152,13 @@ final class VerificationSheetControllerMock: VerificationSheetControllerProtocol
 
     }
 
-    func verifyAndTransition(simulateDelay: Bool) {
+    func verifyAndTransition(simulateDelay: Bool, completion: @escaping () -> Void) {
+        testModeReturnResult = .flowCompleted
         completeOption = simulateDelay ? .successAsync : .success
     }
 
-    func unverifyAndTransition(simulateDelay: Bool) {
+    func unverifyAndTransition(simulateDelay: Bool, completion: @escaping () -> Void) {
+        testModeReturnResult = .flowCompleted
         completeOption = simulateDelay ? .failureAsync : .failure
     }
 

diff --git a/...ipeIdentityTests/Unit/NativeComponents/Coordinators/VerificationSheetControllerTest.swift b/...ipeIdentityTests/Unit/NativeComponents/Coordinators/VerificationSheetControllerTest.swift
@@ -631,57 +631,93 @@ final class VerificationSheetControllerTest: XCTestCase {
         // Mock initial VerificationPage request successful
         controller.verificationPageResponse = .success(try VerificationPageMock.response200.make())
 
-        controller.verifyAndTransition(simulateDelay: false)
+        exp = XCTestExpectation(description: "transition finished")
+        controller.verifyAndTransition(simulateDelay: false) {
+            self.exp.fulfill()
+        }
 
         XCTAssertEqual(mockAPIClient.verifyUnverifyRequest.requestHistory.count, 1)
 
         XCTAssertEqual(
             mockAPIClient.verifyUnverifyRequest.requestHistory.first,
             ["simulateDelay": false]
         )
+
+        mockAPIClient.verifyUnverifyRequest.respondToRequests(with: .success(try VerificationPageDataMock.response200.make()))
+
+        wait(for: [exp], timeout: 1)
+
+        XCTAssertEqual(controller.testModeReturnValue, IdentityVerificationSheet.VerificationFlowResult.flowCompleted)
     }
 
     func testVerifyAndTransitionWithDelay() throws {
         // Mock initial VerificationPage request successful
         controller.verificationPageResponse = .success(try VerificationPageMock.response200.make())
 
-        controller.verifyAndTransition(simulateDelay: true)
+        exp = XCTestExpectation(description: "transition finished")
+        controller.verifyAndTransition(simulateDelay: true) {
+            self.exp.fulfill()
+        }
 
         XCTAssertEqual(mockAPIClient.verifyUnverifyRequest.requestHistory.count, 1)
 
         XCTAssertEqual(
             mockAPIClient.verifyUnverifyRequest.requestHistory.first,
             ["simulateDelay": true]
         )
+
+        mockAPIClient.verifyUnverifyRequest.respondToRequests(with: .success(try VerificationPageDataMock.response200.make()))
+
+        wait(for: [exp], timeout: 1)
+
+        XCTAssertEqual(controller.testModeReturnValue, IdentityVerificationSheet.VerificationFlowResult.flowCompleted)
     }
 
     func testUnverifyAndTransitionWithoutDelay() throws {
         // Mock initial VerificationPage request successful
         controller.verificationPageResponse = .success(try VerificationPageMock.response200.make())
 
-        controller.unverifyAndTransition(simulateDelay: false)
+        exp = XCTestExpectation(description: "transition finished")
+        controller.unverifyAndTransition(simulateDelay: false) {
+            self.exp.fulfill()
+        }
 
         XCTAssertEqual(mockAPIClient.verifyUnverifyRequest.requestHistory.count, 1)
 
         XCTAssertEqual(
             mockAPIClient.verifyUnverifyRequest.requestHistory.first,
             ["simulateDelay": false]
         )
+
+        mockAPIClient.verifyUnverifyRequest.respondToRequests(with: .success(try VerificationPageDataMock.response200.make()))
+
+        wait(for: [exp], timeout: 1)
+
+        XCTAssertEqual(controller.testModeReturnValue, IdentityVerificationSheet.VerificationFlowResult.flowCompleted)
     }
 
     func testUnverifyAndTransitionWithDelay() throws {
         // Mock initial VerificationPage request successful
         controller.verificationPageResponse = .success(try VerificationPageMock.response200.make())
 
         // Verify
-        controller.unverifyAndTransition(simulateDelay: true)
+        exp = XCTestExpectation(description: "transition finished")
+        controller.unverifyAndTransition(simulateDelay: true) {
+            self.exp.fulfill()
+        }
 
         XCTAssertEqual(mockAPIClient.verifyUnverifyRequest.requestHistory.count, 1)
 
         XCTAssertEqual(
             mockAPIClient.verifyUnverifyRequest.requestHistory.first,
             ["simulateDelay": true]
         )
+
+        mockAPIClient.verifyUnverifyRequest.respondToRequests(with: .success(try VerificationPageDataMock.response200.make()))
+
+        wait(for: [exp], timeout: 1)
+
+        XCTAssertEqual(controller.testModeReturnValue, IdentityVerificationSheet.VerificationFlowResult.flowCompleted)
     }
 
     func testGeneratePhoneOtp() throws {

diff --git a/...y/StripeIdentityTests/Unit/NativeComponents/ViewControllers/DebugViewControllerTest.swift b/...y/StripeIdentityTests/Unit/NativeComponents/ViewControllers/DebugViewControllerTest.swift
@@ -45,21 +45,29 @@ final class DebugViewControllerTest: XCTestCase {
 
     func testClickSubmitWithSuccess() {
         vc.didTapButton(.submit(completeOption: .success))
+
+        XCTAssertEqual(mockSheetController.testModeReturnResult, .flowCompleted)
         XCTAssertEqual(mockSheetController.completeOption, .success)
     }
 
     func testClickSubmitWithSuccessAsync() {
         vc.didTapButton(.submit(completeOption: .successAsync))
+
+        XCTAssertEqual(mockSheetController.testModeReturnResult, .flowCompleted)
         XCTAssertEqual(mockSheetController.completeOption, .successAsync)
     }
 
     func testClickSubmitWithFailure() {
         vc.didTapButton(.submit(completeOption: .failure))
+
+        XCTAssertEqual(mockSheetController.testModeReturnResult, .flowCompleted)
         XCTAssertEqual(mockSheetController.completeOption, .failure)
     }
 
     func testClickSubmitWithFailureAsync() {
         vc.didTapButton(.submit(completeOption: .failureAsync))
+
+        XCTAssertEqual(mockSheetController.testModeReturnResult, .flowCompleted)
         XCTAssertEqual(mockSheetController.completeOption, .failureAsync)
     }
 }