mirror of
https://github.com/nushell/nushell
synced 2024-12-30 15:03:25 +00:00
cb18dd5200
* Add decimals to int when using `into string --decimals` * Add tests for `into string` when converting int with `--decimals` * Apply formatting * Merge `into_str` test files * Comment out unused code and add TODOs * Use decimal separator depending on system locale * Add test helper to run closure in different locale * Add tests for int-to-string conversion using different locales * Add utils function to get system locale * Add panic message when locking mutex fails * Catch and resume panic later to prevent Mutex poisoning when test fails * Move test to `nu-test-support` to keep `nu-utils` free of `nu-*` dependencies See https://github.com/nushell/nushell/pull/6085#issuecomment-1193131694 * Rename test support fn `with_fake_locale` to `with_locale_override` * Move `get_system_locale()` to `locale` module * Allow overriding locale with special env variable (when not in release) * Use special env var to override locale during testing * Allow callback to return a value in `with_locale_override()` * Allow multiple options in `nu!` macro * Allow to set locale as `nu!` macro option * Use new `locale` option of `nu!` macro instead of `with_locale_override` Using the `locale` options does not lock the `LOCALE_OVERRIDE_MUTEX` mutex in `nu-test-support::locale_override` but instead calls the `nu` command directly with the `NU_LOCALE_OVERRIDE` environment variable. This allows for parallel test excecution. * Fix: Add option identifier for `cwd` in usage of `nu!` macro * Rely on `Display` trait for formatting `nu!` macro command - Removed the `DisplayPath` trait - Implement `Display` for `AbsolutePath`, `RelativePath` and `AbsoluteFile` * Default to locale `en_US.UTF-8` for tests when using `nu!` macro * Add doc comment to `nu!` macro * Format code using `cargo fmt --all` * Pass function directly instead of wrapping the call in a closure https://rust-lang.github.io/rust-clippy/master/index.html#redundant_closure * Pass function to `or_else()` instead of calling it inside `or()` https://rust-lang.github.io/rust-clippy/master/index.html#or_fun_call * Fix: Add option identifier for `cwd` in usage of `nu!` macro
145 lines
4.4 KiB
Rust
145 lines
4.4 KiB
Rust
use nu_test_support::fs::{AbsolutePath, Stub::FileWithContent};
|
|
use nu_test_support::nu;
|
|
use nu_test_support::pipeline;
|
|
use nu_test_support::playground::Playground;
|
|
|
|
#[should_panic]
|
|
#[test]
|
|
fn sources_also_files_under_custom_lib_dirs_path() {
|
|
Playground::setup("source_test_1", |dirs, nu| {
|
|
let file = AbsolutePath::new(dirs.test().join("config.toml"));
|
|
let library_path = AbsolutePath::new(dirs.test().join("lib"));
|
|
|
|
nu.with_config(&file);
|
|
nu.with_files(vec![FileWithContent(
|
|
"config.toml",
|
|
&format!(
|
|
r#"
|
|
lib_dirs = ["{}"]
|
|
skip_welcome_message = true
|
|
"#,
|
|
library_path
|
|
),
|
|
)]);
|
|
|
|
nu.within("lib").with_files(vec![FileWithContent(
|
|
"my_library.nu",
|
|
r#"
|
|
source my_library/main.nu
|
|
"#,
|
|
)]);
|
|
nu.within("lib/my_library").with_files(vec![FileWithContent(
|
|
"main.nu",
|
|
r#"
|
|
def hello [] {
|
|
echo "hello nu"
|
|
}
|
|
"#,
|
|
)]);
|
|
|
|
let actual = nu!(
|
|
cwd: ".", pipeline(
|
|
r#"
|
|
source my_library.nu ;
|
|
|
|
hello
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "hello nu");
|
|
})
|
|
}
|
|
|
|
fn try_source_foo_with_double_quotes_in(testdir: &str, playdir: &str) {
|
|
Playground::setup(playdir, |dirs, sandbox| {
|
|
let testdir = String::from(testdir);
|
|
let mut foo_file = testdir.clone();
|
|
foo_file.push_str("/foo.nu");
|
|
|
|
sandbox.mkdir(&testdir);
|
|
sandbox.with_files(vec![FileWithContent(&foo_file, "echo foo")]);
|
|
|
|
let cmd = String::from("source ") + r#"""# + foo_file.as_str() + r#"""#;
|
|
|
|
let actual = nu!(cwd: dirs.test(), &cmd);
|
|
|
|
assert_eq!(actual.out, "foo");
|
|
});
|
|
}
|
|
|
|
fn try_source_foo_with_single_quotes_in(testdir: &str, playdir: &str) {
|
|
Playground::setup(playdir, |dirs, sandbox| {
|
|
let testdir = String::from(testdir);
|
|
let mut foo_file = testdir.clone();
|
|
foo_file.push_str("/foo.nu");
|
|
|
|
sandbox.mkdir(&testdir);
|
|
sandbox.with_files(vec![FileWithContent(&foo_file, "echo foo")]);
|
|
|
|
let cmd = String::from("source ") + r#"'"# + foo_file.as_str() + r#"'"#;
|
|
|
|
let actual = nu!(cwd: dirs.test(), &cmd);
|
|
|
|
assert_eq!(actual.out, "foo");
|
|
});
|
|
}
|
|
|
|
fn try_source_foo_without_quotes_in(testdir: &str, playdir: &str) {
|
|
Playground::setup(playdir, |dirs, sandbox| {
|
|
let testdir = String::from(testdir);
|
|
let mut foo_file = testdir.clone();
|
|
foo_file.push_str("/foo.nu");
|
|
|
|
sandbox.mkdir(&testdir);
|
|
sandbox.with_files(vec![FileWithContent(&foo_file, "echo foo")]);
|
|
|
|
let cmd = String::from("source ") + foo_file.as_str();
|
|
|
|
let actual = nu!(cwd: dirs.test(), &cmd);
|
|
|
|
assert_eq!(actual.out, "foo");
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn sources_unicode_file_in_normal_dir() {
|
|
try_source_foo_with_single_quotes_in("foo", "source_test_1");
|
|
try_source_foo_with_double_quotes_in("foo", "source_test_2");
|
|
try_source_foo_without_quotes_in("foo", "source_test_3");
|
|
}
|
|
|
|
#[test]
|
|
fn sources_unicode_file_in_unicode_dir_without_spaces_1() {
|
|
try_source_foo_with_single_quotes_in("🚒", "source_test_4");
|
|
try_source_foo_with_double_quotes_in("🚒", "source_test_5");
|
|
try_source_foo_without_quotes_in("🚒", "source_test_6");
|
|
}
|
|
|
|
#[cfg(not(windows))] // ':' is not allowed in Windows paths
|
|
#[test]
|
|
fn sources_unicode_file_in_unicode_dir_without_spaces_2() {
|
|
try_source_foo_with_single_quotes_in(":fire_engine:", "source_test_7");
|
|
try_source_foo_with_double_quotes_in(":fire_engine:", "source_test_8");
|
|
try_source_foo_without_quotes_in(":fire_engine:", "source_test_9");
|
|
}
|
|
|
|
#[test]
|
|
fn sources_unicode_file_in_unicode_dir_with_spaces_1() {
|
|
// this one fails
|
|
try_source_foo_with_single_quotes_in("e-$ èрт🚒♞中片-j", "source_test_8");
|
|
// this one passes
|
|
try_source_foo_with_double_quotes_in("e-$ èрт🚒♞中片-j", "source_test_9");
|
|
}
|
|
|
|
#[cfg(not(windows))] // ':' is not allowed in Windows paths
|
|
#[test]
|
|
fn sources_unicode_file_in_unicode_dir_with_spaces_2() {
|
|
try_source_foo_with_single_quotes_in("e-$ èрт:fire_engine:♞中片-j", "source_test_10");
|
|
try_source_foo_with_double_quotes_in("e-$ èрт:fire_engine:♞中片-j", "source_test_11");
|
|
}
|
|
|
|
#[ignore]
|
|
#[test]
|
|
fn sources_unicode_file_in_non_utf8_dir() {
|
|
// How do I create non-UTF-8 path???
|
|
}
|