Add UTs

RiotSwiftUI/Modules/Settings/Notifications/Model/Mock/MockNotificationPushRule.swift

@@ -19,7 +19,9 @@ import Foundation
 struct MockNotificationPushRule: NotificationPushRuleType {
     var ruleId: String!
     var enabled: Bool
+    var actions: NotificationActions? = NotificationStandardActions.notifyDefaultSound.actions
+    
     func matches(standardActions: NotificationStandardActions?) -> Bool {
-        false
+        standardActions?.actions == actions
     }
 }

RiotSwiftUI/Modules/Settings/Notifications/Model/NotificationActions.swift

@@ -17,7 +17,7 @@
 import Foundation
 
 /// The actions defined on a push rule, used in the static push rule definitions.
-struct NotificationActions {
+struct NotificationActions: Equatable {
     let notify: Bool
     let highlight: Bool
     let sound: String?

RiotSwiftUI/Modules/Settings/Notifications/Service/Mock/MockNotificationSettingsService.swift

@@ -44,5 +44,15 @@ class MockNotificationSettingsService: NotificationSettingsServiceType, Observab
         keywords.remove(keyword)
     }
     
-    func updatePushRuleActions(for ruleId: String, enabled: Bool, actions: NotificationActions?, completion: ((Result<Void, Error>) -> Void)?) { }
+    func updatePushRuleActions(for ruleId: String, enabled: Bool, actions: NotificationActions?, completion: ((Result<Void, Error>) -> Void)?) {
+        guard let ruleIndex = rules.firstIndex(where: { $0.ruleId == ruleId }) else {
+            completion?(.failure(NSError(domain: "fake", code: 0)))
+            return
+        }
+        
+        rules[ruleIndex] = MockNotificationPushRule(ruleId: ruleId,
+                                                    enabled: enabled,
+                                                    actions: actions)
+        completion?(.success(()))
+    }
 }

RiotSwiftUI/Modules/Settings/Notifications/Test/Unit/NotificationSettingsViewModelTests.swift

