From 39f659686146eb7882af2f48b9ac76ffbee0ad27 Mon Sep 17 00:00:00 2001 From: Martino Visintin Date: Sun, 12 Feb 2017 20:43:00 +0000 Subject: [PATCH] fix bin path testing --- test/lib/git/shell_shortcuts_test.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/test/lib/git/shell_shortcuts_test.sh b/test/lib/git/shell_shortcuts_test.sh index 522b586..b4664f3 100755 --- a/test/lib/git/shell_shortcuts_test.sh +++ b/test/lib/git/shell_shortcuts_test.sh @@ -33,11 +33,15 @@ oneTimeSetUp() { # Test functions function ln() { ln $@; } # Test aliases - alias mv="nocorrect $(which mv)" - alias rm="$(which rm) --option" - alias sed="$(which sed)" + export mv_path="$(which mv)" + export rm_path="$(which rm)" + export sed_path="$(which sed)" + export cat_pathj="$(which cat)" + alias mv="nocorrect $mv_path" + alias rm="$rm_path --option" + alias sed="$sed_path" # Test already wrapped commands - alias cat="exec_scmb_expand_args $(which cat)" + alias cat="exec_scmb_expand_args $cat_path" # Run shortcut wrapping source "$scmbDir/lib/git/shell_shortcuts.sh" @@ -59,10 +63,10 @@ assertAliasEquals(){ #----------------------------------------------------------------------------- test_shell_command_wrapping() { - assertAliasEquals "exec_scmb_expand_args $(which rm) --option" "rm" - assertAliasEquals "exec_scmb_expand_args nocorrect $(which mv)" "mv" - assertAliasEquals "exec_scmb_expand_args $(which sed)" "sed" - assertAliasEquals "exec_scmb_expand_args $(which cat)" "cat" + assertAliasEquals "exec_scmb_expand_args $rm_path --option" "rm" + assertAliasEquals "exec_scmb_expand_args nocorrect $mv_path" "mv" + assertAliasEquals "exec_scmb_expand_args $sed_path" "sed" + assertAliasEquals "exec_scmb_expand_args $cat_path" "cat" assertAliasEquals "exec_scmb_expand_args builtin cd" "cd" assertIncludes "$(declare -f ln)" "ln ()" assertIncludes "$(declare -f ln)" "exec_scmb_expand_args __original_ln"