Extend tests to use conditional exe paths
This commit is contained in:
committed by
GitHub
parent
455239f594
commit
6f4babeced
@@ -33,11 +33,11 @@ oneTimeSetUp() {
|
|||||||
# Test functions
|
# Test functions
|
||||||
function ln() { ln $@; }
|
function ln() { ln $@; }
|
||||||
# Test aliases
|
# Test aliases
|
||||||
alias mv="nocorrect /bin/mv"
|
alias mv="nocorrect $(which mv)"
|
||||||
alias rm="/bin/rm --option"
|
alias rm="$(which rm) --option"
|
||||||
alias sed="/bin/sed"
|
alias sed="$(which sed)"
|
||||||
# Test already wrapped commands
|
# Test already wrapped commands
|
||||||
alias cat="exec_scmb_expand_args /bin/cat"
|
alias cat="exec_scmb_expand_args $(which cat)"
|
||||||
|
|
||||||
# Run shortcut wrapping
|
# Run shortcut wrapping
|
||||||
source "$scmbDir/lib/git/shell_shortcuts.sh"
|
source "$scmbDir/lib/git/shell_shortcuts.sh"
|
||||||
@@ -59,11 +59,11 @@ assertAliasEquals(){
|
|||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
|
|
||||||
test_shell_command_wrapping() {
|
test_shell_command_wrapping() {
|
||||||
assertAliasEquals "exec_scmb_expand_args /bin/rm --option" "rm"
|
assertAliasEquals "exec_scmb_expand_args $(which rm) --option" "rm"
|
||||||
assertAliasEquals "exec_scmb_expand_args nocorrect /bin/mv" "mv"
|
assertAliasEquals "exec_scmb_expand_args nocorrect $(which mv)" "mv"
|
||||||
assertAliasEquals "exec_scmb_expand_args /bin/sed" "sed"
|
assertAliasEquals "exec_scmb_expand_args $(which sed)" "sed"
|
||||||
assertAliasEquals "exec_scmb_expand_args /bin/cat" "cat"
|
assertAliasEquals "exec_scmb_expand_args $(which cat)" "cat"
|
||||||
assertAliasEquals "exec_scmb_expand_args builtin cd" "cd"
|
assertAliasEquals "exec_scmb_expand_args builtin cd" "cd"
|
||||||
assertIncludes "$(declare -f ln)" "ln ()"
|
assertIncludes "$(declare -f ln)" "ln ()"
|
||||||
assertIncludes "$(declare -f ln)" "exec_scmb_expand_args __original_ln"
|
assertIncludes "$(declare -f ln)" "exec_scmb_expand_args __original_ln"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user