UITests

ElementX/Sources/Mocks/NotificationSettingsProxyMock.swift

@@ -20,8 +20,13 @@ import MatrixRustSDK
 
 struct NotificationSettingsProxyMockConfiguration {
     var callback = PassthroughSubject<NotificationSettingsProxyCallback, Never>()
-    var defaultRoomMode: RoomNotificationMode = .mentionsAndKeywordsOnly
-    var roomMode = RoomNotificationSettingsProxyMock(with: RoomNotificationSettingsProxyMockConfiguration(mode: .allMessages, isDefault: true))
+    var defaultRoomMode: RoomNotificationMode
+    var roomMode: RoomNotificationSettingsProxyMock
+
+    init(defaultRoomMode: RoomNotificationMode = .allMessages, roomMode: RoomNotificationMode = .allMessages) {
+        self.defaultRoomMode = defaultRoomMode
+        self.roomMode = RoomNotificationSettingsProxyMock(with: RoomNotificationSettingsProxyMockConfiguration(mode: roomMode, isDefault: defaultRoomMode == roomMode))
+    }
 }
 
 extension NotificationSettingsProxyMock {
@@ -31,5 +36,20 @@ extension NotificationSettingsProxyMock {
         callbacks = configuration.callback
         getNotificationSettingsRoomIdIsEncryptedActiveMembersCountReturnValue = configuration.roomMode
         getDefaultNotificationRoomModeIsEncryptedActiveMembersCountReturnValue = configuration.defaultRoomMode
+
+        setNotificationModeRoomIdModeClosure = { [weak self] _, mode in
+            guard let self else { return }
+            self.getNotificationSettingsRoomIdIsEncryptedActiveMembersCountReturnValue = RoomNotificationSettingsProxyMock(with: .init(mode: mode, isDefault: false))
+            Task {
+                self.callbacks.send(.settingsDidChange)
+            }
+        }
+        restoreDefaultNotificationModeRoomIdClosure = { [weak self] _ in
+            guard let self else { return }
+            self.getNotificationSettingsRoomIdIsEncryptedActiveMembersCountReturnValue = RoomNotificationSettingsProxyMock(with: .init(mode: configuration.defaultRoomMode, isDefault: true))
+            Task {
+                self.callbacks.send(.settingsDidChange)
+            }
+        }
     }
 }

ElementX/Sources/Other/AccessibilityIdentifiers.swift

