mirror of
https://github.com/nushell/nushell.git
synced 2025-06-30 14:40:06 +02:00
Remove unnecessary cwd, pipeline(), r# from various tests (#9645)
<!-- if this PR closes one or more issues, you can automatically link the PR with them by using one of the [*linking keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword), e.g. - this PR should close #xxxx - fixes #xxxx you can also mention related issues, PRs or discussions! --> # Description <!-- Thank you for improving Nushell. Please, check our [contributing guide](../CONTRIBUTING.md) and talk to the core team before making major changes. Description of your pull request goes here. **Provide examples and/or screenshots** if your changes affect the user experience. --> This PR cleans up tests in the `tests/` directory by removing unnecessary code. Part of #8670. - [x] const_/mod.rs - [x] eval/mod.rs - [x] hooks/mod.rs - [x] modules/mod.rs - [x] overlays/mod.rs - [x] parsing/mod.rs - [x] scope/mod.rs - [x] shell/environment/env.rs - [x] shell/environment/nu_env.rs - [x] shell/mod.rs - [x] shell/pipeline/commands/external.rs - [x] shell/pipeline/commands/internal.rs - [x] shell/pipeline/mod.rs # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # 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 -A clippy::result_large_err` 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. -->
This commit is contained in:
Han Junghyuk
GitHub
@ -5,9 +5,9 @@ use pretty_assertions::assert_eq;
|
||||
|
||||
#[test]
|
||||
fn source_file_relative_to_file() {
|
||||
let actual = nu!(cwd: "tests/parsing/samples", r#"
|
||||
let actual = nu!(cwd: "tests/parsing/samples", "
|
||||
nu source_file_relative.nu
|
||||
"#);
|
||||
");
|
||||
|
||||
assert_eq!(actual.out, "5");
|
||||
}
|
||||
@ -15,55 +15,55 @@ fn source_file_relative_to_file() {
|
||||
#[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#"
|
||||
let actual = nu!(cwd: "tests/parsing/samples", "
|
||||
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#"
|
||||
let actual = nu!(cwd: "tests/parsing/samples", "
|
||||
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#"
|
||||
let actual = nu!(cwd: "tests/parsing/samples", "
|
||||
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#"
|
||||
let actual = nu!(cwd: "tests/parsing/samples", "
|
||||
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#"
|
||||
let actual = nu!(cwd: "tests/parsing/samples", "
|
||||
nu multiline_end_pipe_win.nu
|
||||
"#);
|
||||
");
|
||||
|
||||
assert_eq!(actual.out, "3");
|
||||
}
|
||||
@ -76,11 +76,11 @@ fn parse_file_relative_to_parsed_file_simple() {
|
||||
.mkdir("lol/lol")
|
||||
.with_files(vec![FileWithContentToBeTrimmed(
|
||||
"lol/lol/lol.nu",
|
||||
r#"
|
||||
"
|
||||
use ../lol_shell.nu
|
||||
|
||||
$env.LOL = (lol_shell ls)
|
||||
"#,
|
||||
",
|
||||
)])
|
||||
.with_files(vec![FileWithContentToBeTrimmed(
|
||||
"lol/lol_shell.nu",
|
||||
@ -91,10 +91,10 @@ fn parse_file_relative_to_parsed_file_simple() {
|
||||
|
||||
let actual = nu!(
|
||||
cwd: dirs.test(), pipeline(
|
||||
r#"
|
||||
"
|
||||
source-env lol/lol/lol.nu;
|
||||
$env.LOL
|
||||
"#
|
||||
"
|
||||
));
|
||||
|
||||
assert_eq!(actual.out, "lol");
|
||||
@ -110,13 +110,13 @@ fn parse_file_relative_to_parsed_file() {
|
||||
.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
|
||||
|
||||
$env.LOL = $'($env.FOO) (lol_shell ls) (ls)'
|
||||
"#,
|
||||
",
|
||||
)])
|
||||
.with_files(vec![FileWithContentToBeTrimmed(
|
||||
"lol/lol_shell.nu",
|
||||
@ -126,17 +126,17 @@ fn parse_file_relative_to_parsed_file() {
|
||||
)])
|
||||
.with_files(vec![FileWithContentToBeTrimmed(
|
||||
"foo.nu",
|
||||
r#"
|
||||
"
|
||||
$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");
|
||||
@ -150,29 +150,29 @@ fn parse_file_relative_to_parsed_file_dont_use_cwd_1() {
|
||||
.mkdir("lol")
|
||||
.with_files(vec![FileWithContentToBeTrimmed(
|
||||
"lol/lol.nu",
|
||||
r#"
|
||||
"
|
||||
source-env foo.nu
|
||||
"#,
|
||||
",
|
||||
)])
|
||||
.with_files(vec![FileWithContentToBeTrimmed(
|
||||
"lol/foo.nu",
|
||||
r#"
|
||||
"
|
||||
$env.FOO = 'good'
|
||||
"#,
|
||||
",
|
||||
)])
|
||||
.with_files(vec![FileWithContentToBeTrimmed(
|
||||
"foo.nu",
|
||||
r#"
|
||||
"
|
||||
$env.FOO = 'bad'
|
||||
"#,
|
||||
",
|
||||
)]);
|
||||
|
||||
let actual = nu!(
|
||||
cwd: dirs.test(), pipeline(
|
||||
r#"
|
||||
"
|
||||
source-env lol/lol.nu;
|
||||
$env.FOO
|
||||
"#
|
||||
"
|
||||
));
|
||||
|
||||
assert_eq!(actual.out, "good");
|
||||
@ -186,22 +186,22 @@ fn parse_file_relative_to_parsed_file_dont_use_cwd_2() {
|
||||
.mkdir("lol")
|
||||
.with_files(vec![FileWithContentToBeTrimmed(
|
||||
"lol/lol.nu",
|
||||
r#"
|
||||
"
|
||||
source-env foo.nu
|
||||
"#,
|
||||
",
|
||||
)])
|
||||
.with_files(vec![FileWithContentToBeTrimmed(
|
||||
"foo.nu",
|
||||
r#"
|
||||
"
|
||||
$env.FOO = 'bad'
|
||||
"#,
|
||||
",
|
||||
)]);
|
||||
|
||||
let actual = nu!(
|
||||
cwd: dirs.test(), pipeline(
|
||||
r#"
|
||||
"
|
||||
source-env lol/lol.nu
|
||||
"#
|
||||
"
|
||||
));
|
||||
|
||||
assert!(actual.err.contains("File not found"));
|
||||
@ -210,39 +210,35 @@ fn parse_file_relative_to_parsed_file_dont_use_cwd_2() {
|
||||
|
||||
#[test]
|
||||
fn parse_export_env_in_module() {
|
||||
let actual = nu!(cwd: "tests/parsing/samples",
|
||||
r#"
|
||||
let actual = nu!("
|
||||
module spam { export-env { } }
|
||||
"#);
|
||||
");
|
||||
|
||||
assert!(actual.err.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parse_export_env_missing_block() {
|
||||
let actual = nu!(cwd: "tests/parsing/samples",
|
||||
r#"
|
||||
let actual = nu!("
|
||||
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#"
|
||||
let actual = nu!("
|
||||
def nu-arg [--umlaut(-ö): int] {}
|
||||
nu-arg -ö 42
|
||||
"#);
|
||||
");
|
||||
|
||||
assert_eq!(actual.err.len(), 0);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parse_long_duration() {
|
||||
let actual = nu!(cwd: "tests/parsing/samples",
|
||||
r#"
|
||||
let actual = nu!(r#"
|
||||
"78.797877879789789sec" | into duration
|
||||
"#);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user