| -rwxr-xr-x | tests/filters/capitalize-argv1.sh | 3 | ||||
| -rw-r--r-- | tests/filters/capitalize-buffer.lua | 17 | ||||
| -rwxr-xr-x | tests/filters/capitalize-stdin.sh | 1 | ||||
| -rwxr-xr-x | tests/setup.sh | 13 | ||||
| -rwxr-xr-x | tests/t0111-filter.sh | 51 |
5 files changed, 29 insertions, 56 deletions
diff --git a/tests/filters/capitalize-argv1.sh b/tests/filters/capitalize-argv1.sh new file mode 100755 index 0000000..2ea0098 --- /dev/null +++ b/tests/filters/capitalize-argv1.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "$1" | tr '[:lower:]' '[:upper:]' diff --git a/tests/filters/capitalize-buffer.lua b/tests/filters/capitalize-buffer.lua deleted file mode 100644 index 1f15c93..0000000 --- a/tests/filters/capitalize-buffer.lua +++ /dev/null @@ -1,17 +0,0 @@ -function filter_open(...) - buffer = "" - for i = 1, select("#", ...) do - buffer = buffer .. select(i, ...) .. " " - end -end - -function filter_close() - html(buffer) - return 0 -end - -function filter_write(str) - buffer = buffer .. string.upper(str) -end - - diff --git a/tests/filters/capitalize-stdin.sh b/tests/filters/capitalize-stdin.sh index da6f7a1..c9f4719 100755 --- a/tests/filters/capitalize-stdin.sh +++ b/tests/filters/capitalize-stdin.sh @@ -1,4 +1,3 @@ #!/bin/sh -[ "$#" -gt 0 ] && printf "%s " "$*" tr '[:lower:]' '[:upper:]' diff --git a/tests/setup.sh b/tests/setup.sh index 12c97f5..861f48a 100755 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -125,23 +125,14 @@ repo.url=with space repo.path=$PWD/repos/with space/.git repo.desc=spaced repo -repo.url=filter-exec +repo.url=filter repo.path=$PWD/repos/filter/.git repo.desc=filtered repo repo.about-filter=exec:$FILTER_DIRECTORY/capitalize-stdin.sh repo.commit-filter=exec:$FILTER_DIRECTORY/capitalize-stdin.sh -repo.email-filter=exec:$FILTER_DIRECTORY/capitalize-stdin.sh +repo.email-filter=exec:$FILTER_DIRECTORY/capitalize-argv1.sh repo.source-filter=exec:$FILTER_DIRECTORY/capitalize-stdin.sh repo.readme=master:a+b - -repo.url=filter-lua -repo.path=$PWD/repos/filter/.git -repo.desc=filtered repo -repo.about-filter=lua:$FILTER_DIRECTORY/capitalize-buffer.lua -repo.commit-filter=lua:$FILTER_DIRECTORY/capitalize-buffer.lua -repo.email-filter=lua:$FILTER_DIRECTORY/capitalize-buffer.lua -repo.source-filter=lua:$FILTER_DIRECTORY/capitalize-buffer.lua -repo.readme=master:a+b EOF } diff --git a/tests/t0111-filter.sh b/tests/t0111-filter.sh index c89020a..2f99880 100755 --- a/tests/t0111-filter.sh +++ b/tests/t0111-filter.sh @@ -3,39 +3,36 @@ test_description='Check filtered content' . ./setup.sh -for prefix in exec lua -do - test_expect_success "generate filter-$prefix/tree/a%2bb" " - cgit_url 'filter-$prefix/tree/a%2bb' >tmp - " +test_expect_success 'generate filter/tree/a%2bb' ' + cgit_url "filter/tree/a%2bb" >tmp +' - test_expect_success "check whether the $prefix source filter works" ' - grep "<code>a+b HELLO$" tmp - ' +test_expect_success 'check whether the source filter works' ' + grep "<code>HELLO$" tmp +' - test_expect_success "generate filter-$prefix/about/" " - cgit_url 'filter-$prefix/about/' >tmp - " +test_expect_success 'generate filter/about/' ' + cgit_url "filter/about/" >tmp +' - test_expect_success "check whether the $prefix about filter works" ' - grep "<div id='"'"'summary'"'"'>a+b HELLO$" tmp - ' +test_expect_success 'check whether the about filter works' ' + grep "<div id='"'"'summary'"'"'>HELLO$" tmp +' - test_expect_success "generate filter-$prefix/commit/" " - cgit_url 'filter-$prefix/commit/' >tmp - " +test_expect_success 'generate filter/commit/' ' + cgit_url "filter/commit/" >tmp +' - test_expect_success "check whether the $prefix commit filter works" ' - grep "<div class='"'"'commit-subject'"'"'>ADD A+B" tmp - ' +test_expect_success 'check whether the commit filter works' ' + grep "<div class='"'"'commit-subject'"'"'>ADD A+B" tmp +' - test_expect_success "check whether the $prefix email filter works for authors" ' - grep "A U THOR <AUTHOR@EXAMPLE.COM>" tmp - ' +test_expect_success 'check whether the email filter works for authors' ' + grep "<AUTHOR@EXAMPLE.COM>" tmp +' - test_expect_success "check whether the $prefix email filter works for committers" ' - grep "C O MITTER <COMMITTER@EXAMPLE.COM>" tmp - ' -done +test_expect_success 'check whether the email filter works for committers' ' + grep "<COMMITTER@EXAMPLE.COM>" tmp +' test_done |