tests don't pass with CATALYST_DEBUG set to 1

[catagits/Catalyst-Action-REST.git] / t / catalyst-request-rest.t

diff --git a/t/catalyst-request-rest.t b/t/catalyst-request-rest.t
index 2f1799b..2226793 100644 (file)
--- a/t/catalyst-request-rest.t
+++ b/t/catalyst-request-rest.t
@@ -168,15 +168,15 @@ use HTTP::Headers;
 }
 
 {
-  # XXX calling ->setup twice breaks Catalyst 5.80; find a different way to
-  # reset the components/actions
+  local %ENV=%ENV;
+  $ENV{CATALYST_DEBUG} = 0;
   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 +184,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';
 }