| -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 @@ -11,28 +11,28 @@ # Example script: # # . setup.sh # prepare_tests "html validation" # run_test 'repo index' 'cgit_url "/" | tidy -e' # run_test 'repo summary' 'cgit_url "/foo" | tidy -e' 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 do echo $n >file-$n git add file-$n git commit -m "commit $n" n=$(expr $n + 1) done if test "$3" = "testplus" then echo "hello" >a+b @@ -41,24 +41,25 @@ mkrepo() { 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 + mkrepo "trash/repos/with space" 2 >/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 @@ -66,24 +67,28 @@ 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 + +repo.url=with space +repo.path=$PWD/trash/repos/with space/.git +repo.desc=spaced 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)" } 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 @@ -2,16 +2,17 @@ . ./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 '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' 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 @@ -3,13 +3,23 @@ . ./setup.sh prepare_tests "Check content on log page" run_test 'generate foo/log' 'cgit_url "foo/log" >trash/tmp' run_test 'find commit 1' 'grep -e "commit 1" trash/tmp' run_test 'find commit 5' 'grep -e "commit 5" trash/tmp' 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 |