ui-shared.c: use html_url_arg()

The link-generating functions are updated to use the new html_url_arg
function, thereby fixing links to strange repos, branches and files.

Also, the test-suite is updated to verify some cases of strange urls.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

3 files changed, 26 insertions, 1 deletions

diff --git a/tests/setup.sh b/tests/setup.sh
index e37306e..1457dd5 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -22,54 +22,66 @@ mkrepo() {
         dir=$PWD
         test -d $name && return
         printf "Creating testrepo %s\n" $name
         mkdir -p $name
         cd $name
         git init
         for ((n=1; n<=count; n++))
         do
                 echo $n >file-$n
                 git add file-$n
                 git commit -m "commit $n"
         done
+        if test "$3" = "testplus"
+        then
+                echo "hello" >a+b
+                git add a+b
+                git commit -m "add a+b"
+                git branch "1+2"
+        fi
         cd $dir
 }
 
 setup_repos()
 {
         rm -rf trash/cache
         mkdir -p trash/cache
         mkrepo trash/repos/foo 5 >/dev/null
         mkrepo trash/repos/bar 50 >/dev/null
+        mkrepo trash/repos/foo+bar 10 testplus >/dev/null
         cat >trash/cgitrc <<EOF
 virtual-root=/
 cache-root=$PWD/trash/cache
 
 cache-size=1021
 snapshots=tar.gz tar.bz zip
 enable-log-filecount=1
 enable-log-linecount=1
 summary-log=5
 summary-branches=5
 summary-tags=5
 
 repo.url=foo
 repo.path=$PWD/trash/repos/foo/.git
 # Do not specify a description for this repo, as it then will be assigned
 # the constant value "[no description]" (which actually used to cause a
 # segfault).
 
 repo.url=bar
 repo.path=$PWD/trash/repos/bar/.git
 repo.desc=the bar repo
+
+repo.url=foo+bar
+repo.path=$PWD/trash/repos/foo+bar/.git
+repo.desc=the foo+bar repo
 EOF
 }
 
 prepare_tests()
 {
         setup_repos
         rm -f test-output.log 2>/dev/null
         test_count=0
         test_failed=0
         echo "[$0]" "$@" >test-output.log
         echo "$@" "($0)"
 }
@@ -104,13 +116,12 @@ run_test()
         fi
 }
 
 cgit_query()
 {
         CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="$1" "$PWD/../cgit"
 }
 
 cgit_url()
 {
         CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit"
 }
-
diff --git a/tests/t0101-index.sh b/tests/t0101-index.sh
index 445af6a..07e39f9 100755
--- a/tests/t0101-index.sh
+++ b/tests/t0101-index.sh
@@ -1,15 +1,17 @@
 #!/bin/sh
 
 . ./setup.sh
 
 prepare_tests "Check content on index page"
 
 run_test 'generate index page' 'cgit_url "" >trash/tmp'
 run_test 'find foo repo' 'grep -e "foo" trash/tmp'
 run_test 'find foo description' 'grep -e "\[no description\]" trash/tmp'
 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 'no tree-link' '! grep -e "foo/tree" trash/tmp'
 run_test 'no log-link' '! grep -e "foo/log" trash/tmp'
 
 tests_done
diff --git a/tests/t0104-tree.sh b/tests/t0104-tree.sh
index 2516c72..0d62cc8 100755
--- a/tests/t0104-tree.sh
+++ b/tests/t0104-tree.sh
@@ -9,13 +9,25 @@ run_test 'find file-1' 'grep -e "file-1" trash/tmp'
 run_test 'find file-50' 'grep -e "file-50" trash/tmp'
 
 run_test 'generate bar/tree/file-50' 'cgit_url "bar/tree/file-50" >trash/tmp'
 
 run_test 'find line 1' '
         grep -e "<a id=.n1. name=.n1. href=.#n1.>1</a>" trash/tmp
 '
 
 run_test 'no line 2' '
         grep -e "<a id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp
 '
 
+run_test 'generate foo+bar/tree' 'cgit_url "foo%2bbar/tree" >trash/tmp'
+
+run_test 'verify a+b link' '
+        grep -e "/foo+bar/tree/a+b" trash/tmp
+'
+
+run_test 'generate foo+bar/tree?h=1+2' 'cgit_url "foo%2bbar/tree&h=1%2b2" >trash/tmp'
+
+run_test 'verify a+b?h=1+2 link' '
+        grep -e "/foo+bar/tree/a+b?h=1%2b2" trash/tmp
+'
+
 tests_done