merged conflicts

[catagits/Catalyst-Runtime.git] / t / aggregate / live_component_controller_action_default.t

diff --git a/t/aggregate/live_component_controller_action_default.t b/t/aggregate/live_component_controller_action_default.t
index 935a326..6e809e7 100644 (file)
--- a/t/aggregate/live_component_controller_action_default.t
+++ b/t/aggregate/live_component_controller_action_default.t
@@ -1,5 +1,3 @@
-#!perl
-
 use strict;
 use warnings;
 
@@ -29,7 +27,7 @@ sub run_tests {
           TestApp::Controller::Action::Default->begin
           TestApp::Controller::Action::Default->default
           TestApp::View::Dump::Request->process
-          TestApp->end
+          TestApp::Controller::Root->end
         ];
 
         my $expected = join( ", ", @expected );
@@ -66,7 +64,7 @@ sub run_tests {
         ok(
             eval '$creq = ' . $response->content,
             'Unserialize Catalyst::Request'
-        );
+        ) or fail("EXCEPTION $@ DESERIALIZING " . $response->content);
         is_deeply( $creq->{arguments}, $expected, 'Arguments ok' );
     }
     
@@ -76,7 +74,7 @@ sub run_tests {
         my @expected = qw[
           TestApp::Controller::Action->begin
           TestApp::Controller::Action->default
-          TestApp->end
+          TestApp::Controller::Root->end
         ];
         
         my $expected = join( ", ", @expected );