Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion TablePro/Views/Settings/SettingsWindowController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@ internal final class SettingsWindowController: NSWindowController {
contentViewController as? SettingsPaneTabViewController
}

internal convenience init(registryClient: RegistryClient = .shared) {
// A defaulted parameter would let `SettingsWindowController()` resolve to the inherited `init()`, which builds no window.
internal convenience init() {
self.init(registryClient: .shared)
}

internal convenience init(registryClient: RegistryClient) {
let panes = SettingsPaneTabViewController(registryClient: registryClient)

/// `NSWindow(contentViewController:)` binds the window title to the content view
Expand Down
12 changes: 12 additions & 0 deletions TableProTests/Views/Settings/SettingsWindowTitleTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,16 @@ final class SettingsWindowTitleTests: XCTestCase {

XCTAssertEqual(window.contentMinSize, SettingsPaneTabViewController.paneSize)
}

func testTheInitializerPresentUsesBuildsTheSettingsWindow() {
AppStorageEnvironment.shared.defaults.set(
SettingsPane.general.rawValue,
forKey: PreferenceKeys.selectedSettingsPane.name
)
let controller = SettingsWindowController()
guard let window = controller.window else { return XCTFail("Cmd-comma and settings links present this controller") }
windows.append(window)

XCTAssertEqual(window.identifier?.rawValue, WindowIdentifier.settings)
}
}
Loading