From 2cc6a82da6f77c01f2a0d06847eabde168a2e56b Mon Sep 17 00:00:00 2001 From: amtoine Date: Sun, 12 Mar 2023 12:01:09 +0100 Subject: [PATCH] remove all the `enter`, `shells`, `n`, `p` and `g` tests --- crates/nu-command/tests/commands/enter.rs | 73 ----------------- crates/nu-command/tests/commands/g.rs | 91 ---------------------- crates/nu-command/tests/commands/mod.rs | 5 -- crates/nu-command/tests/commands/n.rs | 31 -------- crates/nu-command/tests/commands/p.rs | 31 -------- crates/nu-command/tests/commands/shells.rs | 31 -------- src/tests/test_parser.rs | 9 --- 7 files changed, 271 deletions(-) delete mode 100644 crates/nu-command/tests/commands/enter.rs delete mode 100644 crates/nu-command/tests/commands/g.rs delete mode 100644 crates/nu-command/tests/commands/n.rs delete mode 100644 crates/nu-command/tests/commands/p.rs delete mode 100644 crates/nu-command/tests/commands/shells.rs diff --git a/crates/nu-command/tests/commands/enter.rs b/crates/nu-command/tests/commands/enter.rs deleted file mode 100644 index 945a740c8a..0000000000 --- a/crates/nu-command/tests/commands/enter.rs +++ /dev/null @@ -1,73 +0,0 @@ -use nu_test_support::fs::{files_exist_at, Stub::EmptyFile}; -use nu_test_support::nu; -use nu_test_support::playground::Playground; -use std::path::Path; - -#[test] -fn knows_the_filesystems_entered() { - Playground::setup("enter_test_1", |dirs, sandbox| { - sandbox - .within("red_pill") - .with_files(vec![ - EmptyFile("andres.nu"), - EmptyFile("jonathan.nu"), - EmptyFile("yehuda.nu"), - ]) - .within("blue_pill") - .with_files(vec![ - EmptyFile("bash.nxt"), - EmptyFile("korn.nxt"), - EmptyFile("powedsh.nxt"), - ]) - .mkdir("expected"); - - let red_pill_dir = dirs.test().join("red_pill"); - let blue_pill_dir = dirs.test().join("blue_pill"); - let expected = dirs.test().join("expected"); - let expected_recycled = expected.join("recycled"); - - nu!( - cwd: dirs.test(), - r#" - enter expected - mkdir recycled - enter ../red_pill - mv jonathan.nu ../expected - enter ../blue_pill - cp *.nxt ../expected/recycled - p - p - mv ../red_pill/yehuda.nu . - n - mv andres.nu ../expected/andres.nu - exit - cd .. - rm red_pill --recursive - exit - n - rm blue_pill --recursive - exit - "# - ); - - assert!(!red_pill_dir.exists()); - assert!(files_exist_at( - vec![ - Path::new("andres.nu"), - Path::new("jonathan.nu"), - Path::new("yehuda.nu"), - ], - expected - )); - - assert!(!blue_pill_dir.exists()); - assert!(files_exist_at( - vec![ - Path::new("bash.nxt"), - Path::new("korn.nxt"), - Path::new("powedsh.nxt"), - ], - expected_recycled - )); - }) -} diff --git a/crates/nu-command/tests/commands/g.rs b/crates/nu-command/tests/commands/g.rs deleted file mode 100644 index aabf507ade..0000000000 --- a/crates/nu-command/tests/commands/g.rs +++ /dev/null @@ -1,91 +0,0 @@ -use nu_test_support::{nu, pipeline, playground::Playground}; - -#[test] -fn list_shells() { - let actual = nu!( - cwd: ".", pipeline( - r#"g | get path | length "# - )); - - assert_eq!(actual.out, "1"); -} - -#[test] -fn enter_shell() { - let actual = nu!( - cwd: ".", pipeline( - r#"g 0"# - )); - - assert!(actual.err.is_empty()); -} - -#[test] -fn enter_not_exist_shell() { - let actual = nu!( - cwd: ".", pipeline( - r#"g 1"# - )); - - assert!(actual.err.contains("Not found")); -} - -#[test] -fn switch_to_last_used_shell_1() { - Playground::setup("switch_last_used_shell_1", |dirs, sandbox| { - sandbox.mkdir("foo").mkdir("bar"); - - let actual = nu!( - cwd: dirs.test(), - pipeline( - r#"enter foo; enter ../bar; g 0; g -;g | get active.2"# - )); - - assert_eq!(actual.out, "true"); - }) -} - -#[test] -fn switch_to_last_used_shell_2() { - Playground::setup("switch_last_used_shell_2", |dirs, sandbox| { - sandbox.mkdir("foo").mkdir("bar"); - - let actual = nu!( - cwd: dirs.test(), - pipeline( - r#"enter foo; enter ../bar; n; g -;g | get active.2"# - )); - - assert_eq!(actual.out, "true"); - }) -} - -#[test] -fn switch_to_last_used_shell_3() { - Playground::setup("switch_last_used_shell_3", |dirs, sandbox| { - sandbox.mkdir("foo").mkdir("bar"); - - let actual = nu!( - cwd: dirs.test(), - pipeline( - r#"enter foo; enter ../bar; p; g -;g | get active.2"# - )); - - assert_eq!(actual.out, "true"); - }) -} - -#[test] -fn switch_to_last_used_shell_4() { - Playground::setup("switch_last_used_shell_4", |dirs, sandbox| { - sandbox.mkdir("foo").mkdir("bar"); - - let actual = nu!( - cwd: dirs.test(), - pipeline( - r#"enter foo; enter ../bar; g 2; exit; g -;g | get active.0"# - )); - - assert_eq!(actual.out, "true"); - }) -} diff --git a/crates/nu-command/tests/commands/mod.rs b/crates/nu-command/tests/commands/mod.rs index 872d2e9f3e..300e5d2bbc 100644 --- a/crates/nu-command/tests/commands/mod.rs +++ b/crates/nu-command/tests/commands/mod.rs @@ -18,7 +18,6 @@ mod drop; mod each; mod echo; mod empty; -mod enter; mod error_make; mod every; #[cfg(not(windows))] @@ -30,7 +29,6 @@ mod first; mod flatten; mod for_; mod format; -mod g; mod get; mod glob; mod group_by; @@ -52,11 +50,9 @@ mod merge; mod mkdir; mod move_; mod mut_; -mod n; mod network; mod nu_check; mod open; -mod p; mod parse; mod path; mod platform; @@ -81,7 +77,6 @@ mod select; mod semicolon; mod seq; mod seq_char; -mod shells; mod skip; mod sort; mod sort_by; diff --git a/crates/nu-command/tests/commands/n.rs b/crates/nu-command/tests/commands/n.rs deleted file mode 100644 index 682bd4b2ef..0000000000 --- a/crates/nu-command/tests/commands/n.rs +++ /dev/null @@ -1,31 +0,0 @@ -use nu_test_support::{nu, pipeline, playground::Playground}; - -#[test] -fn switch_to_next_shell_1() { - Playground::setup("switch_to_next_shell_1", |dirs, sandbox| { - sandbox.mkdir("foo").mkdir("bar"); - - let actual = nu!( - cwd: dirs.test(), - pipeline( - r#"enter foo; enter ../bar; n; g | get active.0"# - )); - - assert_eq!(actual.out, "true"); - }) -} - -#[test] -fn switch_to_next_shell_2() { - Playground::setup("switch_to_next_shell_2", |dirs, sandbox| { - sandbox.mkdir("foo").mkdir("bar"); - - let actual = nu!( - cwd: dirs.test(), - pipeline( - r#"enter foo; enter ../bar; n; n; g | get active.1"# - )); - - assert_eq!(actual.out, "true"); - }) -} diff --git a/crates/nu-command/tests/commands/p.rs b/crates/nu-command/tests/commands/p.rs deleted file mode 100644 index d8b3c4979b..0000000000 --- a/crates/nu-command/tests/commands/p.rs +++ /dev/null @@ -1,31 +0,0 @@ -use nu_test_support::{nu, pipeline, playground::Playground}; - -#[test] -fn switch_to_prev_shell_1() { - Playground::setup("switch_to_next_shell_1", |dirs, sandbox| { - sandbox.mkdir("foo").mkdir("bar"); - - let actual = nu!( - cwd: dirs.test(), - pipeline( - r#"enter foo; enter ../bar; p; g | get active.1"# - )); - - assert_eq!(actual.out, "true"); - }) -} - -#[test] -fn switch_to_prev_shell_2() { - Playground::setup("switch_to_next_shell_2", |dirs, sandbox| { - sandbox.mkdir("foo").mkdir("bar"); - - let actual = nu!( - cwd: dirs.test(), - pipeline( - r#"enter foo; enter ../bar; p; p; p; g | get active.2"# - )); - - assert_eq!(actual.out, "true"); - }) -} diff --git a/crates/nu-command/tests/commands/shells.rs b/crates/nu-command/tests/commands/shells.rs deleted file mode 100644 index 3f3cf23c50..0000000000 --- a/crates/nu-command/tests/commands/shells.rs +++ /dev/null @@ -1,31 +0,0 @@ -use nu_test_support::{nu, pipeline, playground::Playground}; - -#[test] -fn list_shells_1() { - Playground::setup("list_shells_1", |dirs, sandbox| { - sandbox.mkdir("foo").mkdir("bar"); - - let actual = nu!( - cwd: dirs.test(), - pipeline( - r#"enter foo; enter ../bar; g| get active.2"# - )); - - assert_eq!(actual.out, "true"); - }) -} - -#[test] -fn list_shells_2() { - Playground::setup("list_shells_2", |dirs, sandbox| { - sandbox.mkdir("foo").mkdir("bar"); - - let actual = nu!( - cwd: dirs.test(), - pipeline( - r#"enter foo; enter ../bar; shells| get active.2"# - )); - - assert_eq!(actual.out, "true"); - }) -} diff --git a/src/tests/test_parser.rs b/src/tests/test_parser.rs index 0cc2f9a71c..406bac8484 100644 --- a/src/tests/test_parser.rs +++ b/src/tests/test_parser.rs @@ -179,15 +179,6 @@ fn bad_short_flag() -> TestResult { fail_test(r#"def foo3 [-l?:int] { $l }"#, "short flag") } -#[test] -fn alias_with_error_doesnt_panic() -> TestResult { - fail_test( - r#"alias s = shells - s ."#, - "extra positional", - ) -} - #[test] fn quotes_with_equals() -> TestResult { run_test(