From cb1eefd24ab632c5b43d4427b90ce04871f21a0a Mon Sep 17 00:00:00 2001 From: Antoine Stevan <44101798+amtoine@users.noreply.github.com> Date: Wed, 22 Mar 2023 09:50:01 +0100 Subject: [PATCH] FIX: expand all the `base_path`s in `std::test_dirs` (#8552) Related to #8525. # Description this should close #8528. # User-Facing Changes ``` $nothing ``` # Tests + Formatting ``` $nothing ``` # After Submitting ``` $nothing ``` --- crates/nu-utils/standard_library/test_dirs.nu | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/crates/nu-utils/standard_library/test_dirs.nu b/crates/nu-utils/standard_library/test_dirs.nu index 54b1420f4d..1370c5e350 100644 --- a/crates/nu-utils/standard_library/test_dirs.nu +++ b/crates/nu-utils/standard_library/test_dirs.nu @@ -10,12 +10,12 @@ def clean [path: path] { export def test_dirs_command [] { # need some directories to play with let base_path = (($nu.temp-path) | path join $"test_dirs_(random uuid)" | path expand ) - let path_a = ($base_path | path join "a") - let path_b = ($base_path | path join "b") + let path_a = ($base_path | path expand | path join "a") + let path_b = ($base_path | path expand | path join "b") try { - mkdir $base_path $path_a $path_b - cd $base_path + mkdir ($base_path | path expand) $path_a $path_b + cd ($base_path | path expand) use std.nu "dirs next" use std.nu "dirs prev" use std.nu "dirs add" @@ -23,13 +23,13 @@ export def test_dirs_command [] { use std.nu "dirs show" assert length $env.DIRS_LIST 1 "list is just pwd after initialization" - assert equal $base_path $env.DIRS_LIST.0 "list is just pwd after initialization" + assert equal ($base_path | path expand) $env.DIRS_LIST.0 "list is just pwd after initialization" dirs next - assert equal $base_path $env.DIRS_LIST.0 "next wraps at end of list" + assert equal ($base_path | path expand) $env.DIRS_LIST.0 "next wraps at end of list" dirs prev - assert equal $base_path $env.DIRS_LIST.0 "prev wraps at top of list" + assert equal ($base_path | path expand) $env.DIRS_LIST.0 "prev wraps at top of list" dirs add $path_b $path_a assert equal $path_b $env.PWD "add changes PWD to first added dir" @@ -37,18 +37,18 @@ export def test_dirs_command [] { assert equal $path_a $env.DIRS_LIST.2 "add in fact adds to list" dirs next 2 - assert equal $base_path $env.PWD "next wraps at end of list" + assert equal ($base_path | path expand) $env.PWD "next wraps at end of list" dirs prev 1 assert equal $path_a $env.PWD "prev wraps at start of list" dirs drop assert length $env.DIRS_LIST 2 "drop removes from list" - assert equal $base_path $env.PWD "drop changes PWD to next in list (after dropped element)" + assert equal ($base_path | path expand) $env.PWD "drop changes PWD to next in list (after dropped element)" - assert equal (dirs show) [[active path]; [true $base_path] [false $path_b]] "show table contains expected information" + assert equal (dirs show) [[active path]; [true ($base_path | path expand)] [false $path_b]] "show table contains expected information" } catch { |error| - clean $base_path + clean ($base_path | path expand) let error = ( $error @@ -69,5 +69,5 @@ export def test_dirs_command [] { } } - try { clean $base_path } + try { clean ($base_path | path expand) } }