author | Lars Hjemli <hjemli@gmail.com> | 2011-05-22 10:22:56 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-05-23 20:58:35 (UTC) |
commit | 084ca50972b4be120eba8d22ce585766ae315c36 (patch) (unidiff) | |
tree | 2121925ba34a7f5821567c56a16ae6d8c92b46f7 | |
parent | afe04daa3380ae144c2c9b486674c98e5dd082a3 (diff) | |
download | cgit-084ca50972b4be120eba8d22ce585766ae315c36.zip cgit-084ca50972b4be120eba8d22ce585766ae315c36.tar.gz cgit-084ca50972b4be120eba8d22ce585766ae315c36.tar.bz2 |
tests: add tests for links with space in path and/or args
These tests tries to detect bad links in various pages. On the log page,
there currently exists links which are not properly escaped due to the
use of cgit_fileurl() when building the link. For now, this bug is simply
tagged as such.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rwxr-xr-x | tests/setup.sh | 11 | ||||
-rwxr-xr-x | tests/t0101-index.sh | 1 | ||||
-rwxr-xr-x | tests/t0103-log.sh | 10 |
3 files changed, 19 insertions, 3 deletions
diff --git a/tests/setup.sh b/tests/setup.sh index 9f66d89..b2f1169 100755 --- a/tests/setup.sh +++ b/tests/setup.sh | |||
@@ -7,87 +7,92 @@ | |||
7 | # Helper functions | 7 | # Helper functions |
8 | # cgit_query(querystring) - call cgit with the specified querystring | 8 | # cgit_query(querystring) - call cgit with the specified querystring |
9 | # cgit_url(url) - call cgit with the specified virtual url | 9 | # cgit_url(url) - call cgit with the specified virtual url |
10 | # | 10 | # |
11 | # Example script: | 11 | # Example script: |
12 | # | 12 | # |
13 | # . setup.sh | 13 | # . setup.sh |
14 | # prepare_tests "html validation" | 14 | # prepare_tests "html validation" |
15 | # run_test 'repo index' 'cgit_url "/" | tidy -e' | 15 | # run_test 'repo index' 'cgit_url "/" | tidy -e' |
16 | # run_test 'repo summary' 'cgit_url "/foo" | tidy -e' | 16 | # run_test 'repo summary' 'cgit_url "/foo" | tidy -e' |
17 | 17 | ||
18 | 18 | ||
19 | mkrepo() { | 19 | mkrepo() { |
20 | name=$1 | 20 | name=$1 |
21 | count=$2 | 21 | count=$2 |
22 | dir=$PWD | 22 | dir=$PWD |
23 | test -d $name && return | 23 | test -d "$name" && return |
24 | printf "Creating testrepo %s\n" $name | 24 | printf "Creating testrepo %s\n" $name |
25 | mkdir -p $name | 25 | mkdir -p "$name" |
26 | cd $name | 26 | cd "$name" |
27 | git init | 27 | git init |
28 | n=1 | 28 | n=1 |
29 | while test $n -le $count | 29 | while test $n -le $count |
30 | do | 30 | do |
31 | echo $n >file-$n | 31 | echo $n >file-$n |
32 | git add file-$n | 32 | git add file-$n |
33 | git commit -m "commit $n" | 33 | git commit -m "commit $n" |
34 | n=$(expr $n + 1) | 34 | n=$(expr $n + 1) |
35 | done | 35 | done |
36 | if test "$3" = "testplus" | 36 | if test "$3" = "testplus" |
37 | then | 37 | then |
38 | echo "hello" >a+b | 38 | echo "hello" >a+b |
39 | git add a+b | 39 | git add a+b |
40 | git commit -m "add a+b" | 40 | git commit -m "add a+b" |
41 | git branch "1+2" | 41 | git branch "1+2" |
42 | fi | 42 | fi |
43 | cd $dir | 43 | cd $dir |
44 | } | 44 | } |
45 | 45 | ||
46 | setup_repos() | 46 | setup_repos() |
47 | { | 47 | { |
48 | rm -rf trash/cache | 48 | rm -rf trash/cache |
49 | mkdir -p trash/cache | 49 | mkdir -p trash/cache |
50 | mkrepo trash/repos/foo 5 >/dev/null | 50 | mkrepo trash/repos/foo 5 >/dev/null |
51 | mkrepo trash/repos/bar 50 >/dev/null | 51 | mkrepo trash/repos/bar 50 >/dev/null |
52 | mkrepo trash/repos/foo+bar 10 testplus >/dev/null | 52 | mkrepo trash/repos/foo+bar 10 testplus >/dev/null |
53 | mkrepo "trash/repos/with space" 2 >/dev/null | ||
53 | cat >trash/cgitrc <<EOF | 54 | cat >trash/cgitrc <<EOF |
54 | virtual-root=/ | 55 | virtual-root=/ |
55 | cache-root=$PWD/trash/cache | 56 | cache-root=$PWD/trash/cache |
56 | 57 | ||
57 | cache-size=1021 | 58 | cache-size=1021 |
58 | snapshots=tar.gz tar.bz zip | 59 | snapshots=tar.gz tar.bz zip |
59 | enable-log-filecount=1 | 60 | enable-log-filecount=1 |
60 | enable-log-linecount=1 | 61 | enable-log-linecount=1 |
61 | summary-log=5 | 62 | summary-log=5 |
62 | summary-branches=5 | 63 | summary-branches=5 |
63 | summary-tags=5 | 64 | summary-tags=5 |
64 | 65 | ||
65 | repo.url=foo | 66 | repo.url=foo |
66 | repo.path=$PWD/trash/repos/foo/.git | 67 | repo.path=$PWD/trash/repos/foo/.git |
67 | # Do not specify a description for this repo, as it then will be assigned | 68 | # Do not specify a description for this repo, as it then will be assigned |
68 | # the constant value "[no description]" (which actually used to cause a | 69 | # the constant value "[no description]" (which actually used to cause a |
69 | # segfault). | 70 | # segfault). |
70 | 71 | ||
71 | repo.url=bar | 72 | repo.url=bar |
72 | repo.path=$PWD/trash/repos/bar/.git | 73 | repo.path=$PWD/trash/repos/bar/.git |
73 | repo.desc=the bar repo | 74 | repo.desc=the bar repo |
74 | 75 | ||
75 | repo.url=foo+bar | 76 | repo.url=foo+bar |
76 | repo.path=$PWD/trash/repos/foo+bar/.git | 77 | repo.path=$PWD/trash/repos/foo+bar/.git |
77 | repo.desc=the foo+bar repo | 78 | repo.desc=the foo+bar repo |
79 | |||
80 | repo.url=with space | ||
81 | repo.path=$PWD/trash/repos/with space/.git | ||
82 | repo.desc=spaced repo | ||
78 | EOF | 83 | EOF |
79 | } | 84 | } |
80 | 85 | ||
81 | prepare_tests() | 86 | prepare_tests() |
82 | { | 87 | { |
83 | setup_repos | 88 | setup_repos |
84 | rm -f test-output.log 2>/dev/null | 89 | rm -f test-output.log 2>/dev/null |
85 | test_count=0 | 90 | test_count=0 |
86 | test_failed=0 | 91 | test_failed=0 |
87 | echo "[$0]" "$@" >test-output.log | 92 | echo "[$0]" "$@" >test-output.log |
88 | echo "$@" "($0)" | 93 | echo "$@" "($0)" |
89 | } | 94 | } |
90 | 95 | ||
91 | tests_done() | 96 | tests_done() |
92 | { | 97 | { |
93 | printf "\n" | 98 | printf "\n" |
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 | |||
@@ -1,17 +1,18 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | . ./setup.sh | 3 | . ./setup.sh |
4 | 4 | ||
5 | prepare_tests "Check content on index page" | 5 | prepare_tests "Check content on index page" |
6 | 6 | ||
7 | run_test 'generate index page' 'cgit_url "" >trash/tmp' | 7 | run_test 'generate index page' 'cgit_url "" >trash/tmp' |
8 | run_test 'find foo repo' 'grep -e "foo" trash/tmp' | 8 | run_test 'find foo repo' 'grep -e "foo" trash/tmp' |
9 | run_test 'find foo description' 'grep -e "\[no description\]" trash/tmp' | 9 | run_test 'find foo description' 'grep -e "\[no description\]" trash/tmp' |
10 | run_test 'find bar repo' 'grep -e "bar" trash/tmp' | 10 | run_test 'find bar repo' 'grep -e "bar" trash/tmp' |
11 | run_test 'find bar description' 'grep -e "the bar repo" trash/tmp' | 11 | run_test 'find bar description' 'grep -e "the bar repo" trash/tmp' |
12 | run_test 'find foo+bar repo' 'grep -e ">foo+bar<" trash/tmp' | 12 | run_test 'find foo+bar repo' 'grep -e ">foo+bar<" trash/tmp' |
13 | run_test 'verify foo+bar link' 'grep -e "/foo+bar/" trash/tmp' | 13 | run_test 'verify foo+bar link' 'grep -e "/foo+bar/" trash/tmp' |
14 | run_test 'verify "with%20space" link' 'grep -e "/with%20space/" trash/tmp' | ||
14 | run_test 'no tree-link' '! grep -e "foo/tree" trash/tmp' | 15 | run_test 'no tree-link' '! grep -e "foo/tree" trash/tmp' |
15 | run_test 'no log-link' '! grep -e "foo/log" trash/tmp' | 16 | run_test 'no log-link' '! grep -e "foo/log" trash/tmp' |
16 | 17 | ||
17 | tests_done | 18 | tests_done |
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 | |||
@@ -1,15 +1,25 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | . ./setup.sh | 3 | . ./setup.sh |
4 | 4 | ||
5 | prepare_tests "Check content on log page" | 5 | prepare_tests "Check content on log page" |
6 | 6 | ||
7 | run_test 'generate foo/log' 'cgit_url "foo/log" >trash/tmp' | 7 | run_test 'generate foo/log' 'cgit_url "foo/log" >trash/tmp' |
8 | run_test 'find commit 1' 'grep -e "commit 1" trash/tmp' | 8 | run_test 'find commit 1' 'grep -e "commit 1" trash/tmp' |
9 | run_test 'find commit 5' 'grep -e "commit 5" trash/tmp' | 9 | run_test 'find commit 5' 'grep -e "commit 5" trash/tmp' |
10 | 10 | ||
11 | run_test 'generate bar/log' 'cgit_url "bar/log" >trash/tmp' | 11 | run_test 'generate bar/log' 'cgit_url "bar/log" >trash/tmp' |
12 | run_test 'find commit 1' 'grep -e "commit 1" trash/tmp' | 12 | run_test 'find commit 1' 'grep -e "commit 1" trash/tmp' |
13 | run_test 'find commit 50' 'grep -e "commit 50" trash/tmp' | 13 | run_test 'find commit 50' 'grep -e "commit 50" trash/tmp' |
14 | 14 | ||
15 | run_test 'generate "with%20space/log?qt=grep&q=commit+1"' ' | ||
16 | cgit_url "with+space/log&qt=grep&q=commit+1" >trash/tmp | ||
17 | ' | ||
18 | run_test 'find commit 1' 'grep -e "commit 1" trash/tmp' | ||
19 | run_test 'find link with %20 in path' 'grep -e "/with%20space/log/?qt=grep" trash/tmp' | ||
20 | run_test 'find link with + in arg' 'grep -e "/log/?qt=grep&q=commit+1" trash/tmp' | ||
21 | run_test BUG 'no links with space in path' '! grep -e "href=./with space/" trash/tmp' | ||
22 | run_test 'no links with space in arg' '! grep -e "q=commit 1" trash/tmp' | ||
23 | run_test 'commit 2 is not visible' '! grep -e "commit 2" trash/tmp' | ||
24 | |||
15 | tests_done | 25 | tests_done |