X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tests%2Fcgi;h=045ba847ffdf7817ae0eb7ffa3d697d7cbea6b84;hb=3eb1b34dd6160ab9e454feb2648ca3ef52d33eaa;hp=21fba258eb6360d776268a734d0d380816352d46;hpb=058a743597225f7057f613ca9b18049fc3e6d0af;p=cgi-auth-flexible.git

diff --git a/tests/cgi b/tests/cgi
index 21fba25..045ba84 100755
--- a/tests/cgi
+++ b/tests/cgi
@@ -10,7 +10,7 @@ use Data::Dumper;
 #use Carp::Always;
 $SIG{__DIE__} = sub { Carp::confess(@_) };
 
-my $dump = "$ENV{'CAFTEST_CAF'}/tests/tmp";
+my $dump = $ENV{'CAFTEST_TMP'} // 'tests/tmp';
 
 my $q = CGI->new;
 
@@ -32,6 +32,11 @@ my @verifier_params =(
     get_url => sub { return $url },
 );
 
+push @verifier_params, (
+    srcdump_prepare => sub { },
+    )
+    if $ENV{'CAFTEST_NOSRCDUMP'};
+
 my $verifier = CGI::Auth::Flexible->new_verifier(@verifier_params);
 
 END { $verifier->disconnect() if $verifier; }
@@ -54,17 +59,32 @@ END
 my $newurl = $authreq->url_with_query_params($authreq->chain_params());
 my $newurl_esc = escapeHTML($newurl);
 
+my $incrurl = $authreq->url_with_query_params
+    ({ counter => [ ($q->param('counter')//0) + 1 ]});
+my $incrurl_esc = escapeHTML($incrurl);
+
+my @critters = qw(sponges worms);
+
+foreach my $make (@critters) {
+    my $param = $q->param("test_cgi_$make");
+    if (!$param) {
+        print "NO-$make\n";
+    } else {
+        $authreq->check_mutate();
+        print "MAKING-$make\n";
+    }
+}
+
 print <<END;
 <h1>info<h1>
 <pre>
 END
 
 my $txt = Data::Dumper->Dump([$authreq->get_username(),
- $q->request_method eq 'POST' ? $authreq->check_mutate() : "(not POST)",
                               $q->path_info(),
                               $authreq->chain_params(),
                               scalar $q->Vars()],
-                             [qw(username mutate_ok path
+                             [qw(username path
                                  authreq->chain_params() cgi->params())]);
 foreach my $l (split /\n/, $txt) {
     print escapeHTML($l),"\n";
@@ -72,11 +92,17 @@ foreach my $l (split /\n/, $txt) {
 
 print <<END;
 </pre>
-<a href="$newurl_esc">$newurl_esc</a>
+self=<a href="$newurl_esc">$newurl_esc</a>
+increment=<a href="$incrurl_esc">$incrurl_esc</a>
 <form method="POST" action="$url">
 $hiddenhtml
-<input type="submit" name="test_cgi_sponges" value="Make sponges">
-<input type="submit" name="test_cgi_worms" value="Make worms">
+END
+
+print <<END foreach @critters;
+<input type="submit" name="test_cgi_$_" value="Make $_">
+END
+
+print <<END
 <input type="submit" name="caf_logout" value="Logout">
 </form>
 <form method="POST" action="$url/extra">