diff options
Diffstat (limited to '')
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | cgit.css | 6 | ||||
| -rw-r--r-- | html.c | 2 | ||||
| -rw-r--r-- | tests/.gitignore | 2 | ||||
| -rw-r--r-- | tests/Makefile | 13 | ||||
| -rwxr-xr-x | tests/setup.sh | 108 | ||||
| -rwxr-xr-x | tests/t0010-validate-html.sh | 31 | ||||
| -rwxr-xr-x | tests/t0101-index.sh | 13 | ||||
| -rwxr-xr-x | tests/t0102-summary.sh | 20 | ||||
| -rwxr-xr-x | tests/t0103-log.sh | 15 | ||||
| -rwxr-xr-x | tests/t0104-tree.sh | 21 | ||||
| -rwxr-xr-x | tests/t0105-commit.sh | 22 | ||||
| -rwxr-xr-x | tests/t0106-diff.sh | 20 | ||||
| -rwxr-xr-x | tests/t0107-snapshot.sh | 36 | ||||
| -rw-r--r-- | ui-commit.c | 6 | ||||
| -rw-r--r-- | ui-diff.c | 2 | ||||
| -rw-r--r-- | ui-log.c | 2 | ||||
| -rw-r--r-- | ui-repolist.c | 2 | ||||
| -rw-r--r-- | ui-shared.c | 24 | ||||
| -rw-r--r-- | ui-snapshot.c | 1 | ||||
| -rw-r--r-- | ui-summary.c | 2 | ||||
| -rw-r--r-- | ui-tree.c | 6 |
22 files changed, 334 insertions, 25 deletions
@@ -24,7 +24,7 @@ ifdef NEEDS_LIBICONV endif -.PHONY: all git install clean distclean emptycache force-version get-git +.PHONY: all git test install clean distclean emptycache force-version get-git all: cgit git @@ -54,6 +54,9 @@ git: cd git && $(MAKE) xdiff/lib.a cd git && $(MAKE) libgit.a +test: all + $(MAKE) -C tests + install: all mkdir -p $(DESTDIR)$(CGIT_SCRIPT_PATH) install cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) @@ -111,7 +111,11 @@ div#sidebar div.infobox { div#sidebar div.infobox h1 { font-size: 10pt; font-weight: bold; - margin: 0px; + margin: 8px 0px 0px 0px; +} + +div#sidebar div.infobox h1.first { + margin-top: 0px; } div#sidebar div.infobox a.menu { @@ -132,7 +132,7 @@ void html_option(char *value, char *text, char *selected_value) html_attr(value); html("'"); if (selected_value && !strcmp(selected_value, value)) - html(" selected"); + html(" selected='selected'"); html(">"); html_txt(text); html("</option>\n"); diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 0000000..c1c1c0b --- /dev/null +++ b/tests/.gitignore @@ -0,0 +1,2 @@ +trash +test-output.log diff --git a/tests/Makefile b/tests/Makefile new file mode 100644 index 0000000..697e5a1 --- /dev/null +++ b/tests/Makefile @@ -0,0 +1,13 @@ + + +T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh) + +all: $(T) + +$(T): + @$@ + +clean: + $(RM) -rf trash + +.PHONY: $(T) clean diff --git a/tests/setup.sh b/tests/setup.sh new file mode 100755 index 0000000..51d5a75 --- /dev/null +++ b/tests/setup.sh @@ -0,0 +1,108 @@ +# This file should be sourced by all test-scripts +# +# Main functions: +# prepare_tests(description) - setup for testing, i.e. create repos+config +# run_test(description, script) - run one test, i.e. eval script +# +# Helper functions +# cgit_query(querystring) - call cgit with the specified querystring +# cgit_url(url) - call cgit with the specified virtual url +# +# 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 + 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 + 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 + cat >trash/cgitrc <<EOF +virtual-root=/ +cache-root=$PWD/trash/cache + +nocache=0 +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 +repo.desc=the foo repo + +repo.url=bar +repo.path=$PWD/trash/repos/bar/.git +repo.desc=the bar repo +EOF +} + +prepare_tests() +{ + setup_repos + test_count=0 + test_failed=0 + echo "$@" "($0)" +} + +tests_done() +{ + printf "\n" + if test $test_failed -gt 0 + then + printf "[%s of %s tests failed]\n" $test_failed $test_count + false + fi +} + +run_test() +{ + desc=$1 + script=$2 + ((test_count++)) + eval "$2" >test-output.log + res=$? + if test $res = 0 + then + printf " %s: ok - %s\n" $test_count "$desc" + else + ((test_failed++)) + printf " %s: fail - %s\n" $test_count "$desc" + 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/t0010-validate-html.sh b/tests/t0010-validate-html.sh new file mode 100755 index 0000000..907a415 --- /dev/null +++ b/tests/t0010-validate-html.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +. ./setup.sh + + +test_url() +{ + tidy_opt="-eq" + test -z "$NO_TIDY_WARNINGS" || tidy_opt+=" --show-warnings no" + cgit_url "$1" | sed -e "1,4d" >trash/tidy-$test_count + tidy $tidy_opt trash/tidy-$test_count + rc=$? + if test $rc = 2 + then + false + else + : + fi +} + +prepare_tests 'Validate html with tidy' + +run_test 'index page' 'test_url ""' +run_test 'foo' 'test_url "foo"' +run_test 'foo/log' 'test_url "foo/log"' +run_test 'foo/tree' 'test_url "foo/tree"' +run_test 'foo/tree/file-1' 'test_url "foo/tree/file-1"' +run_test 'foo/commit' 'test_url "foo/commit"' +run_test 'foo/diff' 'test_url "foo/diff"' + +tests_done diff --git a/tests/t0101-index.sh b/tests/t0101-index.sh new file mode 100755 index 0000000..12ed00c --- /dev/null +++ b/tests/t0101-index.sh @@ -0,0 +1,13 @@ +#!/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 bar repo' 'grep -e "bar" trash/tmp' +run_test 'no tree-link' 'grep -ve "foo/tree" trash/tmp' +run_test 'no log-link' 'grep -ve "foo/log" trash/tmp' + +tests_done diff --git a/tests/t0102-summary.sh b/tests/t0102-summary.sh new file mode 100755 index 0000000..7edd675 --- /dev/null +++ b/tests/t0102-summary.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +. ./setup.sh + +prepare_tests "Check content on summary page" + +run_test 'generate foo summary' 'cgit_url "foo" >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 'find branch master' 'grep -e "master" trash/tmp' +run_test 'no tags' 'grep -ve "tags" trash/tmp' + +run_test 'generate bar summary' 'cgit_url "bar" >trash/tmp' +run_test 'no commit 45' 'grep -ve "commit 45" trash/tmp' +run_test 'find commit 46' 'grep -e "commit 46" trash/tmp' +run_test 'find commit 50' 'grep -e "commit 50" trash/tmp' +run_test 'find branch master' 'grep -e "master" trash/tmp' +run_test 'no tags' 'grep -ve "tags" trash/tmp' + +tests_done diff --git a/tests/t0103-log.sh b/tests/t0103-log.sh new file mode 100755 index 0000000..b08cd29 --- /dev/null +++ b/tests/t0103-log.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +. ./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' + +tests_done diff --git a/tests/t0104-tree.sh b/tests/t0104-tree.sh new file mode 100755 index 0000000..2516c72 --- /dev/null +++ b/tests/t0104-tree.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +. ./setup.sh + +prepare_tests "Check content on tree page" + +run_test 'generate bar/tree' 'cgit_url "bar/tree" >trash/tmp' +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 +' + +tests_done diff --git a/tests/t0105-commit.sh b/tests/t0105-commit.sh new file mode 100755 index 0000000..aa2bf33 --- /dev/null +++ b/tests/t0105-commit.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +. ./setup.sh + +prepare_tests "Check content on commit page" + +run_test 'generate foo/commit' 'cgit_url "foo/commit" >trash/tmp' +run_test 'find tree link' 'grep -e "<a href=./foo/tree/.>" trash/tmp' +run_test 'find parent link' 'grep -E "<a href=./foo/commit/\?id=.+>" trash/tmp' + +run_test 'find commit subject' ' + grep -e "<div class=.commit-subject.>commit 5</div>" trash/tmp +' + +run_test 'find commit msg' 'grep -e "<div class=.commit-msg.></div>" trash/tmp' +run_test 'find diffstat' 'grep -e "<table summary=.diffstat. class=.diffstat.>" trash/tmp' + +run_test 'find diff summary' ' + grep -e "1 files changed, 1 insertions, 0 deletions" trash/tmp +' + +tests_done diff --git a/tests/t0106-diff.sh b/tests/t0106-diff.sh new file mode 100755 index 0000000..e140bcc --- /dev/null +++ b/tests/t0106-diff.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +. ./setup.sh + +prepare_tests "Check content on diff page" + +run_test 'generate foo/diff' 'cgit_url "foo/diff" >trash/tmp' +run_test 'find diff header' 'grep -e "a/file-5 b/file-5" trash/tmp' +run_test 'find blob link' 'grep -e "<a href=./foo/tree/file-5?id=" trash/tmp' +run_test 'find added file' 'grep -e "new file mode 100644" trash/tmp' + +run_test 'find hunk header' ' + grep -e "<div class=.hunk.>@@ -0,0 +1 @@</div>" trash/tmp +' + +run_test 'find added line' ' + grep -e "<div class=.add.>+5</div>" trash/tmp +' + +tests_done diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh new file mode 100755 index 0000000..8e90e10 --- /dev/null +++ b/tests/t0107-snapshot.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +. ./setup.sh + +prepare_tests "Verify snapshot" + +run_test 'get foo/snapshot/test.tar.gz' ' + cgit_url "foo/snapshot/test.tar.gz" >trash/tmp +' + +run_test 'check html headers' ' + head -n 1 trash/tmp | + grep -e "Content-Type: application/x-tar" && + + head -n 2 trash/tmp | + grep -e "Content-Disposition: inline; filename=.test.tar.gz." +' + +run_test 'strip off the header lines' ' + tail -n +6 trash/tmp > trash/test.tar.gz +' + +run_test 'verify gzip format' 'gunzip --test trash/test.tar.gz' +run_test 'untar' 'tar -xf trash/test.tar.gz -C trash' + +run_test 'count files' ' + c=$(ls -1 trash/foo/ | wc -l) && + test $c = 5 +' + +run_test 'verify untarred file-5' ' + grep -e "^5$" trash/foo/file-5 && + test $(cat trash/foo/file-5 | wc -l) = 1 +' + +tests_done diff --git a/ui-commit.c b/ui-commit.c index 4ac8955..bd55a33 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -84,7 +84,7 @@ void print_fileinfo(struct fileinfo *info) html("</td><td class='right'>"); htmlf("%d", info->added + info->removed); html("</td><td class='graph'>"); - htmlf("<table width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); + htmlf("<table summary='file diffstat' width='%d%%'><tr>", (max_changes > 100 ? 100 : max_changes)); htmlf("<td class='add' style='width: %.1f%%;'/>", info->added * 100.0 / max_changes); htmlf("<td class='rem' style='width: %.1f%%;'/>", @@ -157,7 +157,7 @@ void cgit_print_commit(char *hex) } info = cgit_parse_commit(commit); - html("<table class='commit-info'>\n"); + html("<table summary='commit info' class='commit-info'>\n"); html("<tr><th>author</th><td>"); html_txt(info->author); html(" "); @@ -209,7 +209,7 @@ void cgit_print_commit(char *hex) html("</div>"); if (!(commit->parents && commit->parents->next && commit->parents->next->next)) { html("<div class='diffstat-header'>Diffstat</div>"); - html("<table class='diffstat'>"); + html("<table summary='diffstat' class='diffstat'>"); max_changes = 0; cgit_diff_commit(commit, inspect_filepair); for(i = 0; i<files; i++) @@ -141,7 +141,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi if (!commit2 || parse_commit(commit2)) cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1))); } - html("<table class='diff'>"); + html("<table summary='diff' class='diff'>"); html("<tr><td>"); cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix); html("</td></tr>"); @@ -90,7 +90,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern } prepare_revision_walk(&rev); - html("<table class='list nowrap'>"); + html("<table summary='log' class='list nowrap'>"); html("<tr class='nohover'><th class='left'>Age</th>" "<th class='left'>Message</th>"); diff --git a/ui-repolist.c b/ui-repolist.c index 9aa5c1e..3e97ca9 100644 --- a/ui-repolist.c +++ b/ui-repolist.c @@ -53,7 +53,7 @@ void cgit_print_repolist(struct cacheitem *item) cgit_print_docstart(cgit_root_title, item); cgit_print_pageheader(cgit_root_title, 0); - html("<table class='list nowrap'>"); + html("<table summary='repository list' class='list nowrap'>"); if (cgit_index_header) { htmlf("<tr class='nohover'><td colspan='%d' class='include-block'>", columns); diff --git a/ui-shared.c b/ui-shared.c index 7c69f60..9ec646b 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -358,7 +358,7 @@ void cgit_print_docstart(char *title, struct cacheitem *item) ttl_seconds(item->ttl))); html("\n"); html(cgit_doctype); - html("<html>\n"); + html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); html("<head>\n"); html("<title>"); html_txt(title); @@ -373,7 +373,7 @@ void cgit_print_docstart(char *title, struct cacheitem *item) void cgit_print_docend() { - html("</td>\n</tr>\n<table>\n</body>\n</html>\n"); + html("</td>\n</tr>\n</table>\n</body>\n</html>\n"); } int print_branch_option(const char *refname, const unsigned char *sha1, @@ -456,21 +456,21 @@ void cgit_print_pageheader(char *title, int show_search) int header = 0; html("<div id='sidebar'>\n"); - html("<a href='"); + html("<div id='logo'><a href='"); html_attr(cgit_rooturl()); - htmlf("'><div id='logo'><img src='%s' alt='cgit'/></div></a>\n", + htmlf("'><img src='%s' alt='cgit'/></a></div>\n", cgit_logo); html("<div class='infobox'>"); if (cgit_query_repo) { - html("<h1>"); + html("<h1 class='first'>"); html_txt(strrpart(cgit_repo->name, 20)); html("</h1>\n"); html_txt(cgit_repo->desc); if (cgit_repo->owner) { - html("<p>\n<h1>owner</h1>\n"); + html("<h1>owner</h1>\n"); html_txt(cgit_repo->owner); } - html("<p>\n<h1>navigate</h1>\n"); + html("<h1>navigate</h1>\n"); reporevlink(NULL, "summary", NULL, "menu", cgit_query_head, NULL, NULL); cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL, @@ -484,19 +484,19 @@ void cgit_print_pageheader(char *title, int show_search) for_each_ref(print_archive_ref, &header); - html("<p>\n<h1>branch</h1>\n"); + html("<h1>branch</h1>\n"); html("<form method='get' action=''>\n"); add_hidden_formfields(0, 1, cgit_query_page); - html("<table class='grid'><tr><td id='branch-dropdown-cell'>"); + html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>"); html("<select name='h' onchange='this.form.submit();'>\n"); for_each_branch_ref(print_branch_option, cgit_query_head); html("</select>\n"); html("</td><td>"); - html("<noscript><input type='submit' id='switch-btn' value='..'></noscript>\n"); + html("<noscript><input type='submit' id='switch-btn' value='..'/></noscript>\n"); html("</td></tr></table>"); html("</form>\n"); - html("<p>\n<h1>search</h1>\n"); + html("<h1>search</h1>\n"); html("<form method='get' action='"); if (cgit_virtual_root) html_attr(cgit_fileurl(cgit_query_repo, "log", @@ -519,7 +519,7 @@ void cgit_print_pageheader(char *title, int show_search) html("</div>\n"); - html("</div>\n<table class='grid'><tr><td id='content'>\n"); + html("</div>\n<table summary='page content' class='grid'><tr><td id='content'>\n"); } diff --git a/ui-snapshot.c b/ui-snapshot.c index bd34a28..4d1aa88 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -99,6 +99,7 @@ void cgit_print_snapshot(struct cacheitem *item, const char *head, memset(&args,0,sizeof(args)); args.base = fmt("%s/", prefix); args.tree = commit->tree; + args.time = commit->date; cgit_print_snapshot_start(sat->mimetype, filename, item); (*sat->write_func)(&args); return; diff --git a/ui-summary.c b/ui-summary.c index c856793..b96414e 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -190,7 +190,7 @@ void cgit_print_summary() if (cgit_summary_log > 0) cgit_print_log(cgit_query_head, 0, cgit_summary_log, NULL, NULL, NULL, 0); - html("<table class='list nowrap'>"); + html("<table summary='repository info' class='list nowrap'>"); if (cgit_summary_log > 0) html("<tr class='nohover'><td colspan='4'> </td></tr>"); cgit_print_branches(cgit_summary_branches); @@ -17,7 +17,7 @@ static void print_object(const unsigned char *sha1, char *path) enum object_type type; char *buf; unsigned long size, lineno, start, idx; - const char *linefmt = "<tr><td class='no'><a name='%1$d'>%1$d</a></td><td class='txt'>"; + const char *linefmt = "<tr><td class='no'><a id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a></td><td class='txt'>"; type = sha1_object_info(sha1, &size); if (type == OBJ_BAD) { @@ -37,7 +37,7 @@ static void print_object(const unsigned char *sha1, char *path) html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); htmlf("'>%s</a>",sha1_to_hex(sha1)); - html("<table class='blob'>\n"); + html("<table summary='blob content' class='blob'>\n"); idx = 0; start = 0; lineno = 0; @@ -108,7 +108,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, static void ls_head() { - html("<table class='list'>\n"); + html("<table summary='tree listing' class='list'>\n"); html("<tr class='nohover'>"); html("<th class='left'>Mode</th>"); html("<th class='left'>Name</th>"); |