Skip to content

armgit / peel

Public Imported from GitHub
0

Uninstall Mac apps with every file they leave behind, and see why each belongs. Free up space, fine-tune macOS, and set up Terminal.

Keep the app's own tests from leaving preference files behind

Țugui Dragoș71b1b551c14a
diff --git a/PeelTests/AppLibraryTests.swift b/PeelTests/AppLibraryTests.swift
index 556ac908..0f9f3ea6 100644
--- a/PeelTests/AppLibraryTests.swift
+++ b/PeelTests/AppLibraryTests.swift
@@ -37,9 +37,9 @@ struct AppLibraryTests {
try PropertyListSerialization.data(fromPropertyList: info, format: .xml, options: 0)
.write(to: bundle.appending(path: "Contents/Info.plist"))
defer { try? FileManager.default.removeItem(at: folder) }
- let suite = "org.example.peel-tests.\(UUID().uuidString)"
- let defaults = try #require(UserDefaults(suiteName: suite))
- defer { defaults.removePersistentDomain(forName: suite) }
+ let made = try MadeUpDefaults()
+ defer { made.forget() }
+ let defaults = made.defaults
let configuration = URLSessionConfiguration.ephemeral
configuration.protocolClasses = [AppcastProtocol.self]
AppcastProtocol.body.withLock {
diff --git a/PeelTests/MadeUpDefaults.swift b/PeelTests/MadeUpDefaults.swift
new file mode 100644
index 00000000..745fab99
--- /dev/null
+++ b/PeelTests/MadeUpDefaults.swift
@@ -0,0 +1,24 @@
+import Foundation
+import Testing
+
+/// A preference domain of a test's own, kept in a folder of its own: a suite named by a path lives at that path,
+/// so cfprefsd writes nothing for it in the real Preferences folder, and forgetting it removes the folder. A domain
+/// named like an app's would get a file there, which cfprefsd writes again on its own time once the test has let
+/// the domain go.
+struct MadeUpDefaults {
+ private let folder: URL
+ let defaults: UserDefaults
+
+ init() throws {
+ folder = FileManager.default.temporaryDirectory.appending(
+ path: "MadeUpDefaults-\(UUID().uuidString)", directoryHint: .isDirectory
+ )
+ try FileManager.default.createDirectory(at: folder, withIntermediateDirectories: true)
+ let name = folder.appending(path: "org.example.peel-tests.plist").path(percentEncoded: false)
+ defaults = try #require(UserDefaults(suiteName: name))
+ }
+
+ func forget() {
+ try? FileManager.default.removeItem(at: folder)
+ }
+}
diff --git a/PeelTests/TerminalLibrariesTests.swift b/PeelTests/TerminalLibrariesTests.swift
index c9a6a0f5..a9e41fcb 100644
--- a/PeelTests/TerminalLibrariesTests.swift
+++ b/PeelTests/TerminalLibrariesTests.swift
@@ -99,9 +99,9 @@ struct TerminalLibrariesTests {
@Test func theTerminalTabKnowsFromTheStartWhenTerminalsProfilesCannotBeRead() throws {
let home = try madeUpHome()
defer { try? FileManager.default.removeItem(at: home) }
- let suite = "org.example.peel-tests.\(UUID().uuidString)"
- let defaults = try #require(UserDefaults(suiteName: suite))
- defer { defaults.removePersistentDomain(forName: suite) }
+ let made = try MadeUpDefaults()
+ defer { made.forget() }
+ let defaults = made.defaults
let terminal = FakeTerminalSettings()
let theme = TerminalThemeCatalog.all[0]
terminal.names = [.newWindows: theme.profileName, .startup: theme.profileName]
@@ -123,9 +123,9 @@ struct TerminalLibrariesTests {
@Test func aRefusalIsForgottenWhenThePageGoes() throws {
let home = try madeUpHome()
defer { try? FileManager.default.removeItem(at: home) }
- let suite = "org.example.peel-tests.\(UUID().uuidString)"
- let defaults = try #require(UserDefaults(suiteName: suite))
- defer { defaults.removePersistentDomain(forName: suite) }
+ let made = try MadeUpDefaults()
+ defer { made.forget() }
+ let defaults = made.defaults
let terminal = FakeTerminalSettings()
let library = TerminalLibrary(settings: terminal, defaults: defaults, home: home)
terminal.storedProfiles = nil
@@ -149,9 +149,9 @@ struct TerminalLibrariesTests {
@Test func aGitChangeSavesTheLedgerInTheStoreItWasGiven() async throws {
let home = try madeUpHome()
defer { try? FileManager.default.removeItem(at: home) }
- let suite = "org.example.peel-tests.\(UUID().uuidString)"
- let defaults = try #require(UserDefaults(suiteName: suite))
- defer { defaults.removePersistentDomain(forName: suite) }
+ let made = try MadeUpDefaults()
+ defer { made.forget() }
+ let defaults = made.defaults
let library = GitLibrary(home: home, defaults: defaults)
await library.refresh()
let state = try #require(library.state)
diff --git a/PeelTests/TweakLibraryTests.swift b/PeelTests/TweakLibraryTests.swift
index 2f2a36f2..6e1e8f35 100644
--- a/PeelTests/TweakLibraryTests.swift
+++ b/PeelTests/TweakLibraryTests.swift
@@ -61,20 +61,19 @@ struct TweakLibraryTests {
private func makeLibrary(
store: FakeTweakStore, restarts: Restarts = Restarts()
- ) throws -> (TweakLibrary, UserDefaults, String) {
- let suite = "org.example.peel-tests.\(UUID().uuidString)"
- let defaults = try #require(UserDefaults(suiteName: suite))
- let library = TweakLibrary(store: store, defaults: defaults) { needed in
+ ) throws -> (TweakLibrary, MadeUpDefaults) {
+ let made = try MadeUpDefaults()
+ let library = TweakLibrary(store: store, defaults: made.defaults) { needed in
await MainActor.run { restarts.asked.append(needed) }
}
- return (library, defaults, suite)
+ return (library, made)
}
@Test func turnAllOffPutsBackOnlyWhatPeelChangedAndRestartsEachProcessOnce() async throws {
let store = FakeTweakStore()
let restarts = Restarts()
- let (library, defaults, suite) = try makeLibrary(store: store, restarts: restarts)
- defer { defaults.removePersistentDomain(forName: suite) }
+ let (library, made) = try makeLibrary(store: store, restarts: restarts)
+ defer { made.forget() }
let docks = TweakCatalog.all.filter { $0.restart == .dock }
let (byPeel, alsoByPeel, byHand) = (docks[0], docks[1], docks[2])
#expect(store.turnOn(byHand, text: nil))
@@ -93,8 +92,8 @@ struct TweakLibraryTests {
@Test func putBackHandsTheScreenshotFolderToMacOSWhenTheFolderFromBeforeIsGone() async throws {
let store = FakeTweakStore()
- let (library, defaults, suite) = try makeLibrary(store: store)
- defer { defaults.removePersistentDomain(forName: suite) }
+ let (library, made) = try makeLibrary(store: store)
+ defer { made.forget() }
let folder = try #require(TweakCatalog.all.first { $0.kind == .folder })
let gone = FileManager.default.temporaryDirectory.appending(path: "TweakLibraryTests-\(UUID().uuidString)")
store.values[folder.id] = gone.path(percentEncoded: false)
@@ -111,8 +110,8 @@ struct TweakLibraryTests {
@Test func putBackReturnsAScreenshotFolderThatIsStillThere() async throws {
let store = FakeTweakStore()
- let (library, defaults, suite) = try makeLibrary(store: store)
- defer { defaults.removePersistentDomain(forName: suite) }
+ let (library, made) = try makeLibrary(store: store)
+ defer { made.forget() }
let folder = try #require(TweakCatalog.all.first { $0.kind == .folder })
let before = FileManager.default.temporaryDirectory.appending(
path: "TweakLibraryTests-\(UUID().uuidString)", directoryHint: .isDirectory
@@ -130,8 +129,8 @@ struct TweakLibraryTests {
@Test func twoRefusedSwitchesBothSaySo() async throws {
let store = FakeTweakStore()
- let (library, defaults, suite) = try makeLibrary(store: store)
- defer { defaults.removePersistentDomain(forName: suite) }
+ let (library, made) = try makeLibrary(store: store)
+ defer { made.forget() }
let first = try #require(Self.quiet.first { $0.kind != .folder && $0.kind != .name })
let second = try #require(Self.quiet.last { $0.kind != .folder && $0.kind != .name })
store.refuses = [first.id, second.id]
@@ -144,8 +143,8 @@ struct TweakLibraryTests {
@Test func aRefusalStaysWhileAnotherSwitchSucceeds() async throws {
let store = FakeTweakStore()
- let (library, defaults, suite) = try makeLibrary(store: store)
- defer { defaults.removePersistentDomain(forName: suite) }
+ let (library, made) = try makeLibrary(store: store)
+ defer { made.forget() }
let first = try #require(Self.quiet.first { $0.kind != .folder && $0.kind != .name })
let second = try #require(Self.quiet.last { $0.kind != .folder && $0.kind != .name })
store.refuses = [first.id]