no longer die under Catalyst 5.80

diff --git a/Changes b/Changes
index 47fa1f1..880090e 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 ??? - Release ???
   Remove ancient and deprecated Data::Denter prompt from Makefile.PL (hdp)
   Remove Data::Dump, which was entirely unused (hdp)
+  Stop tests from dying with Catalyst 5.80 (hdp)
 
 Wed Mar 25 21:59:59 PDT 2009 (hdp) - Release 0.67
   (no changes from 0.67_01)

diff --git a/t/catalyst-request-rest.t b/t/catalyst-request-rest.t
index 2f1799b..ac49e29 100644 (file)
--- a/t/catalyst-request-rest.t
+++ b/t/catalyst-request-rest.t
@@ -168,15 +168,13 @@ use HTTP::Headers;
 }
 
 {
-  # XXX calling ->setup twice breaks Catalyst 5.80; find a different way to
-  # reset the components/actions
   my $test = 'Test::Catalyst::Action::REST';
   use_ok $test;
   is($test->request_class, 'Catalyst::Request::REST',
     'Request::REST took over for Request');
 
   $test->request_class('Some::Other::Class');
-  eval { $test->setup };
+  eval { $test->setup_finished(0); $test->setup };
   like $@, qr/$test has a custom request class Some::Other::Class/;
 
   {
@@ -184,7 +182,7 @@ use HTTP::Headers;
     use base 'Catalyst::Request::REST';
   }
   $test->request_class('My::Request');
-  eval { $test->setup };
+  eval { $test->setup_finished(0); $test->setup };
   is $@, '', 'no error from Request::REST subclass';
 }