fix bin path testing

This commit is contained in:
Martino Visintin
2017-02-12 20:43:00 +00:00
parent 6baa3c90c8
commit 39f6596861

View File

@@ -33,11 +33,15 @@ oneTimeSetUp() {
# Test functions # Test functions
function ln() { ln $@; } function ln() { ln $@; }
# Test aliases # Test aliases
alias mv="nocorrect $(which mv)" export mv_path="$(which mv)"
alias rm="$(which rm) --option" export rm_path="$(which rm)"
alias sed="$(which sed)" 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 # Test already wrapped commands
alias cat="exec_scmb_expand_args $(which cat)" alias cat="exec_scmb_expand_args $cat_path"
# Run shortcut wrapping # Run shortcut wrapping
source "$scmbDir/lib/git/shell_shortcuts.sh" source "$scmbDir/lib/git/shell_shortcuts.sh"
@@ -59,10 +63,10 @@ assertAliasEquals(){
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
test_shell_command_wrapping() { test_shell_command_wrapping() {
assertAliasEquals "exec_scmb_expand_args $(which rm) --option" "rm" assertAliasEquals "exec_scmb_expand_args $rm_path --option" "rm"
assertAliasEquals "exec_scmb_expand_args nocorrect $(which mv)" "mv" assertAliasEquals "exec_scmb_expand_args nocorrect $mv_path" "mv"
assertAliasEquals "exec_scmb_expand_args $(which sed)" "sed" assertAliasEquals "exec_scmb_expand_args $sed_path" "sed"
assertAliasEquals "exec_scmb_expand_args $(which cat)" "cat" assertAliasEquals "exec_scmb_expand_args $cat_path" "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"