Merge branch 'stable'

3 files changed, 32 insertions, 4 deletions

diff --git a/tests/setup.sh b/tests/setup.sh
index 30f90d5..b2f1169 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -20,10 +20,10 @@ mkrepo() {
         name=$1
         count=$2
         dir=$PWD
-        test -d $name && return
+        test -d "$name" && return
         printf "Creating testrepo %s\n" $name
-        mkdir -p $name
-        cd $name
+        mkdir -p "$name"
+        cd "$name"
         git init
         n=1
         while test $n -le $count
@@ -50,6 +50,7 @@ setup_repos()
         mkrepo trash/repos/foo 5 >/dev/null
         mkrepo trash/repos/bar 50 >/dev/null
         mkrepo trash/repos/foo+bar 10 testplus >/dev/null
+        mkrepo "trash/repos/with space" 2 >/dev/null
         cat >trash/cgitrc <<EOF
 virtual-root=/
 cache-root=$PWD/trash/cache
@@ -75,6 +76,10 @@ repo.desc=the bar repo
 repo.url=foo+bar
 repo.path=$PWD/trash/repos/foo+bar/.git
 repo.desc=the foo+bar repo
+
+repo.url=with space
+repo.path=$PWD/trash/repos/with space/.git
+repo.desc=spaced repo
 EOF
 }
 
@@ -101,6 +106,12 @@ tests_done()
 
 run_test()
 {
+        bug=0
+        if test "$1" = "BUG"
+        then
+                bug=1
+                shift
+        fi
         desc=$1
         script=$2
         test_count=$(expr $test_count + 1)
@@ -109,9 +120,15 @@ run_test()
         eval "$2" >>test-output.log 2>>test-output.log
         res=$?
         printf "test %d: exitcode=%d\n" $test_count $res >>test-output.log
-        if test $res = 0
+        if test $res = 0 -a $bug = 0
         then
                 printf " %2d) %-60s [ok]\n" $test_count "$desc"
+        elif test $res = 0 -a $bug = 1
+        then
+                printf " %2d) %-60s [BUG FIXED]\n" $test_count "$desc"
+        elif test $bug = 1
+        then
+                printf " %2d) %-60s [KNOWN BUG]\n" $test_count "$desc"
         else
                 test_failed=$(expr $test_failed + 1)
                 printf " %2d) %-60s [failed]\n" $test_count "$desc"
diff --git a/tests/t0101-index.sh b/tests/t0101-index.sh
index 07e39f9..573a351 100755
--- a/tests/t0101-index.sh
+++ b/tests/t0101-index.sh
@@ -11,6 +11,7 @@ run_test 'find bar repo' 'grep -e "bar" trash/tmp'
 run_test 'find bar description' 'grep -e "the bar repo" trash/tmp'
 run_test 'find foo+bar repo' 'grep -e ">foo+bar<" trash/tmp'
 run_test 'verify foo+bar link' 'grep -e "/foo+bar/" trash/tmp'
+run_test 'verify "with%20space" link' 'grep -e "/with%20space/" trash/tmp'
 run_test 'no tree-link' '! grep -e "foo/tree" trash/tmp'
 run_test 'no log-link' '! grep -e "foo/log" trash/tmp'
 
diff --git a/tests/t0103-log.sh b/tests/t0103-log.sh
index b08cd29..def5c18 100755
--- a/tests/t0103-log.sh
+++ b/tests/t0103-log.sh
@@ -12,4 +12,14 @@ run_test 'generate bar/log' 'cgit_url "bar/log" >trash/tmp'
 run_test 'find commit 1' 'grep -e "commit 1" trash/tmp'
 run_test 'find commit 50' 'grep -e "commit 50" trash/tmp'
 
+run_test 'generate "with%20space/log?qt=grep&q=commit+1"' '
+        cgit_url "with+space/log&qt=grep&q=commit+1" >trash/tmp
+'
+run_test 'find commit 1' 'grep -e "commit 1" trash/tmp'
+run_test 'find link with %20 in path' 'grep -e "/with%20space/log/?qt=grep" trash/tmp'
+run_test 'find link with + in arg' 'grep -e "/log/?qt=grep&q=commit+1" trash/tmp'
+run_test BUG 'no links with space in path' '! grep -e "href=./with space/" trash/tmp'
+run_test 'no links with space in arg' '! grep -e "q=commit 1" trash/tmp'
+run_test 'commit 2 is not visible' '! grep -e "commit 2" trash/tmp'
+
 tests_done