diff options
author | Zhenhui Xie <xiezh0831@yahoo.co.jp> | 2019-10-24 18:37:44 +0800 |
---|---|---|
committer | Matan Kushner <hello@matchai.me> | 2019-10-24 19:37:44 +0900 |
commit | aa260899d452bde337e5e1a42e92ea6331ec9fc7 (patch) | |
tree | 115702797f574c430344f183dbfb11952be079e3 /tests/testsuite | |
parent | e0c90a6502b1acd4454f150e0003c63c4fac5208 (diff) |
fix: Use logical path instead of physical path when available (#398)
* Get pathbuf from logical path. (fixes #204)
(also fixes #397)
* fix: Update directory module so that use_logical_path will work properly
* Remove test directory::use_logical_and_physical_paths
* Fix merge errors
Co-authored-by: Matan Kushner <hello@matchai.me>
Diffstat (limited to 'tests/testsuite')
-rw-r--r-- | tests/testsuite/directory.rs | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/tests/testsuite/directory.rs b/tests/testsuite/directory.rs index 5a8af6bc8..006764ae8 100644 --- a/tests/testsuite/directory.rs +++ b/tests/testsuite/directory.rs @@ -451,66 +451,3 @@ fn git_repo_in_home_directory_truncate_to_repo_true() -> io::Result<()> { assert_eq!(expected, actual); Ok(()) } - -#[test] -#[ignore] -fn use_logical_and_physical_paths() -> io::Result<()> { - /* This test is a bit of a smoke + mirrors trick because all it shows is that - the application is reading the PWD envar correctly (if the shell doesn't - correctly set PWD, we're still in trouble). */ - let tmp_dir = Path::new("/tmp/starship/porthole/viewport"); - let dir = tmp_dir.join("directory"); - let sym = tmp_dir.join("symlink_to_directory"); - fs::create_dir_all(&dir)?; - // Create a symlink on the appropriate system - #[cfg(target_family = "unix")] - std::os::unix::fs::symlink(&dir, &sym).unwrap(); - #[cfg(target_family = "windows")] - std::os::windows::fs::symlink_file(&dir, &sym).unwrap(); - - // Test when using physical paths - let output = common::render_module("directory") - .use_config(toml::toml! { - [directory] - use_logical_path = false - }) - .arg("--path") - .arg(&dir) - .env( - "PWD", - "/tmp/starship/porthole/viewport/symlink_to_directory", - ) - .output()?; - let actual = String::from_utf8(output.stdout).unwrap(); - - let expected = format!( - "in {} ", - Color::Cyan.bold().paint("porthole/viewport/directory") - ); - assert_eq!(expected, actual); - - // Test when using logical paths - let output = common::render_module("directory") - .use_config(toml::toml! { - [directory] - use_logical_path = true - }) - .arg("--path") - .arg(&sym) - .env( - "PWD", - "/tmp/starship/porthole/viewport/symlink_to_directory", - ) - .output()?; - let actual = String::from_utf8(output.stdout).unwrap(); - - let expected = format!( - "in {} ", - Color::Cyan - .bold() - .paint("porthole/viewport/symlink_to_directory") - ); - assert_eq!(expected, actual); - - Ok(()) -} |