forked from extern/nushell
46dba8853a
# Description This effectively reverts #8635. We shipped this change with 0.78 and received many comments/issues related to this restriction feeling like a step backward. fixes: #8844 (and probably other issues) # User-Facing Changes Returns numbers and number-like values to being allowed to be bare words. Examples: `3*`, `1fb43`, `4,5`, and related. # Tests + Formatting Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass - `cargo run -- crates/nu-std/tests/run.nu` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` # After Submitting If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date.
241 lines
5.7 KiB
Rust
241 lines
5.7 KiB
Rust
use nu_test_support::fs::Stub::FileWithContentToBeTrimmed;
|
|
use nu_test_support::playground::Playground;
|
|
use nu_test_support::{nu, pipeline};
|
|
use pretty_assertions::assert_eq;
|
|
|
|
#[test]
|
|
fn source_file_relative_to_file() {
|
|
let actual = nu!(cwd: "tests/parsing/samples", r#"
|
|
nu source_file_relative.nu
|
|
"#);
|
|
|
|
assert_eq!(actual.out, "5");
|
|
}
|
|
|
|
#[test]
|
|
fn source_const_file() {
|
|
let actual = nu!(cwd: "tests/parsing/samples",
|
|
r#"
|
|
const file = 'single_line.nu'
|
|
source $file
|
|
"#);
|
|
|
|
assert_eq!(actual.out, "5");
|
|
}
|
|
|
|
#[test]
|
|
fn run_nu_script_single_line() {
|
|
let actual = nu!(cwd: "tests/parsing/samples", r#"
|
|
nu single_line.nu
|
|
"#);
|
|
|
|
assert_eq!(actual.out, "5");
|
|
}
|
|
|
|
#[test]
|
|
fn run_nu_script_multiline_start_pipe() {
|
|
let actual = nu!(cwd: "tests/parsing/samples", r#"
|
|
nu multiline_start_pipe.nu
|
|
"#);
|
|
|
|
assert_eq!(actual.out, "4");
|
|
}
|
|
|
|
#[test]
|
|
fn run_nu_script_multiline_start_pipe_win() {
|
|
let actual = nu!(cwd: "tests/parsing/samples", r#"
|
|
nu multiline_start_pipe_win.nu
|
|
"#);
|
|
|
|
assert_eq!(actual.out, "3");
|
|
}
|
|
|
|
#[test]
|
|
fn run_nu_script_multiline_end_pipe() {
|
|
let actual = nu!(cwd: "tests/parsing/samples", r#"
|
|
nu multiline_end_pipe.nu
|
|
"#);
|
|
|
|
assert_eq!(actual.out, "2");
|
|
}
|
|
|
|
#[test]
|
|
fn run_nu_script_multiline_end_pipe_win() {
|
|
let actual = nu!(cwd: "tests/parsing/samples", r#"
|
|
nu multiline_end_pipe_win.nu
|
|
"#);
|
|
|
|
assert_eq!(actual.out, "3");
|
|
}
|
|
|
|
#[test]
|
|
fn parse_file_relative_to_parsed_file_simple() {
|
|
Playground::setup("relative_files_simple", |dirs, sandbox| {
|
|
sandbox
|
|
.mkdir("lol")
|
|
.mkdir("lol/lol")
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
"lol/lol/lol.nu",
|
|
r#"
|
|
use ../lol_shell.nu
|
|
|
|
let-env LOL = (lol_shell ls)
|
|
"#,
|
|
)])
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
"lol/lol_shell.nu",
|
|
r#"
|
|
export def ls [] { "lol" }
|
|
"#,
|
|
)]);
|
|
|
|
let actual = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
r#"
|
|
source-env lol/lol/lol.nu;
|
|
$env.LOL
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "lol");
|
|
})
|
|
}
|
|
|
|
#[ignore]
|
|
#[test]
|
|
fn parse_file_relative_to_parsed_file() {
|
|
Playground::setup("relative_files", |dirs, sandbox| {
|
|
sandbox
|
|
.mkdir("lol")
|
|
.mkdir("lol/lol")
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
"lol/lol/lol.nu",
|
|
r#"
|
|
source-env ../../foo.nu
|
|
use ../lol_shell.nu
|
|
overlay use ../../lol/lol_shell.nu
|
|
|
|
let-env LOL = $'($env.FOO) (lol_shell ls) (ls)'
|
|
"#,
|
|
)])
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
"lol/lol_shell.nu",
|
|
r#"
|
|
export def ls [] { "lol" }
|
|
"#,
|
|
)])
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
"foo.nu",
|
|
r#"
|
|
let-env FOO = 'foo'
|
|
"#,
|
|
)]);
|
|
|
|
let actual = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
r#"
|
|
source-env lol/lol/lol.nu;
|
|
$env.LOL
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "foo lol lol");
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn parse_file_relative_to_parsed_file_dont_use_cwd_1() {
|
|
Playground::setup("relative_files", |dirs, sandbox| {
|
|
sandbox
|
|
.mkdir("lol")
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
"lol/lol.nu",
|
|
r#"
|
|
source-env foo.nu
|
|
"#,
|
|
)])
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
"lol/foo.nu",
|
|
r#"
|
|
let-env FOO = 'good'
|
|
"#,
|
|
)])
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
"foo.nu",
|
|
r#"
|
|
let-env FOO = 'bad'
|
|
"#,
|
|
)]);
|
|
|
|
let actual = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
r#"
|
|
source-env lol/lol.nu;
|
|
$env.FOO
|
|
"#
|
|
));
|
|
|
|
assert_eq!(actual.out, "good");
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn parse_file_relative_to_parsed_file_dont_use_cwd_2() {
|
|
Playground::setup("relative_files", |dirs, sandbox| {
|
|
sandbox
|
|
.mkdir("lol")
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
"lol/lol.nu",
|
|
r#"
|
|
source-env foo.nu
|
|
"#,
|
|
)])
|
|
.with_files(vec![FileWithContentToBeTrimmed(
|
|
"foo.nu",
|
|
r#"
|
|
let-env FOO = 'bad'
|
|
"#,
|
|
)]);
|
|
|
|
let actual = nu!(
|
|
cwd: dirs.test(), pipeline(
|
|
r#"
|
|
source-env lol/lol.nu
|
|
"#
|
|
));
|
|
|
|
assert!(actual.err.contains("File not found"));
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn parse_export_env_in_module() {
|
|
let actual = nu!(cwd: "tests/parsing/samples",
|
|
r#"
|
|
module spam { export-env { } }
|
|
"#);
|
|
|
|
assert!(actual.err.is_empty());
|
|
}
|
|
|
|
#[test]
|
|
fn parse_export_env_missing_block() {
|
|
let actual = nu!(cwd: "tests/parsing/samples",
|
|
r#"
|
|
module spam { export-env }
|
|
"#);
|
|
|
|
assert!(actual.err.contains("missing block"));
|
|
}
|
|
|
|
#[test]
|
|
fn call_command_with_non_ascii_argument() {
|
|
let actual = nu!(cwd: "tests/parsing/samples",
|
|
r#"
|
|
def nu-arg [--umlaut(-ö): int] {}
|
|
nu-arg -ö 42
|
|
"#);
|
|
|
|
assert_eq!(actual.err.len(), 0);
|
|
}
|