Diff options
Diffstat (limited to 'tests/t0206-trailers.sh')
| -rwxr-xr-x | tests/t0206-trailers.sh | 16 |
1 file changed, 8 insertions, 8 deletions
diff --git a/tests/t0206-trailers.sh b/tests/t0206-trailers.sh index 5e10dfc..61fba94 100755 --- a/tests/t0206-trailers.sh +++ b/tests/t0206-trailers.sh @@ -1,11 +1,11 @@ #!/bin/sh # The trailer table on the commit page. A commit whose message ends in a -# trailer block is rendered with enable-trailers on, through the exec dump -# filter as both trailer filter and email filter so the arguments each one -# receives show in the page, then with the flag off globally and off for the -# one repository. The repository carries a mailmap, so the sign-off idents are -# checked to follow it. A commit with no block is checked to get no table. +# trailer block is rendered with enable-commit-trailers on, through the exec +# dump filter as both trailer filter and email filter so the arguments each +# one receives show in the page, then with the flag off globally and off for +# the one repository. The repository carries a mailmap, so the sign-off idents +# are checked to follow it. A commit with no block is checked to get no table. test_description='Check the commit trailers table' CGIT_TEST_NO_CREATE_REPOS=YesPlease @@ -41,7 +41,7 @@ test_expect_success 'point cgit at it with trailers on and the dump filters' ' cat >cgitrc <<-EOF && virtual-root=/ cache-size=0 - enable-trailers=1 + enable-commit-trailers=1 repo.url=trailers repo.path=$PWD/repos/trailers/.git repo.trailer-filter=exec:$FILTER_DIRECTORY/dump.sh @@ -86,14 +86,14 @@ test_expect_success 'a message with no block gets no table' ' ' test_expect_success 'with the flag off the message stays whole' ' - sed "s/^enable-trailers=1/enable-trailers=0/" cgitrc >cgitrc-off && + sed "s/^enable-commit-trailers=1/enable-commit-trailers=0/" cgitrc >cgitrc-off && CGIT_CONFIG="$PWD/cgitrc-off" QUERY_STRING="url=trailers/commit/" cgit >tmp && ! grep "commit-trailers" tmp && grep "Signed-off-by: A U Thor" tmp ' test_expect_success 'the repository flag overrides the global one' ' - echo "repo.enable-trailers=0" >>cgitrc && + echo "repo.enable-commit-trailers=0" >>cgitrc && cgit_url "trailers/commit/" >tmp && ! grep "commit-trailers" tmp && grep "Signed-off-by: A U Thor" tmp |