Try fixing keychain prompt during tests

crazytan · crazytan · commit f6dc847bdb64 · 2026-03-09T22:22:30.000-07:00
diff --git a/TaskMenu.xcodeproj/project.pbxproj b/TaskMenu.xcodeproj/project.pbxproj
@@ -23,6 +23,7 @@
 		986954B711E286DA6CDC3353 /* GoogleAuthServiceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C5360741190B5DF2436BE448 /* GoogleAuthServiceTests.swift */; };
 		9ADC495EEB87994A08F73AB8 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12212B7B62ECCDD28979CA54 /* Constants.swift */; };
 		9BE1233CADF8C3BFFC734F1D /* ListPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7A7998A82BE9D4729E85B13 /* ListPickerView.swift */; };
+		B0420689B1657699950213A7 /* InMemoryKeychainService.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFE9F6BF8DFE197A82CE6A11 /* InMemoryKeychainService.swift */; };
 		C169507407838BDD4C665CF1 /* KeychainService.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAFA7FEDB3F9559D6C71C2C4 /* KeychainService.swift */; };
 		C1AE79D6748EFE551C7E8F1B /* TaskMenuApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AF69FFA11009E78484C090A /* TaskMenuApp.swift */; };
 		C1D9C85DFAE57179E9A438A1 /* TaskRowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8F4164166B2474EB88443EC /* TaskRowView.swift */; };
@@ -71,6 +72,7 @@
 		A8F4164166B2474EB88443EC /* TaskRowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TaskRowView.swift; sourceTree = "<group>"; };
 		B01BFC3843C941C89C85576B /* QuickAddView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickAddView.swift; sourceTree = "<group>"; };
 		BB598B8D34C0A014D7826A63 /* MockURLProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockURLProtocol.swift; sourceTree = "<group>"; };
+		BFE9F6BF8DFE197A82CE6A11 /* InMemoryKeychainService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InMemoryKeychainService.swift; sourceTree = "<group>"; };
 		C3377E75BA19027E464EAEB8 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		C5360741190B5DF2436BE448 /* GoogleAuthServiceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoogleAuthServiceTests.swift; sourceTree = "<group>"; };
 		C79B44669D075555352A0BB4 /* GoogleTasksAPITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoogleTasksAPITests.swift; sourceTree = "<group>"; };
@@ -176,6 +178,7 @@
 				C5360741190B5DF2436BE448 /* GoogleAuthServiceTests.swift */,
 				8FE1F31A1E2F87FD9042F1B4 /* GoogleTasksAPIBehaviorTests.swift */,
 				C79B44669D075555352A0BB4 /* GoogleTasksAPITests.swift */,
+				BFE9F6BF8DFE197A82CE6A11 /* InMemoryKeychainService.swift */,
 				058C00FB539FD9B1D05BCBFD /* KeychainServiceTests.swift */,
 				BB598B8D34C0A014D7826A63 /* MockURLProtocol.swift */,
 				6E4CD6808B2587AD2F8F9563 /* TaskItemModelTests.swift */,
@@ -317,6 +320,7 @@
 				986954B711E286DA6CDC3353 /* GoogleAuthServiceTests.swift in Sources */,
 				068F90845303418F7954D22E /* GoogleTasksAPIBehaviorTests.swift in Sources */,
 				69765D5311C642C2DFADB0A0 /* GoogleTasksAPITests.swift in Sources */,
+				B0420689B1657699950213A7 /* InMemoryKeychainService.swift in Sources */,
 				3059000A80728B12B6989398 /* KeychainServiceTests.swift in Sources */,
 				D321CE95DA3DC0D6090CD619 /* MockURLProtocol.swift in Sources */,
 				0FD718B29CF8183561A6F550 /* TaskItemModelTests.swift in Sources */,
