From abac7cf746d70e7622bf7cc2939f4d3e1d4509b2 Mon Sep 17 00:00:00 2001 From: Yehuda Katz Date: Wed, 28 Aug 2019 10:48:52 -0700 Subject: [PATCH] Migrate rm --- tests/command_rm_tests.rs | 281 +++++++++++++++++++------------------- 1 file changed, 137 insertions(+), 144 deletions(-) diff --git a/tests/command_rm_tests.rs b/tests/command_rm_tests.rs index 7a55b263a..1e8553548 100644 --- a/tests/command_rm_tests.rs +++ b/tests/command_rm_tests.rs @@ -4,169 +4,162 @@ use h::{in_directory as cwd, Playground, Stub::*}; use helpers as h; use std::path::{Path, PathBuf}; -// #[test] -// fn rm_removes_a_file() { -// let sandbox = Playground::setup_for("rm_regular_file_test") -// .with_files(vec![EmptyFile("i_will_be_deleted.txt")]) -// .test_dir_name(); +#[test] +fn rm_removes_a_file() { + Playground::setup("rm_regular_file_test", |dirs, playground| { + playground + .with_files(vec![EmptyFile("i_will_be_deleted.txt")]) + .test_dir_name(); -// nu!( -// _output, -// cwd(&Playground::root()), -// "rm rm_regular_file_test/i_will_be_deleted.txt" -// ); + nu!(dirs.root(), "rm rm_regular_file_test/i_will_be_deleted.txt"); -// let path = &format!( -// "{}/{}/{}", -// Playground::root(), -// sandbox, -// "i_will_be_deleted.txt" -// ); + let path = dirs.test().join("i_will_be_deleted.txt"); -// assert!(!h::file_exists_at(PathBuf::from(path))); -// } + assert!(!h::file_exists_at(path)); + }) +} -// #[test] -// fn rm_removes_files_with_wildcard() { -// let sandbox = Playground::setup_for("rm_wildcard_test_1") -// .within("src") -// .with_files(vec![ -// EmptyFile("cli.rs"), -// EmptyFile("lib.rs"), -// EmptyFile("prelude.rs"), -// ]) -// .within("src/parser") -// .with_files(vec![EmptyFile("parse.rs"), EmptyFile("parser.rs")]) -// .within("src/parser/parse") -// .with_files(vec![EmptyFile("token_tree.rs")]) -// .within("src/parser/hir") -// .with_files(vec![ -// EmptyFile("baseline_parse.rs"), -// EmptyFile("baseline_parse_tokens.rs"), -// ]) -// .test_dir_name(); +#[test] +fn rm_removes_files_with_wildcard() { + Playground::setup("rm_wildcard_test_1", |dirs, playground| { + playground + .within("src") + .with_files(vec![ + EmptyFile("cli.rs"), + EmptyFile("lib.rs"), + EmptyFile("prelude.rs"), + ]) + .within("src/parser") + .with_files(vec![EmptyFile("parse.rs"), EmptyFile("parser.rs")]) + .within("src/parser/parse") + .with_files(vec![EmptyFile("token_tree.rs")]) + .within("src/parser/hir") + .with_files(vec![ + EmptyFile("baseline_parse.rs"), + EmptyFile("baseline_parse_tokens.rs"), + ]) + .test_dir_name(); -// let full_path = format!("{}/{}", Playground::root(), sandbox); + nu!(dirs.test(), r#"rm "src/*/*/*.rs""#); -// nu!( -// _output, -// cwd("tests/fixtures/nuplayground/rm_wildcard_test_1"), -// r#"rm "src/*/*/*.rs""# -// ); + assert!(!h::files_exist_at( + vec![ + "src/parser/parse/token_tree.rs", + "src/parser/hir/baseline_parse.rs", + "src/parser/hir/baseline_parse_tokens.rs" + ], + dirs.test() + )); -// assert!(!h::files_exist_at( -// vec![ -// Path::new("src/parser/parse/token_tree.rs"), -// Path::new("src/parser/hir/baseline_parse.rs"), -// Path::new("src/parser/hir/baseline_parse_tokens.rs") -// ], -// PathBuf::from(&full_path) -// )); + assert_eq!( + Playground::glob_vec(&format!("{}/src/*/*/*.rs", dirs.test().display())), + Vec::::new() + ); + }) +} -// assert_eq!( -// Playground::glob_vec(&format!("{}/src/*/*/*.rs", &full_path)), -// Vec::::new() -// ); -// } +#[test] +fn rm_removes_deeply_nested_directories_with_wildcard_and_recursive_flag() { + Playground::setup("rm_wildcard_test_2", |dirs, playground| { + playground + .within("src") + .with_files(vec![ + EmptyFile("cli.rs"), + EmptyFile("lib.rs"), + EmptyFile("prelude.rs"), + ]) + .within("src/parser") + .with_files(vec![EmptyFile("parse.rs"), EmptyFile("parser.rs")]) + .within("src/parser/parse") + .with_files(vec![EmptyFile("token_tree.rs")]) + .within("src/parser/hir") + .with_files(vec![ + EmptyFile("baseline_parse.rs"), + EmptyFile("baseline_parse_tokens.rs"), + ]) + .test_dir_name(); -// #[test] -// fn rm_removes_deeply_nested_directories_with_wildcard_and_recursive_flag() { -// let sandbox = Playground::setup_for("rm_wildcard_test_2") -// .within("src") -// .with_files(vec![ -// EmptyFile("cli.rs"), -// EmptyFile("lib.rs"), -// EmptyFile("prelude.rs"), -// ]) -// .within("src/parser") -// .with_files(vec![EmptyFile("parse.rs"), EmptyFile("parser.rs")]) -// .within("src/parser/parse") -// .with_files(vec![EmptyFile("token_tree.rs")]) -// .within("src/parser/hir") -// .with_files(vec![ -// EmptyFile("baseline_parse.rs"), -// EmptyFile("baseline_parse_tokens.rs"), -// ]) -// .test_dir_name(); + nu!(dirs.test(), "rm src/* --recursive"); -// let full_path = format!("{}/{}", Playground::root(), sandbox); + assert!(!h::files_exist_at( + vec!["src/parser/parse", "src/parser/hir"], + dirs.test() + )); + }) +} -// nu!( -// _output, -// cwd("tests/fixtures/nuplayground/rm_wildcard_test_2"), -// "rm src/* --recursive" -// ); +#[test] +fn rm_removes_directory_contents_without_recursive_flag_if_empty() { + Playground::setup("rm_directory_removal_recursively_test_1", |dirs, _| { + nu!(dirs.root(), "rm rm_directory_removal_recursively_test_1"); -// assert!(!h::files_exist_at( -// vec![Path::new("src/parser/parse"), Path::new("src/parser/hir"),], -// PathBuf::from(&full_path) -// )); -// } + assert!(!h::file_exists_at(dirs.test())); + }) +} -// #[test] -// fn rm_removes_directory_contents_without_recursive_flag_if_empty() { -// let sandbox = Playground::setup_for("rm_directory_removal_recursively_test_1").test_dir_name(); +#[test] +fn rm_removes_directory_contents_with_recursive_flag() { + Playground::setup( + "rm_directory_removal_recursively_test_2", + |dirs, playground| { + playground + .with_files(vec![ + EmptyFile("yehuda.txt"), + EmptyFile("jonathan.txt"), + EmptyFile("andres.txt"), + ]) + .test_dir_name(); -// nu!( -// _output, -// cwd("tests/fixtures/nuplayground"), -// "rm rm_directory_removal_recursively_test_1" -// ); + nu!( + dirs.root(), + "rm rm_directory_removal_recursively_test_2 --recursive" + ); -// let expected = format!("{}/{}", Playground::root(), sandbox); + assert!(!h::file_exists_at(dirs.test())); + }, + ) +} -// assert!(!h::file_exists_at(PathBuf::from(expected))); -// } +#[test] +fn rm_errors_if_attempting_to_delete_a_directory_with_content_without_recursive_flag() { + Playground::setup( + "rm_prevent_directory_removal_without_flag_test", + |dirs, playground| { + playground + .with_files(vec![EmptyFile("some_empty_file.txt")]) + .test_dir_name(); -// #[test] -// fn rm_removes_directory_contents_with_recursive_flag() { -// let sandbox = Playground::setup_for("rm_directory_removal_recursively_test_2") -// .with_files(vec![ -// EmptyFile("yehuda.txt"), -// EmptyFile("jonathan.txt"), -// EmptyFile("andres.txt"), -// ]) -// .test_dir_name(); + let output = nu_error!( + dirs.root(), + "rm rm_prevent_directory_removal_without_flag_test" + ); -// nu!( -// _output, -// cwd("tests/fixtures/nuplayground"), -// "rm rm_directory_removal_recursively_test_2 --recursive" -// ); + assert!(h::file_exists_at(dirs.test())); + assert!(output.contains("is a directory")); + }, + ) +} -// let expected = format!("{}/{}", Playground::root(), sandbox); +#[test] +fn rm_errors_if_attempting_to_delete_single_dot_as_argument() { + Playground::setup( + "rm_errors_if_attempting_to_delete_single_dot_as_argument", + |dirs, _| { + let output = nu_error!(dirs.root(), "rm ."); -// assert!(!h::file_exists_at(PathBuf::from(expected))); -// } + assert!(output.contains("may not be removed")); + }, + ) +} -// #[test] -// fn rm_errors_if_attempting_to_delete_a_directory_with_content_without_recursive_flag() { -// let sandbox = Playground::setup_for("rm_prevent_directory_removal_without_flag_test") -// .with_files(vec![EmptyFile("some_empty_file.txt")]) -// .test_dir_name(); +#[test] +fn rm_errors_if_attempting_to_delete_two_dot_as_argument() { + Playground::setup( + "rm_errors_if_attempting_to_delete_single_dot_as_argument", + |dirs, _| { + let output = nu_error!(dirs.root(), "rm .."); -// let full_path = format!("{}/{}", Playground::root(), sandbox); - -// nu_error!( -// output, -// cwd(&Playground::root()), -// "rm rm_prevent_directory_removal_without_flag_test" -// ); - -// assert!(h::file_exists_at(PathBuf::from(full_path))); -// assert!(output.contains("is a directory")); -// } - -// #[test] -// fn rm_errors_if_attempting_to_delete_single_dot_as_argument() { -// nu_error!(output, cwd(&Playground::root()), "rm ."); - -// assert!(output.contains("may not be removed")); -// } - -// #[test] -// fn rm_errors_if_attempting_to_delete_two_dot_as_argument() { -// nu_error!(output, cwd(&Playground::root()), "rm .."); - -// assert!(output.contains("may not be removed")); -// } + assert!(output.contains("may not be removed")); + }, + ) +}