Diff options
| author | Lars Hjemli <hjemli@gmail.com> | |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | |
| commit | ||
| parent | ||
| parent | ||
| tree | ||
| download | ||
Merge branch 'lh/escape-urls'
* lh/escape-urls:
ui-shared.c: use html_url_arg()
html.c: add html_url_arg
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/setup.sh | 13 | |
| -rwxr-xr-x | tests/t0101-index.sh | 2 | |
| -rwxr-xr-x | tests/t0104-tree.sh | 12 |
3 files changed, 26 insertions, 1 deletion
diff --git a/tests/setup.sh b/tests/setup.sh index e37306e..1457dd5 100755 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -31,6 +31,13 @@ mkrepo() { 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 } @@ -40,6 +47,7 @@ setup_repos() 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 @@ -61,6 +69,10 @@ repo.path=$PWD/trash/repos/foo/.git 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 } @@ -113,4 +125,3 @@ 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 @@ -9,6 +9,8 @@ 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' 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 @@ -18,4 +18,16 @@ 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 |