dgf1988/codewhale
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

test(theme): include solarized in validation coverage

Browse Source
This commit is contained in:
Hunter Bown
2026-05-27 07:09:22 -05:00
parent 827466397d
commit e7b79c3313
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/tui/src/settings.rs
+14 -9
View File
@@ -156,7 +156,7 @@ impl TuiPrefs {
let theme = self.theme.trim().to_ascii_lowercase();
let Some(theme) = normalize_theme_name(&theme) else {
anyhow::bail!(
"Invalid tui.toml theme '{}': expected system, dark, light, grayscale, catppuccin-mocha, tokyo-night, dracula, or gruvbox-dark.",
"Invalid tui.toml theme '{}': expected system, dark, light, grayscale, catppuccin-mocha, tokyo-night, dracula, gruvbox-dark, or solarized-light.",
self.theme
);
};
@@ -520,7 +520,7 @@ impl Settings {
"theme" => {
let Some(id) = crate::palette::ThemeId::from_name(value) else {
anyhow::bail!(
"Failed to update setting: invalid theme '{value}'. Expected: system, dark, light, grayscale, catppuccin-mocha, tokyo-night, dracula, gruvbox-dark."
"Failed to update setting: invalid theme '{value}'. Expected: system, dark, light, grayscale, catppuccin-mocha, tokyo-night, dracula, gruvbox-dark, solarized-light."
);
};
self.theme = id.name().to_string();
@@ -528,7 +528,7 @@ impl Settings {
"ui_theme" => {
let Some(id) = crate::palette::ThemeId::from_name(value) else {
anyhow::bail!(
"Failed to update setting: invalid theme '{value}'. Expected: system, dark, light, grayscale, catppuccin-mocha, tokyo-night, dracula, gruvbox-dark."
"Failed to update setting: invalid theme '{value}'. Expected: system, dark, light, grayscale, catppuccin-mocha, tokyo-night, dracula, gruvbox-dark, solarized-light."
);
};
self.theme = id.name().to_string();
@@ -780,7 +780,7 @@ impl Settings {
),
(
"theme",
"UI theme: system, dark, light, grayscale, catppuccin-mocha, tokyo-night, dracula, gruvbox-dark",
"UI theme: system, dark, light, grayscale, catppuccin-mocha, tokyo-night, dracula, gruvbox-dark, solarized-light",
),
(
"background_color",
@@ -1153,8 +1153,13 @@ mod tests {
.expect("set community theme alias");
assert_eq!(settings.theme, "tokyo-night");
let err = settings
settings
.set("theme", "solarized")
.expect("set solarized alias");
assert_eq!(settings.theme, "solarized-light");
let err = settings
.set("theme", "nord")
.expect_err("unknown theme should fail");
assert!(err.to_string().contains("invalid theme"));
}
@@ -2052,6 +2057,7 @@ mod tests {
"tokyo-night",
"dracula",
"gruvbox-dark",
"solarized-light",
] {
let mut prefs = TuiPrefs {
theme: theme.to_string(),
@@ -2079,17 +2085,16 @@ mod tests {
#[test]
fn tui_prefs_validate_rejects_unknown_theme() {
let mut prefs = TuiPrefs {
theme: "solarized".to_string(),
theme: "nord".to_string(),
..TuiPrefs::default()
};
let err = prefs
.validate()
.expect_err("solarized is not a valid theme");
let err = prefs.validate().expect_err("nord is not a valid theme");
assert!(err.to_string().contains("Invalid tui.toml theme"));
assert!(
err.to_string()
.contains("expected system, dark, light, grayscale")
);
assert!(err.to_string().contains("solarized-light"));
}
#[test]
crates/tui/src/tui/theme_picker.rs
+2 -1
View File
@@ -325,7 +325,8 @@ mod tests {
let mut v = ThemePickerView::new("system".to_string());
let action = v.handle_key(key(KeyCode::Up));
assert_eq!(selected_name(&action), Some(ThemeId::GruvboxDark.name()));
let last_theme = SELECTABLE_THEMES.last().expect("theme picker has rows");
assert_eq!(selected_name(&action), Some(last_theme.name()));
let action = v.handle_key(key(KeyCode::Down));
assert_eq!(selected_name(&action), Some(ThemeId::System.name()));