Merge pull request #229 from vise890/fix-tests

make tests independent of bin locations
This commit is contained in:
Wilhelmina Drengwitz
2017-02-06 17:05:19 -05:00
committed by GitHub

View File

@@ -33,11 +33,11 @@ oneTimeSetUp() {
# Test functions
function ln() { ln $@; }
# Test aliases
alias mv="nocorrect mv"
alias rm="rm --option"
alias sed="sed"
alias mv="nocorrect $(which mv)"
alias rm="$(which rm) --option"
alias sed="$(which sed)"
# Test already wrapped commands
alias cat="exec_scmb_expand_args /bin/cat"
alias cat="exec_scmb_expand_args $(which cat)"
# Run shortcut wrapping
source "$scmbDir/lib/git/shell_shortcuts.sh"
@@ -59,11 +59,11 @@ assertAliasEquals(){
#-----------------------------------------------------------------------------
test_shell_command_wrapping() {
assertAliasEquals "exec_scmb_expand_args /bin/rm --option" "rm"
assertAliasEquals "exec_scmb_expand_args nocorrect /bin/mv" "mv"
assertAliasEquals "exec_scmb_expand_args /bin/sed" "sed"
assertAliasEquals "exec_scmb_expand_args /bin/cat" "cat"
assertAliasEquals "exec_scmb_expand_args builtin cd" "cd"
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 builtin cd" "cd"
assertIncludes "$(declare -f ln)" "ln ()"
assertIncludes "$(declare -f ln)" "exec_scmb_expand_args __original_ln"
}