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

ls_with_file_shortcuts: fail rather than create incorrect variables

Browse Source 
Removes the danger from issue #274.

The proper fix will need to address issue #260.
This commit is contained in:
Tom "Ravi" Hale
2018-09-14 15:42:43 +07:00
parent 80ec1ad2ad
commit e46a7c3309
2 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,7 +107,7 @@ test_ls_with_file_shortcuts() {
touch 'test file' 'test_file'
mkdir -p "a [b]" 'a "b"' "a 'b'"
touch "a \"b\"/c"
touch 'a "b"/c'
# Run command in shell, load output from temp file into variable
# (This is needed so that env variables are exported in the current shell)
@@ -134,11 +134,22 @@ test_ls_with_file_shortcuts() {
ls_output=$(<$temp_file strip_colors)
assertIncludes "$ls_output" '[1] c' F
# Test that env variable is set correctly
assertEquals "$TEST_DIR/a \"b\"/c" "$e1"
assertEquals "$TEST_DIR/"'a "b"/c' "$e1"
# Test arg with no quotes
ls_output=$(ls_with_file_shortcuts a\ \"b\" | strip_colors)
assertIncludes "$ls_output" '[1] c' F
# Listing two directories fails (see issue #275)
mkdir 1 2
touch 1/file
assertFalse 'Only one directory supported' 'ls_with_file_shortcuts 1 2'
assertFalse 'Fails on <directory> <file>' 'ls_with_file_shortcuts 1 test_file'
assertFalse 'Fails on <file> <directory>' 'ls_with_file_shortcuts test_file 1'
assertFalse 'Fails on <directory> <directory>/<file>' 'ls_with_file_shortcuts 1 1/file'
# Files under the root directory
assertTrue 'Shortcuts under /' 'ls_with_file_shortcuts / > /dev/null && [[ $e1 =~ ^/[^/]+$ ]]'
cd -
rm -r "$TEST_DIR" "$temp_file"
}