Remove redundant view state and test for it.

element-hq · Sep 25, 2024 · 5af32d9 · 5af32d9
1 parent 6997ba2
commit 5af32d9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/...rces/Screens/Authentication/ServerConfirmationScreen/ServerConfirmationScreenModels.swift b/...rces/Screens/Authentication/ServerConfirmationScreen/ServerConfirmationScreenModels.swift
@@ -19,8 +19,6 @@ struct ServerConfirmationScreenViewState: BindableState {
     var homeserverAddress: String
     /// The flow being attempted on the selected homeserver.
     let authenticationFlow: AuthenticationFlow
-    /// Whether or not the homeserver supports registration.
-    var homeserverSupportsRegistration = false
     /// The presentation anchor used for OIDC authentication.
     var window: UIWindow?
 

diff --git a/...s/Screens/Authentication/ServerConfirmationScreen/ServerConfirmationScreenViewModel.swift b/...s/Screens/Authentication/ServerConfirmationScreen/ServerConfirmationScreenViewModel.swift
@@ -33,15 +33,13 @@ class ServerConfirmationScreenViewModel: ServerConfirmationScreenViewModelType,
 
         let homeserver = authenticationService.homeserver.value
         super.init(initialViewState: ServerConfirmationScreenViewState(homeserverAddress: homeserver.address,
-                                                                       authenticationFlow: authenticationFlow,
-                                                                       homeserverSupportsRegistration: homeserver.supportsRegistration))
+                                                                       authenticationFlow: authenticationFlow))
 
         authenticationService.homeserver
             .receive(on: DispatchQueue.main)
             .sink { [weak self] homeserver in
                 guard let self else { return }
                 state.homeserverAddress = homeserver.address
-                state.homeserverSupportsRegistration = homeserver.supportsRegistration
             }
             .store(in: &cancellables)
     }

diff --git a/UnitTests/Sources/ServerConfigurationScreenViewStateTests.swift b/UnitTests/Sources/ServerConfigurationScreenViewStateTests.swift
@@ -26,18 +26,11 @@ class ServerConfirmationScreenViewStateTests: XCTestCase {
 
     func testRegisterMessageString() {
         let matrixDotOrgRegister = ServerConfirmationScreenViewState(homeserverAddress: LoginHomeserver.mockMatrixDotOrg.address,
-                                                                     authenticationFlow: .register,
-                                                                     homeserverSupportsRegistration: true)
+                                                                     authenticationFlow: .register)
         XCTAssertEqual(matrixDotOrgRegister.message, L10n.screenServerConfirmationMessageRegister, "The registration message should always be the same.")
 
         let oidcRegister = ServerConfirmationScreenViewState(homeserverAddress: LoginHomeserver.mockOIDC.address,
-                                                             authenticationFlow: .register,
-                                                             homeserverSupportsRegistration: true)
+                                                             authenticationFlow: .register)
         XCTAssertEqual(oidcRegister.message, L10n.screenServerConfirmationMessageRegister, "The registration message should always be the same.")
-
-        let otherRegister = ServerConfirmationScreenViewState(homeserverAddress: LoginHomeserver.mockBasicServer.address,
-                                                              authenticationFlow: .register,
-                                                              homeserverSupportsRegistration: false)
-        XCTAssertEqual(otherRegister.message, L10n.errorAccountCreationNotPossible, "The registration message should always be the same.")
     }
 }