1 file changed, 12 insertions, 16 deletions
diff --git a/tests/t0203-dates.sh b/tests/t0203-dates.sh
index 3c8ecab..5c3567f 100755
--- a/tests/t0203-dates.sh
+++ b/tests/t0203-dates.sh
@@ -24,8 +24,6 @@ test_expect_success 'set up a dated repo' '
 	)
 '
 
-# Writes the config afresh, one extra line per argument, which is what lets a
-# test below name a setting or two and say nothing about the rest.
 daterc() {
 	{
 		echo "virtual-root=/"
@@ -36,66 +34,64 @@ daterc() {
 	} >daterc
 }
 
-dateq() { CGIT_CONFIG="$PWD/daterc" QUERY_STRING="$1" cgit; }
-
 test_expect_success 'relative dates are on by default' '
 	daterc &&
-	dateq "url=dated/refs/" >tmp &&
+	cgit_rc daterc "url=dated/refs/" >tmp &&
 	grep "class=.age-" tmp
 '
 
 test_expect_success 'enable-relative-dates=0 shows a calendar date' '
 	daterc "enable-relative-dates=0" &&
-	dateq "url=dated/refs/" >tmp &&
+	cgit_rc daterc "url=dated/refs/" >tmp &&
 	! grep "class=.age-" tmp &&
 	grep "[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]<" tmp
 '
 
 test_expect_success 'the index and log columns follow the same flag' '
 	daterc "enable-relative-dates=0" &&
-	dateq "" >tmp &&
+	cgit_rc daterc "" >tmp &&
 	! grep "class=.age-" tmp &&
-	dateq "url=dated/log/" >tmp &&
+	cgit_rc daterc "url=dated/log/" >tmp &&
 	! grep "class=.age-" tmp
 '
 
 test_expect_success 'date-format selects the calendar format' '
 	daterc "enable-relative-dates=0" "date-format=iso8601" &&
-	dateq "url=dated/refs/" >tmp &&
+	cgit_rc daterc "url=dated/refs/" >tmp &&
 	grep ">[0-9-]* [0-9][0-9]:[0-9][0-9]:[0-9][0-9] +0000<" tmp
 '
 
 test_expect_success 'date-format accepts a strftime format' '
 	daterc "enable-relative-dates=0" "date-format=format:%Y/%m/%d" &&
-	dateq "url=dated/refs/" >tmp &&
+	cgit_rc daterc "url=dated/refs/" >tmp &&
 	grep ">[0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9]<" tmp
 '
 
 test_expect_success 'an unknown date-format falls back to short' '
 	daterc "enable-relative-dates=0" "date-format=nonsense" &&
-	dateq "url=dated/refs/" >tmp &&
+	cgit_rc daterc "url=dated/refs/" >tmp &&
 	grep "[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]<" tmp &&
 	daterc "enable-relative-dates=0" "date-format=format:" &&
-	dateq "url=dated/refs/" >tmp &&
+	cgit_rc daterc "url=dated/refs/" >tmp &&
 	grep "[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]<" tmp
 '
 
 test_expect_success 'a date-format git would refuse falls back to short' '
 	daterc "enable-relative-dates=0" "date-format=local-local" &&
-	dateq "url=dated/refs/" >tmp &&
+	cgit_rc daterc "url=dated/refs/" >tmp &&
 	grep "^Status: 200" tmp &&
 	grep "[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]<" tmp
 '
 
 test_expect_success 'date-format=local is the default format in local time' '
 	daterc "enable-relative-dates=0" "date-format=local" &&
-	dateq "url=dated/refs/" >tmp &&
+	cgit_rc daterc "url=dated/refs/" >tmp &&
 	grep ">[A-Z][a-z][a-z] [A-Z][a-z][a-z] [0-9]* [0-9:]* [0-9]*<" tmp
 '
 
 test_expect_success 'date-format still formats the log fallback' '
 	daterc "date-format=rfc2822" &&
-	dateq "url=dated/log/" >tmp &&
+	cgit_rc daterc "url=dated/log/" >tmp &&
 	grep "class=.age-" tmp &&
 	grep ">[A-Z][a-z][a-z], [0-9]* Apr 2005 " tmp
 '
@@ -103,7 +99,7 @@ test_expect_success 'date-format still formats the log fallback' '
 test_expect_success 'date-format leaves the commit page on ISO 8601' '
 	daterc "date-format=rfc2822" &&
 	sha=$(git -C repos/dated rev-parse HEAD~1) &&
-	dateq "url=dated/commit/&id=$sha" >tmp &&
+	cgit_rc daterc "url=dated/commit/&id=$sha" >tmp &&
 	grep "2005-04-07 [0-9:]* +0000" tmp &&
 	! grep "Apr 2005" tmp
 '