@@ -0,0 +1,166 @@
+//
+// Copyright 2023 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+@testable import RiotSwiftUI
+import XCTest
+
+final class NotificationSettingsViewModelTests: XCTestCase {
+    private var viewModel: NotificationSettingsViewModel!
+    private var notificationService: MockNotificationSettingsService!
+
+    override func setUpWithError() throws {
+        notificationService = .init()
+    }
+
+    func testAllTheRulesAreChecked() throws {
+        viewModel = .init(notificationSettingsService: notificationService, ruleIds: .default)
+        
+        XCTAssertEqual(viewModel.viewState.selectionState.count, 4)
+        XCTAssertTrue(viewModel.viewState.selectionState.values.allSatisfy { $0 })
+    }
+    
+    func testUpdateRule() throws {
+        viewModel = .init(notificationSettingsService: notificationService, ruleIds: .default)
+        notificationService.rules = [MockNotificationPushRule].default
+        
+        viewModel.update(ruleID: .encrypted, isChecked: false)
+        XCTAssertEqual(viewModel.viewState.selectionState.count, 4)
+        XCTAssertEqual(viewModel.viewState.selectionState[.encrypted], false)
+    }
+    
+    func testUpdateOneToOneRuleAlsoUpdatesPollRules() {
+        let expectation = expectation(description: #function)
+        setupWithPollRules()
+        
+        viewModel.update(ruleID: .oneToOneRoom, isChecked: false)
+        
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+            XCTAssertEqual(self.viewModel.viewState.selectionState.count, 8)
+            XCTAssertEqual(self.viewModel.viewState.selectionState[.oneToOneRoom], false)
+            XCTAssertEqual(self.viewModel.viewState.selectionState[.oneToOnePollStart], false)
+            XCTAssertEqual(self.viewModel.viewState.selectionState[.oneToOnePollEnd], false)
+            
+            // unrelated poll rules stay the same
+            XCTAssertEqual(self.viewModel.viewState.selectionState[.allOtherMessages], true)
+            XCTAssertEqual(self.viewModel.viewState.selectionState[.pollStart], true)
+            XCTAssertEqual(self.viewModel.viewState.selectionState[.pollEnd], true)
+            
+            expectation.fulfill()
+        }
+        
+        waitForExpectations(timeout: 1.0)
+    }
+    
+    func testUpdateMessageRuleAlsoUpdatesPollRules() {
+        let expectation = expectation(description: #function)
+        setupWithPollRules()
+        
+        viewModel.update(ruleID: .allOtherMessages, isChecked: false)
+        
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+            XCTAssertEqual(self.viewModel.viewState.selectionState.count, 8)
+            XCTAssertEqual(self.viewModel.viewState.selectionState[.allOtherMessages], false)
+            XCTAssertEqual(self.viewModel.viewState.selectionState[.pollStart], false)
+            XCTAssertEqual(self.viewModel.viewState.selectionState[.pollEnd], false)
+            
+            // unrelated poll rules stay the same
+            XCTAssertEqual(self.viewModel.viewState.selectionState[.oneToOneRoom], true)
+            XCTAssertEqual(self.viewModel.viewState.selectionState[.oneToOnePollStart], true)
+            XCTAssertEqual(self.viewModel.viewState.selectionState[.oneToOnePollEnd], true)
+            
+            expectation.fulfill()
+        }
+        
+        waitForExpectations(timeout: 1.0)
+    }
+    
+    func testMismatchingRulesAreHandled() {
+        let expectation = expectation(description: #function)
+        setupWithPollRules()
+        
+        viewModel.update(ruleID: .allOtherMessages, isChecked: false)
+        
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+            // simulating a "mismatch" on the poll started rule
+            self.viewModel.update(ruleID: .pollStart, isChecked: true)
+            
+            XCTAssertEqual(self.viewModel.viewState.selectionState.count, 8)
+            
+            // The other messages rule ui flag should match the loudest related poll rule
+            XCTAssertEqual(self.viewModel.viewState.selectionState[.allOtherMessages], true)
+            
+            expectation.fulfill()
+        }
+        
+        waitForExpectations(timeout: 1.0)
+    }
+    
+    func testMismatchingOneToOneRulesAreHandled() {
+        let expectation = expectation(description: #function)
+        setupWithPollRules()
+        
+        viewModel.update(ruleID: .oneToOneRoom, isChecked: false)
+        
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+            // simulating a "mismatch" on the one to one poll started rule
+            self.viewModel.update(ruleID: .oneToOnePollStart, isChecked: true)
+            
+            XCTAssertEqual(self.viewModel.viewState.selectionState.count, 8)
+            
+            // The one to one room rule ui flag should match the loudest related poll rule
+            XCTAssertEqual(self.viewModel.viewState.selectionState[.oneToOneRoom], true)
+            
+            expectation.fulfill()
+        }
+        
+        waitForExpectations(timeout: 1.0)
+    }
+}
+
+private extension NotificationSettingsViewModelTests {
+    func setupWithPollRules() {
+        viewModel = .init(notificationSettingsService: notificationService, ruleIds: .default + .polls)
+        notificationService.rules = [MockNotificationPushRule].default + [MockNotificationPushRule].polls
+    }
+}
+
+private extension Array where Element == NotificationPushRuleId {
+    static var `default`: [NotificationPushRuleId] {
+        [.oneToOneRoom, .allOtherMessages, .oneToOneEncryptedRoom, .encrypted]
+    }
+    
+    static var polls: [NotificationPushRuleId] {
+        [.pollStart, .pollEnd, .oneToOnePollStart, .oneToOnePollEnd]
+    }
+}
+
+private extension Array where Element == MockNotificationPushRule {
+    static var `default`: [MockNotificationPushRule] {
+        [NotificationPushRuleId]
+            .default
+            .map { ruleId in
+                MockNotificationPushRule(ruleId: ruleId.rawValue, enabled: true)
+            }
+    }
+    
+    static var polls: [MockNotificationPushRule] {
+        [NotificationPushRuleId]
+            .polls
+            .map { ruleId in
+                MockNotificationPushRule(ruleId: ruleId.rawValue, enabled: true)
+            }
+    }
+}

RiotSwiftUI/Modules/Settings/Notifications/ViewModel/NotificationSettingsViewModel.swift

@@ -172,7 +172,7 @@ private extension NotificationSettingsViewModel {
                           enabled: Bool,
                           standardActions: NotificationStandardActions,
                           then rules: [NotificationPushRuleId]) {
-        
+
         viewState.saving = true
         
         Task {
@@ -189,8 +189,7 @@ private extension NotificationSettingsViewModel {
                     try await group.waitForAll()
                     await completeUpdate(error: nil)
                 }
-            }
-            catch {
+            } catch {
                 await completeUpdate(error: error)
             }
         }