Remove use of NEXT from the test suite, except for one (commented) case to test back...

[catagits/Catalyst-Runtime.git] / t / lib / Catalyst / Plugin / Test / Errors.pm

diff --git a/t/lib/Catalyst/Plugin/Test/Errors.pm b/t/lib/Catalyst/Plugin/Test/Errors.pm
index 4dc0d57..8876a4d 100644 (file)
--- a/t/lib/Catalyst/Plugin/Test/Errors.pm
+++ b/t/lib/Catalyst/Plugin/Test/Errors.pm
@@ -1,12 +1,13 @@
 package Catalyst::Plugin::Test::Errors;
 
 use strict;
+use Class::C3;
 
 sub error {
     my $c = shift;
 
     unless ( $_[0] ) {
-        return $c->NEXT::error(@_);
+        return $c->next::method(@_);
     }
 
     if ( $_[0] =~ /^(Unknown resource|No default action defined)/ ) {
@@ -21,9 +22,12 @@ sub error {
         $c->response->status(500);
     }
 
-    $c->response->headers->push_header( 'X-Catalyst-Error' => $_[0] );
+    my $error = $_[0];
+    $error =~ s/\n/, /g;
 
-    $c->NEXT::error(@_);
+    $c->response->headers->push_header( 'X-Catalyst-Error' => $error );
+
+    $c->next::method(@_);
 }
 
 1;