extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 09:25:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Primitives now use color closures..." (#7710)

Browse Source 
This temporarily reverts commit c5639cd9fa
(PR https://github.com/nushell/nushell/pull/7650). See
[here](https://github.com/nushell/nushell/pull/7650#issuecomment-1375036213)
for details; the PR is accidentally adding ANSI escape codes to strings
piped to externals.

I think we should revert the PR because we're only 1-2 days away from a
release; reverting it will give us more time to land+test a proper fix
in the next release cycle.
This commit is contained in:
Reilly Wood
2023-01-08 21:53:52 -08:00
committed by GitHub
parent cef05d3553
commit 80463d12fb
10 changed files with 27 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/tests.rs
View File

@ -32,17 +32,7 @@ pub fn run_test_with_env(input: &str, expected: &str, env: &HashMap<&str, &str>)
let name = file.path();
let mut cmd = Command::cargo_bin("nu")?;
// Use this minimal config in most tests.
// Notably, this disables color_config to allow string output to be more easily compared.
cmd.arg("--config")
.arg(
nu_test_support::fs::fixtures()
.join("playground/config/minimal.nu")
.display()
.to_string(),
)
.arg(name)
.envs(env);
cmd.arg(name).envs(env);
writeln!(file, "{}", input)?;
@ -55,16 +45,7 @@ pub fn run_test(input: &str, expected: &str) -> TestResult {
let name = file.path();
let mut cmd = Command::cargo_bin("nu")?;
// Use this minimal config in most tests.
// Notably, this disables color_config to allow string output to be more easily compared.
cmd.arg("--config")
.arg(
nu_test_support::fs::fixtures()
.join("playground/config/minimal.nu")
.display()
.to_string(),
)
.arg(name);
cmd.arg(name);
cmd.env(
"PWD",
std::env::current_dir().expect("Can't get current dir"),

23
src/tests/test_config_path.rs
View File

@ -6,18 +6,12 @@ fn test_default_config_path() {
let cwd = std::env::current_dir().expect("Could not get current working directory");
let config_path = config_dir.join("nushell").join("config.nu");
let actual = nu!(cwd: &cwd, minimal_config: false, "$nu.config-path");
assert_eq!(
nu_utils::strip_ansi_string_likely(actual.out),
config_path.to_string_lossy().to_string()
);
let actual = nu!(cwd: &cwd, "$nu.config-path");
assert_eq!(actual.out, config_path.to_string_lossy().to_string());
let env_path = config_dir.join("nushell").join("env.nu");
let actual = nu!(cwd: &cwd, "$nu.env-path");
assert_eq!(
nu_utils::strip_ansi_string_likely(actual.out),
env_path.to_string_lossy().to_string()
);
assert_eq!(actual.out, env_path.to_string_lossy().to_string());
}
#[test]
@ -31,21 +25,14 @@ fn test_alternate_config_path() {
nu_path::canonicalize_with(config_file, &cwd).expect("Could not get config path");
let actual = nu!(
cwd: &cwd,
minimal_config: false,
format!("nu --config {:?} -c '$nu.config-path'", config_path)
);
assert_eq!(
nu_utils::strip_ansi_string_likely(actual.out),
config_path.to_string_lossy().to_string()
);
assert_eq!(actual.out, config_path.to_string_lossy().to_string());
let env_path = nu_path::canonicalize_with(env_file, &cwd).expect("Could not get env path");
let actual = nu!(
cwd: &cwd,
format!("nu --env-config {:?} -c '$nu.env-path'", env_path)
);
assert_eq!(
nu_utils::strip_ansi_string_likely(actual.out),
env_path.to_string_lossy().to_string()
);
assert_eq!(actual.out, env_path.to_string_lossy().to_string());
}