From 3741254a6989b2837cd8d20480f152f0096bcb9a Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Wed, 15 Jan 2014 23:11:19 +0100 Subject: t0111: Additions and fixes * Rename the capitalize-* filters to dump.* since they also dump the arguments. * Add full argument validation to the email filters. Signed-off-by: Lukas Fleischer --- tests/filters/capitalize-buffer.lua | 17 ----------------- tests/filters/capitalize-stdin.sh | 4 ---- tests/filters/dump.lua | 17 +++++++++++++++++ tests/filters/dump.sh | 4 ++++ tests/setup.sh | 16 ++++++++-------- tests/t0111-filter.sh | 4 ++-- 6 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 tests/filters/capitalize-buffer.lua delete mode 100755 tests/filters/capitalize-stdin.sh create mode 100644 tests/filters/dump.lua create mode 100755 tests/filters/dump.sh 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 deleted file mode 100755 index da6f7a1..0000000 --- a/tests/filters/capitalize-stdin.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -[ "$#" -gt 0 ] && printf "%s " "$*" -tr '[:lower:]' '[:upper:]' diff --git a/tests/filters/dump.lua b/tests/filters/dump.lua new file mode 100644 index 0000000..1f15c93 --- /dev/null +++ b/tests/filters/dump.lua @@ -0,0 +1,17 @@ +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/dump.sh b/tests/filters/dump.sh new file mode 100755 index 0000000..da6f7a1 --- /dev/null +++ b/tests/filters/dump.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +[ "$#" -gt 0 ] && printf "%s " "$*" +tr '[:lower:]' '[:upper:]' diff --git a/tests/setup.sh b/tests/setup.sh index 12c97f5..785edd7 100755 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -128,19 +128,19 @@ repo.desc=spaced repo repo.url=filter-exec 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.source-filter=exec:$FILTER_DIRECTORY/capitalize-stdin.sh +repo.about-filter=exec:$FILTER_DIRECTORY/dump.sh +repo.commit-filter=exec:$FILTER_DIRECTORY/dump.sh +repo.email-filter=exec:$FILTER_DIRECTORY/dump.sh +repo.source-filter=exec:$FILTER_DIRECTORY/dump.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.about-filter=lua:$FILTER_DIRECTORY/dump.lua +repo.commit-filter=lua:$FILTER_DIRECTORY/dump.lua +repo.email-filter=lua:$FILTER_DIRECTORY/dump.lua +repo.source-filter=lua:$FILTER_DIRECTORY/dump.lua repo.readme=master:a+b EOF } diff --git a/tests/t0111-filter.sh b/tests/t0111-filter.sh index c89020a..730f1c0 100755 --- a/tests/t0111-filter.sh +++ b/tests/t0111-filter.sh @@ -30,11 +30,11 @@ do ' test_expect_success "check whether the $prefix email filter works for authors" ' - grep "A U THOR <AUTHOR@EXAMPLE.COM>" tmp + grep " commit A U THOR <AUTHOR@EXAMPLE.COM>" tmp ' test_expect_success "check whether the $prefix email filter works for committers" ' - grep "C O MITTER <COMMITTER@EXAMPLE.COM>" tmp + grep " commit C O MITTER <COMMITTER@EXAMPLE.COM>" tmp ' done -- cgit 1.4.1-21-gabe81