@@ -26,6 +26,7 @@ struct A11yIdentifiers {
     static let reportContent = ReportContent()
     static let roomScreen = RoomScreen()
     static let roomDetailsScreen = RoomDetailsScreen()
+    static let roomNotificationSettingsScreen = RoomNotificationSettingsScreen()
     static let serverConfirmationScreen = ServerConfirmationScreen()
     static let sessionVerificationScreen = SessionVerificationScreen()
     static let softLogoutScreen = SoftLogoutScreen()
@@ -111,6 +112,10 @@ struct A11yIdentifiers {
         let unignore = "room_member_details-unignore"
     }
 
+    struct RoomNotificationSettingsScreen {
+        let allowCustomSetting = "room_notification_settings-allow_custom"
+    }
+
     struct ServerConfirmationScreen {
         let `continue` = "server_confirmation-continue"
         let changeServer = "server_confirmation-change_server"

ElementX/Sources/Screens/RoomNotificationSettingsScreen/View/RoomNotificationSettingsScreen.swift

@@ -45,10 +45,11 @@ struct RoomNotificationSettingsScreen: View {
                 Text(L10n.screenRoomNotificationSettingsAllowCustom)
             }
             .toggleStyle(.compoundForm)
+            .accessibilityIdentifier(A11yIdentifiers.roomNotificationSettingsScreen.allowCustomSetting)
+            .disabled(context.viewState.notificationSettingsState.isLoading)
             .onChange(of: context.allowCustomSetting) { _ in
                 context.send(viewAction: .changedAllowCustomSettings)
             }
-            .disabled(context.viewState.notificationSettingsState.isLoading)
         } footer: {
             Text(L10n.screenRoomNotificationSettingsAllowCustomFootnote)
                 .compoundFormSectionFooter()
@@ -100,8 +101,7 @@ struct RoomNotificationSettingsScreen: View {
 
 struct RoomNotificationSettingsScreen_Previews: PreviewProvider {
     static let viewModel = {
-        let notificationSettingsProxy = NotificationSettingsProxyMock(with: .init(roomMode: .init(with: .init(mode: .mentionsAndKeywordsOnly,
-                                                                                                              isDefault: true))))
+        let notificationSettingsProxy = NotificationSettingsProxyMock(with: .init(defaultRoomMode: .mentionsAndKeywordsOnly, roomMode: .mentionsAndKeywordsOnly))
 
         let roomProxy = RoomProxyMock(with: .init(displayName: "Room", isEncrypted: true, joinedMembersCount: 4))
 
@@ -112,8 +112,7 @@ struct RoomNotificationSettingsScreen_Previews: PreviewProvider {
     }()
 
     static let viewModelCustom = {
-        let notificationSettingsProxy = NotificationSettingsProxyMock(with: .init(roomMode: .init(with: .init(mode: .mentionsAndKeywordsOnly,
-                                                                                                              isDefault: false))))
+        let notificationSettingsProxy = NotificationSettingsProxyMock(with: .init(defaultRoomMode: .allMessages, roomMode: .mentionsAndKeywordsOnly))
 
         let roomProxy = RoomProxyMock(with: .init(displayName: "Room", isEncrypted: true, joinedMembersCount: 4))
 

ElementX/Sources/UITests/UITestsAppCoordinator.swift

@@ -478,10 +478,17 @@ class MockScreen: Identifiable {
                                                                                  roomProxy: RoomProxyMock(with: .init(displayName: "test", members: members))))
             navigationStackCoordinator.setRootCoordinator(coordinator)
             return navigationStackCoordinator
-        case .roomNotificationSettings:
+        case .roomNotificationSettingsDefaultSetting:
             let navigationStackCoordinator = NavigationStackCoordinator()
             let members: [RoomMemberProxyMock] = [.mockInvitedAlice, .mockBob, .mockCharlie]
-            let coordinator = RoomNotificationSettingsScreenCoordinator(parameters: .init(notificationSettingsProxy: NotificationSettingsProxyMock(with: .init()),
+            let coordinator = RoomNotificationSettingsScreenCoordinator(parameters: .init(notificationSettingsProxy: NotificationSettingsProxyMock(with: .init(defaultRoomMode: .allMessages, roomMode: .allMessages)),
+                                                                                          roomProxy: RoomProxyMock(with: .init(displayName: "test", members: members))))
+            navigationStackCoordinator.setRootCoordinator(coordinator)
+            return navigationStackCoordinator
+        case .roomNotificationSettingsCustomSetting:
+            let navigationStackCoordinator = NavigationStackCoordinator()
+            let members: [RoomMemberProxyMock] = [.mockInvitedAlice, .mockBob, .mockCharlie]
+            let coordinator = RoomNotificationSettingsScreenCoordinator(parameters: .init(notificationSettingsProxy: NotificationSettingsProxyMock(with: .init(defaultRoomMode: .allMessages, roomMode: .mentionsAndKeywordsOnly)),
                                                                                           roomProxy: RoomProxyMock(with: .init(displayName: "test", members: members))))
             navigationStackCoordinator.setRootCoordinator(coordinator)
             return navigationStackCoordinator

ElementX/Sources/UITests/UITestsScreenIdentifier.swift

@@ -60,7 +60,8 @@ enum UITestsScreenIdentifier: String {
     case roomMemberDetailsAccountOwner
     case roomMemberDetails
     case roomMemberDetailsIgnoredUser
-    case roomNotificationSettings
+    case roomNotificationSettingsDefaultSetting
+    case roomNotificationSettingsCustomSetting
     case reportContent
     case startChat
     case startChatWithSearchResults

UITests/Sources/RoomNotificationSettingsScreenUITests.swift

@@ -19,8 +19,15 @@ import XCTest
 
 @MainActor
 class RoomNotificationSettingsScreenUITests: XCTestCase {
-    func testInitialStateComponents() async throws {
-        let app = Application.launch(.roomNotificationSettings)
-        try await app.assertScreenshot(.roomNotificationSettings)
+    func testDefaultSetting() async throws {
+        let app = Application.launch(.roomNotificationSettingsDefaultSetting)
+        XCTAssertFalse(app.switches[A11yIdentifiers.roomNotificationSettingsScreen.allowCustomSetting].isOn)
+        try await app.assertScreenshot(.roomNotificationSettingsDefaultSetting)
+    }
+
+    func testCustomSettings() async throws {
+        let app = Application.launch(.roomNotificationSettingsCustomSetting)
+        XCTAssert(app.switches[A11yIdentifiers.roomNotificationSettingsScreen.allowCustomSetting].isOn)
+        try await app.assertScreenshot(.roomNotificationSettingsCustomSetting)
     }
 }