Sync up with Params::CallbackRequest 1.11. Fixed failing notes tests.

theory · Oct 8, 2003 · 76467c9 · 76467c9
1 parent 9f1c62d
commit 76467c9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/Changes b/Changes
@@ -9,6 +9,10 @@ Revision history for Perl extension MasonX::Interp::WithCallbacks.
         Apache::TestClient should work fine for the simple test requests.
       - The module now requires HTML::Mason 1.23, rather than just the
         requirements in Makefile.PL.
+      - Require Params::CallbackRequest 1.11 or later to be in sync with
+        request callback order of execution.
+      - Fixed failing tests of notes functionality under Apache. Not sure
+        how they ever passed, frankly.
 
 1.10  Mon Sep  8 21:15:42 2003
       - Code moved over from MasonX::ApacheHandler::WithCallbacks, which is

diff --git a/Makefile.PL b/Makefile.PL
@@ -25,7 +25,7 @@ WriteMakefile(
     PREREQ_PM		=> { 'HTML::Mason'             => '1.23',
                              'Test::Simple'            => '0.17',
                              'Class::Container'        => '0.09',
-                             'Params::CallbackRequest' => '1.10' },
+                             'Params::CallbackRequest' => '1.11' },
     clean               => { FILES => $clean },
     ($] >= 5.005 ?    ## Add these new keywords supported since 5.005
       (ABSTRACT_FROM    => 'lib/MasonX/Interp/WithCallbacks.pm',

diff --git a/t/06object_request.t b/t/06object_request.t
@@ -1,6 +1,6 @@
 #!perl -w
 
-# $Id: 06object_request.t,v 1.2 2003/08/24 22:59:20 david Exp $
+# $Id: 06object_request.t,v 1.3 2003/10/08 20:11:58 david Exp $
 
 use strict;
 use FindBin qw($Bin);
@@ -201,7 +201,7 @@ $outbuf = '';
 $interp->exec($comp,
              do_upper => 1,
               result   => 'taKe mE uP aGain!');
-is( $outbuf, 'TAKE ME UP AGAIN! PRECALLBACK Overridden PostCallback',
+is( $outbuf, 'TAKE ME UP AGAIN! Overridden PreCallback PostCallback',
     "Check subclassed pre callback result" );
 $outbuf = '';
 

diff --git a/t/08apache.t b/t/08apache.t
@@ -1,6 +1,6 @@
 #!perl -w
 
-# $Id: 08apache.t,v 1.5 2003/10/08 17:58:35 david Exp $
+# $Id: 08apache.t,v 1.6 2003/10/08 20:11:58 david Exp $
 
 use strict;
 use Test::More;
@@ -128,9 +128,9 @@ while (my $key = shift @keys) {
 
     # Make sure that notes percolate back to Mason.
     ok( $res = POST($uri,
-                    [ "$key|add_note_cb"   => $note_key,
+                    [ "$key|add_note_cb1"  => $note_key,
                       note                 => $note,
-                      "$key|mason_note_cb" => 1,
+                      "$key|mason_note_cb" => $note_key,
                     ]),
         "Get mason note response" );
     is( $res->code, 200, "Check mason note code" );
@@ -141,7 +141,7 @@ while (my $key = shift @keys) {
     ok( $res = POST($uri,
                     [ "$key|add_note_cb"   => $note_key,
                       note                 => $note,
-                      "$key|cbr_note_cb" => 1,
+                      "$key|cbr_note_cb"   => $note_key,
                     ]),
         "Get cb_request note respone" );
     is( $res->code, 200, "Check cb_request note code" );
@@ -162,7 +162,7 @@ while (my $key = shift @keys) {
                     [ "$key|add_note_cb1"  => $note_key, # Executes first.
                       note                 => $note,
                       "$key|clear_cb"      => 1,
-                      "$key|cbr_note_cb" => 1,
+                      "$key|cbr_note_cb"   => $note_key,
                     ]),
         "Get cb_request cleared note response" );
     is( $res->code, 200, "Check cb_request cleared note code" );