dandavison/delta
1
1
Fork 0
mirror of https://github.com/dandavison/delta.git synced 2024-10-04 20:07:18 +03:00
Code Issues Projects Releases Wiki Activity

Don't take syntax-theme from env var during tests

Browse Source 
Fixes #842
This commit is contained in:
Dan Davison 2021-12-14 00:07:44 -05:00
parent cec8542e5f
commit 799ad15d15
3 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli.rs
View File

@ -325,7 +325,7 @@ pub struct Opt {
/// options in ~/.gitconfig. See FEATURES section.
pub features: Option<String>,
#[structopt(long = "syntax-theme", env = "BAT_THEME")]
#[structopt(long = "syntax-theme")]
/// The code syntax-highlighting theme to use. Use --show-syntax-themes to demo available
/// themes. If the syntax-highlighting theme is not set using this option, it will be taken
/// from the BAT_THEME environment variable, if that contains a valid theme name.

3
src/options/set.rs
View File

@ -76,6 +76,9 @@ pub fn set_options(
set_git_config_entries(opt, git_config);
}
opt.navigate = opt.navigate || env::get_boolean_env_var("DELTA_NAVIGATE");
if opt.syntax_theme.is_none() {
opt.syntax_theme = env::get_env_var("BAT_THEME")
}
let option_names = cli::Opt::get_option_names();

32
src/options/theme.rs
View File

@ -119,12 +119,11 @@ fn valid_syntax_theme_name_or_none(
#[cfg(test)]
mod tests {
use std::env;
use super::*;
use crate::color;
use crate::tests::integration_test_utils;
// TODO: Test influence of BAT_THEME env var. E.g. see utils::process::tests::FakeParentArgs.
#[test]
fn test_syntax_theme_selection() {
#[derive(PartialEq)]
@ -134,52 +133,35 @@ mod tests {
}
for (
syntax_theme,
bat_theme_env_var,
mode, // (--light, --dark)
expected_syntax_theme,
expected_mode,
) in vec![
(None, "", None, DEFAULT_DARK_SYNTAX_THEME, Mode::Dark),
(Some("GitHub"), "", None, "GitHub", Mode::Light),
(Some("GitHub"), "1337", None, "GitHub", Mode::Light),
(None, "1337", None, "1337", Mode::Dark),
(None, None, DEFAULT_DARK_SYNTAX_THEME, Mode::Dark),
(Some("GitHub"), None, "GitHub", Mode::Light),
(Some("GitHub"), None, "GitHub", Mode::Light),
(
None,
"<not set>",
None,
DEFAULT_DARK_SYNTAX_THEME,
Mode::Dark,
),
(
None,
"",
Some(Mode::Light),
DEFAULT_LIGHT_SYNTAX_THEME,
Mode::Light,
),
(
None,
"",
Some(Mode::Dark),
DEFAULT_DARK_SYNTAX_THEME,
Mode::Dark,
),
(
None,
"<@@@@@>",
Some(Mode::Light),
DEFAULT_LIGHT_SYNTAX_THEME,
Mode::Light,
),
(None, "GitHub", Some(Mode::Light), "GitHub", Mode::Light),
(Some("none"), "", None, "none", Mode::Dark),
(Some("None"), "", Some(Mode::Light), "none", Mode::Light),
(None, Some(Mode::Light), "GitHub", Mode::Light),
(Some("none"), None, "none", Mode::Dark),
(Some("None"), Some(Mode::Light), "none", Mode::Light),
] {
if bat_theme_env_var == "<not set>" {
env::remove_var("BAT_THEME")
} else {
env::set_var("BAT_THEME", bat_theme_env_var);
}
let mut args = vec![];
if let Some(syntax_theme) = syntax_theme {
args.push("--syntax-theme");