mirror of
https://github.com/nushell/nushell
synced 2024-12-30 23:08:56 +00:00
87c5f6e455
# Description Fixes: #11887 Fixes: #11626 This pr unify the tilde expand behavior over several filesystem relative commands. It follows the same rule with glob expansion: | command | result | | ----------- | ------ | | ls ~/aaa | expand tilde | ls "~/aaa" | don't expand tilde | let f = "~/aaa"; ls $f | don't expand tilde, if you want to: use `ls ($f \| path expand)` | let f: glob = "~/aaa"; ls $f | expand tilde, they don't expand on `mkdir`, `touch` comamnd. Actually I'm not sure for 4th item, currently it's expanding is just because it followes the same rule with glob expansion. ### About the change It changes `expand_path_with` to accept a new argument called `expand_tilde`, if it's true, expand it, if not, just keep it as `~` itself. # User-Facing Changes After this change, `ls "~/aaa"` won't expand tilde. # Tests + Formatting Done
161 lines
3.8 KiB
Rust
161 lines
3.8 KiB
Rust
use nu_test_support::fs::files_exist_at;
|
|
use nu_test_support::playground::Playground;
|
|
use nu_test_support::{nu, pipeline};
|
|
use std::path::Path;
|
|
|
|
#[test]
|
|
fn creates_directory() {
|
|
Playground::setup("mkdir_test_1", |dirs, _| {
|
|
nu!(
|
|
cwd: dirs.test(),
|
|
"mkdir my_new_directory"
|
|
);
|
|
|
|
let expected = dirs.test().join("my_new_directory");
|
|
|
|
assert!(expected.exists());
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn accepts_and_creates_directories() {
|
|
Playground::setup("mkdir_test_2", |dirs, _| {
|
|
nu!(
|
|
cwd: dirs.test(),
|
|
"mkdir dir_1 dir_2 dir_3"
|
|
);
|
|
|
|
assert!(files_exist_at(
|
|
vec![Path::new("dir_1"), Path::new("dir_2"), Path::new("dir_3")],
|
|
dirs.test()
|
|
));
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn creates_intermediary_directories() {
|
|
Playground::setup("mkdir_test_3", |dirs, _| {
|
|
nu!(
|
|
cwd: dirs.test(),
|
|
"mkdir some_folder/another/deeper_one"
|
|
);
|
|
|
|
let expected = dirs.test().join("some_folder/another/deeper_one");
|
|
|
|
assert!(expected.exists());
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn create_directory_two_parents_up_using_multiple_dots() {
|
|
Playground::setup("mkdir_test_4", |dirs, sandbox| {
|
|
sandbox.within("foo").mkdir("bar");
|
|
|
|
nu!(
|
|
cwd: dirs.test().join("foo/bar"),
|
|
"mkdir .../boo"
|
|
);
|
|
|
|
let expected = dirs.test().join("boo");
|
|
|
|
assert!(expected.exists());
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn print_created_paths() {
|
|
Playground::setup("mkdir_test_2", |dirs, _| {
|
|
let actual = nu!(
|
|
cwd: dirs.test(),
|
|
pipeline("mkdir -v dir_1 dir_2 dir_3")
|
|
);
|
|
|
|
assert!(files_exist_at(
|
|
vec![Path::new("dir_1"), Path::new("dir_2"), Path::new("dir_3")],
|
|
dirs.test()
|
|
));
|
|
|
|
assert!(actual.out.contains("dir_1"));
|
|
assert!(actual.out.contains("dir_2"));
|
|
assert!(actual.out.contains("dir_3"));
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn creates_directory_three_dots() {
|
|
Playground::setup("mkdir_test_1", |dirs, _| {
|
|
nu!(
|
|
cwd: dirs.test(),
|
|
"mkdir test..."
|
|
);
|
|
|
|
let expected = dirs.test().join("test...");
|
|
|
|
assert!(expected.exists());
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn creates_directory_four_dots() {
|
|
Playground::setup("mkdir_test_1", |dirs, _| {
|
|
nu!(
|
|
cwd: dirs.test(),
|
|
"mkdir test...."
|
|
);
|
|
|
|
let expected = dirs.test().join("test....");
|
|
|
|
assert!(expected.exists());
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn creates_directory_three_dots_quotation_marks() {
|
|
Playground::setup("mkdir_test_1", |dirs, _| {
|
|
nu!(
|
|
cwd: dirs.test(),
|
|
"mkdir 'test...'"
|
|
);
|
|
|
|
let expected = dirs.test().join("test...");
|
|
|
|
assert!(expected.exists());
|
|
})
|
|
}
|
|
|
|
#[cfg(not(windows))]
|
|
#[test]
|
|
fn mkdir_umask_permission() {
|
|
use std::{fs, os::unix::fs::PermissionsExt};
|
|
|
|
Playground::setup("mkdir_umask_permission", |dirs, _| {
|
|
nu!(
|
|
cwd: dirs.test(),
|
|
"mkdir test_umask_permission"
|
|
);
|
|
let actual = fs::metadata(dirs.test().join("test_umask_permission"))
|
|
.unwrap()
|
|
.permissions()
|
|
.mode();
|
|
|
|
assert_eq!(
|
|
actual, 0o40755,
|
|
"Most *nix systems have 0o00022 as the umask. \
|
|
So directory permission should be 0o40755 = 0o40777 - 0o00022"
|
|
);
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn mkdir_with_tilde() {
|
|
Playground::setup("mkdir with tilde", |dirs, _| {
|
|
let actual = nu!(cwd: dirs.test(), "mkdir '~tilde'");
|
|
assert!(actual.err.is_empty());
|
|
assert!(files_exist_at(vec![Path::new("~tilde")], dirs.test()));
|
|
|
|
// pass variable
|
|
let actual = nu!(cwd: dirs.test(), "let f = '~tilde2'; mkdir $f");
|
|
assert!(actual.err.is_empty());
|
|
assert!(files_exist_at(vec![Path::new("~tilde2")], dirs.test()));
|
|
})
|
|
}
|