summaryrefslogtreecommitdiffabout
path: root/tests
authorLars Hjemli <hjemli@gmail.com>2008-10-05 11:13:33 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-10-05 11:13:33 (UTC)
commit20c895f6889a66d7cf43c67a7c22df6ef324ed5d (patch) (unidiff)
tree4fc0c044fa0919cab562b371191add67114d07a9 /tests
parent204669ff4a4028a82cc48e9319632595ba3ff703 (diff)
parentb575115d9d93e45cdbcd5d066cc445d34639ae6a (diff)
downloadcgit-20c895f6889a66d7cf43c67a7c22df6ef324ed5d.zip
cgit-20c895f6889a66d7cf43c67a7c22df6ef324ed5d.tar.gz
cgit-20c895f6889a66d7cf43c67a7c22df6ef324ed5d.tar.bz2
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') (more/less context) (ignore whitespace changes)
-rwxr-xr-xtests/setup.sh13
-rwxr-xr-xtests/t0101-index.sh2
-rwxr-xr-xtests/t0104-tree.sh12
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
@@ -31,6 +31,13 @@ mkrepo() {
31 git add file-$n 31 git add file-$n
32 git commit -m "commit $n" 32 git commit -m "commit $n"
33 done 33 done
34 if test "$3" = "testplus"
35 then
36 echo "hello" >a+b
37 git add a+b
38 git commit -m "add a+b"
39 git branch "1+2"
40 fi
34 cd $dir 41 cd $dir
35} 42}
36 43
@@ -40,6 +47,7 @@ setup_repos()
40 mkdir -p trash/cache 47 mkdir -p trash/cache
41 mkrepo trash/repos/foo 5 >/dev/null 48 mkrepo trash/repos/foo 5 >/dev/null
42 mkrepo trash/repos/bar 50 >/dev/null 49 mkrepo trash/repos/bar 50 >/dev/null
50 mkrepo trash/repos/foo+bar 10 testplus >/dev/null
43 cat >trash/cgitrc <<EOF 51 cat >trash/cgitrc <<EOF
44virtual-root=/ 52virtual-root=/
45cache-root=$PWD/trash/cache 53cache-root=$PWD/trash/cache
@@ -61,6 +69,10 @@ repo.path=$PWD/trash/repos/foo/.git
61repo.url=bar 69repo.url=bar
62repo.path=$PWD/trash/repos/bar/.git 70repo.path=$PWD/trash/repos/bar/.git
63repo.desc=the bar repo 71repo.desc=the bar repo
72
73repo.url=foo+bar
74repo.path=$PWD/trash/repos/foo+bar/.git
75repo.desc=the foo+bar repo
64EOF 76EOF
65} 77}
66 78
@@ -113,4 +125,3 @@ cgit_url()
113{ 125{
114 CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit" 126 CGIT_CONFIG="$PWD/trash/cgitrc" QUERY_STRING="url=$1" "$PWD/../cgit"
115} 127}
116
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'
9run_test 'find foo description' 'grep -e "\[no description\]" trash/tmp' 9run_test 'find foo description' 'grep -e "\[no description\]" trash/tmp'
10run_test 'find bar repo' 'grep -e "bar" trash/tmp' 10run_test 'find bar repo' 'grep -e "bar" trash/tmp'
11run_test 'find bar description' 'grep -e "the bar repo" trash/tmp' 11run_test 'find bar description' 'grep -e "the bar repo" trash/tmp'
12run_test 'find foo+bar repo' 'grep -e ">foo+bar<" trash/tmp'
13run_test 'verify foo+bar link' 'grep -e "/foo+bar/" trash/tmp'
12run_test 'no tree-link' '! grep -e "foo/tree" trash/tmp' 14run_test 'no tree-link' '! grep -e "foo/tree" trash/tmp'
13run_test 'no log-link' '! grep -e "foo/log" trash/tmp' 15run_test 'no log-link' '! grep -e "foo/log" trash/tmp'
14 16
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' '
18 grep -e "<a id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp 18 grep -e "<a id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp
19' 19'
20 20
21run_test 'generate foo+bar/tree' 'cgit_url "foo%2bbar/tree" >trash/tmp'
22
23run_test 'verify a+b link' '
24 grep -e "/foo+bar/tree/a+b" trash/tmp
25'
26
27run_test 'generate foo+bar/tree?h=1+2' 'cgit_url "foo%2bbar/tree&h=1%2b2" >trash/tmp'
28
29run_test 'verify a+b?h=1+2 link' '
30 grep -e "/foo+bar/tree/a+b?h=1%2b2" trash/tmp
31'
32
21tests_done 33tests_done