diff --git a/TaskMenu/Services/GoogleAuthService.swift b/TaskMenu/Services/GoogleAuthService.swift
@@ -4,7 +4,7 @@ import Foundation
 
 @MainActor
 final class GoogleAuthService: Sendable {
-    private let keychain: KeychainService
+    private let keychain: any KeychainServiceProtocol
     private let session: URLSession
 
     private(set) var accessToken: String?
@@ -20,7 +20,7 @@ final class GoogleAuthService: Sendable {
         return Date() >= expiration
     }
 
-    init(keychain: KeychainService = KeychainService(), session: URLSession = .shared) {
+    init(keychain: any KeychainServiceProtocol = KeychainService(), session: URLSession = .shared) {
         self.keychain = keychain
         self.session = session
         loadTokens()
diff --git a/TaskMenu/Services/KeychainService.swift b/TaskMenu/Services/KeychainService.swift
@@ -8,7 +8,16 @@ enum KeychainError: Error, Sendable {
     case unexpectedData
 }
 
-struct KeychainService: Sendable {
+protocol KeychainServiceProtocol: Sendable {
+    func save(key: String, data: Data) throws
+    func save(key: String, string: String) throws
+    func read(key: String) throws -> Data?
+    func readString(key: String) throws -> String?
+    func delete(key: String) throws
+    func deleteAll() throws
+}
+
+struct KeychainService: KeychainServiceProtocol, Sendable {
     let service: String
 
     init(service: String = Constants.Keychain.service) {
diff --git a/TaskMenuTests/AppStateBehaviorTests.swift b/TaskMenuTests/AppStateBehaviorTests.swift
@@ -6,13 +6,13 @@ import XCTest
 /// Uses MockURLProtocol.requestLog to inspect requests (avoids captured var issues with Swift 6 concurrency).
 @MainActor
 final class AppStateBehaviorTests: XCTestCase {
-    private var keychain: KeychainService!
+    private var keychain: InMemoryKeychainService!
     private var state: AppState!
 
     override func setUp() async throws {
         MockURLProtocol.reset()
 
-        keychain = KeychainService(service: "com.taskmenu.behavior.\(UUID().uuidString)")
+        keychain = InMemoryKeychainService()
         // Pre-load valid tokens so validAccessToken() returns immediately
         try? keychain.save(key: Constants.Keychain.accessTokenKey, string: "test-access-token")
         try? keychain.save(key: Constants.Keychain.refreshTokenKey, string: "test-refresh-token")
diff --git a/TaskMenuTests/AppStateTests.swift b/TaskMenuTests/AppStateTests.swift
@@ -3,10 +3,10 @@ import XCTest
 
 @MainActor
 final class AppStateTests: XCTestCase {
-    private var keychain: KeychainService!
+    private var keychain: InMemoryKeychainService!
 
     override func setUp() async throws {
-        keychain = KeychainService(service: "com.taskmenu.statetest.\(UUID().uuidString)")
+        keychain = InMemoryKeychainService()
     }
 
     override func tearDown() async throws {
diff --git a/TaskMenuTests/GoogleAuthServiceTests.swift b/TaskMenuTests/GoogleAuthServiceTests.swift
@@ -3,10 +3,10 @@ import XCTest
 
 @MainActor
 final class GoogleAuthServiceTests: XCTestCase {
-    private var keychain: KeychainService!
+    private var keychain: InMemoryKeychainService!
 
     override func setUp() async throws {
-        keychain = KeychainService(service: "com.taskmenu.authtest.\(UUID().uuidString)")
+        keychain = InMemoryKeychainService()
     }
 
     override func tearDown() async throws {
diff --git a/TaskMenuTests/GoogleTasksAPIBehaviorTests.swift b/TaskMenuTests/GoogleTasksAPIBehaviorTests.swift
@@ -6,13 +6,13 @@ import XCTest
 /// Uses MockURLProtocol.requestLog to inspect requests (avoids captured var issues with Swift 6 concurrency).
 @MainActor
 final class GoogleTasksAPIBehaviorTests: XCTestCase {
-    private var keychain: KeychainService!
+    private var keychain: InMemoryKeychainService!
     private var api: GoogleTasksAPI!
 
     override func setUp() async throws {
         MockURLProtocol.reset()
 
-        keychain = KeychainService(service: "com.taskmenu.apitest.\(UUID().uuidString)")
+        keychain = InMemoryKeychainService()
         // Pre-load valid tokens so validAccessToken() returns without refreshing
         try? keychain.save(key: Constants.Keychain.accessTokenKey, string: "test-token")
         try? keychain.save(key: Constants.Keychain.refreshTokenKey, string: "test-refresh")
diff --git a/TaskMenuTests/InMemoryKeychainService.swift b/TaskMenuTests/InMemoryKeychainService.swift
@@ -0,0 +1,35 @@
+@testable import TaskMenu
+import Foundation
+
+/// In-memory keychain replacement for tests — avoids macOS Keychain prompts.
+final class InMemoryKeychainService: KeychainServiceProtocol, @unchecked Sendable {
+    private var storage: [String: Data] = [:]
+
+    func save(key: String, data: Data) throws {
+        storage[key] = data
+    }
+
+    func save(key: String, string: String) throws {
+        guard let data = string.data(using: .utf8) else {
+            throw KeychainError.unexpectedData
+        }
+        storage[key] = data
+    }
+
+    func read(key: String) throws -> Data? {
+        storage[key]
+    }
+
+    func readString(key: String) throws -> String? {
+        guard let data = storage[key] else { return nil }
+        return String(data: data, encoding: .utf8)
+    }
+
+    func delete(key: String) throws {
+        storage.removeValue(forKey: key)
+    }
+
+    func deleteAll() throws {
+        storage.removeAll()
+    }
+}
diff --git a/TaskMenuTests/KeychainServiceTests.swift b/TaskMenuTests/KeychainServiceTests.swift
@@ -1,18 +1,14 @@
 import XCTest
 @testable import TaskMenu
 
+/// Tests KeychainServiceProtocol contract using InMemoryKeychainService.
+/// Avoids real macOS Keychain access (and password prompts) during tests.
 final class KeychainServiceTests: XCTestCase {
-    private var keychain: KeychainService!
+    private var keychain: InMemoryKeychainService!
 
     override func setUp() {
         super.setUp()
-        keychain = KeychainService(service: "com.taskmenu.test.\(UUID().uuidString)")
-    }
-
-    override func tearDown() {
-        try? keychain.delete(key: "token")
-        try? keychain.delete(key: "data")
-        super.tearDown()
+        keychain = InMemoryKeychainService()
     }
 
     func testSaveAndReadString() throws {
diff --git a/project.yml b/project.yml
@@ -50,5 +50,3 @@ targets:
         CODE_SIGN_IDENTITY: "47081BEFF0F575643E99369B44CBAC87BBCC85E6" # Apple Development: Jia Tan
         CODE_SIGN_STYLE: Manual
         DEVELOPMENT_TEAM: ZW5U6862Q8
-        TEST_HOST: "$(BUILT_PRODUCTS_DIR)/TaskMenu.app/Contents/MacOS/TaskMenu"
-        BUNDLE_LOADER: "$(TEST_HOST)"
