flo/scm_breeze
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #229 from vise890/fix-tests

Browse Source 
make tests independent of bin locations
This commit is contained in:
Wilhelmina Drengwitz
2017-02-06 17:05:19 -05:00
committed by GitHub
parent 86e1a5094c 6f4babeced
commit b1a6ae6196
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/lib/git/shell_shortcuts_test.sh
View File

@@ -33,11 +33,11 @@ oneTimeSetUp() {
# Test functions # Test functions
function ln() { ln $@; } function ln() { ln $@; }
# Test aliases # Test aliases
alias mv="nocorrect mv" alias mv="nocorrect $(which mv)"
alias rm="rm --option" alias rm="$(which rm) --option"
alias sed="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,10 +59,10 @@ 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"