1 file changed, 16 insertions, 17 deletions

diff --git a/tests/t0103-log.sh b/tests/t0103-log.shindex 67fcba0..bdf1435 100755--- a/tests/t0103-log.sh+++ b/tests/t0103-log.sh@@ -1,25 +1,24 @@ #!/bin/sh +test_description='Check content on log page' . ./setup.sh -prepare_tests "Check content on log page"+test_expect_success 'generate foo/log' 'cgit_url "foo/log" >tmp'+test_expect_success 'find commit 1' 'grep "commit 1" tmp'+test_expect_success 'find commit 5' 'grep "commit 5" tmp' -run_test 'generate foo/log' 'cgit_url "foo/log" >trash/tmp'-run_test 'find commit 1' 'grep "commit 1" trash/tmp'-run_test 'find commit 5' 'grep "commit 5" trash/tmp'+test_expect_success 'generate bar/log' 'cgit_url "bar/log" >tmp'+test_expect_success 'find commit 1' 'grep "commit 1" tmp'+test_expect_success 'find commit 50' 'grep "commit 50" tmp' -run_test 'generate bar/log' 'cgit_url "bar/log" >trash/tmp'-run_test 'find commit 1' 'grep "commit 1" trash/tmp'-run_test 'find commit 50' 'grep "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+test_expect_success 'generate "with%20space/log?qt=grep&q=commit+1"' '+	cgit_url "with+space/log&qt=grep&q=commit+1" >tmp '-run_test 'find commit 1' 'grep "commit 1" trash/tmp'-run_test 'find link with %20 in path' 'grep "/with%20space/log/?qt=grep" trash/tmp'-run_test 'find link with + in arg' 'grep "/log/?qt=grep&q=commit+1" trash/tmp'-run_test 'no links with space in path' '! grep "href=./with space/" trash/tmp'-run_test 'no links with space in arg' '! grep "q=commit 1" trash/tmp'-run_test 'commit 2 is not visible' '! grep "commit 2" trash/tmp'+test_expect_success 'find commit 1' 'grep "commit 1" tmp'+test_expect_success 'find link with %20 in path' 'grep "/with%20space/log/?qt=grep" tmp'+test_expect_success 'find link with + in arg' 'grep "/log/?qt=grep&q=commit+1" tmp'+test_expect_success 'no links with space in path' '! grep "href=./with space/" tmp'+test_expect_success 'no links with space in arg' '! grep "q=commit 1" tmp'+test_expect_success 'commit 2 is not visible' '! grep "commit 2" tmp' -tests_done+test_done
diff --git a/tests/t0103-log.sh b/tests/t0103-log.sh
index 67fcba0..bdf1435 100755
--- a/tests/t0103-log.sh
+++ b/tests/t0103-log.sh
@@ -1,25 +1,24 @@
 #!/bin/sh
 
+test_description='Check content on log page'
 . ./setup.sh
 
-prepare_tests "Check content on log page"
+test_expect_success 'generate foo/log' 'cgit_url "foo/log" >tmp'
+test_expect_success 'find commit 1' 'grep "commit 1" tmp'
+test_expect_success 'find commit 5' 'grep "commit 5" tmp'
 
-run_test 'generate foo/log' 'cgit_url "foo/log" >trash/tmp'
-run_test 'find commit 1' 'grep "commit 1" trash/tmp'
-run_test 'find commit 5' 'grep "commit 5" trash/tmp'
+test_expect_success 'generate bar/log' 'cgit_url "bar/log" >tmp'
+test_expect_success 'find commit 1' 'grep "commit 1" tmp'
+test_expect_success 'find commit 50' 'grep "commit 50" tmp'
 
-run_test 'generate bar/log' 'cgit_url "bar/log" >trash/tmp'
-run_test 'find commit 1' 'grep "commit 1" trash/tmp'
-run_test 'find commit 50' 'grep "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
+test_expect_success 'generate "with%20space/log?qt=grep&q=commit+1"' '
+	cgit_url "with+space/log&qt=grep&q=commit+1" >tmp
 '
-run_test 'find commit 1' 'grep "commit 1" trash/tmp'
-run_test 'find link with %20 in path' 'grep "/with%20space/log/?qt=grep" trash/tmp'
-run_test 'find link with + in arg' 'grep "/log/?qt=grep&q=commit+1" trash/tmp'
-run_test 'no links with space in path' '! grep "href=./with space/" trash/tmp'
-run_test 'no links with space in arg' '! grep "q=commit 1" trash/tmp'
-run_test 'commit 2 is not visible' '! grep "commit 2" trash/tmp'
+test_expect_success 'find commit 1' 'grep "commit 1" tmp'
+test_expect_success 'find link with %20 in path' 'grep "/with%20space/log/?qt=grep" tmp'
+test_expect_success 'find link with + in arg' 'grep "/log/?qt=grep&q=commit+1" tmp'
+test_expect_success 'no links with space in path' '! grep "href=./with space/" tmp'
+test_expect_success 'no links with space in arg' '! grep "q=commit 1" tmp'
+test_expect_success 'commit 2 is not visible' '! grep "commit 2" tmp'
 
-tests_done
+test_done