Remove use of Catalyst::Base from the tests

diff --git a/t/lib/Catalyst/Plugin/Test/Deprecated.pm b/t/lib/Catalyst/Plugin/Test/Deprecated.pm
index a9552da..688ad21 100644 (file)
--- a/t/lib/Catalyst/Plugin/Test/Deprecated.pm
+++ b/t/lib/Catalyst/Plugin/Test/Deprecated.pm
@@ -4,8 +4,6 @@ use strict;
 use warnings;
 use NEXT;
 
-use base qw/Catalyst::Base/;
-
 sub prepare {
     my $class = shift;
     # Note: This use of NEXT is deliberately left here (without a use NEXT)

diff --git a/t/lib/Catalyst/Plugin/Test/Plugin.pm b/t/lib/Catalyst/Plugin/Test/Plugin.pm
index 09ee8f7..b620c5e 100644 (file)
--- a/t/lib/Catalyst/Plugin/Test/Plugin.pm
+++ b/t/lib/Catalyst/Plugin/Test/Plugin.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use MRO::Compat;
 
-use base qw/Catalyst::Base Class::Data::Inheritable/;
+use base qw/Catalyst::Controller Class::Data::Inheritable/;
 
  __PACKAGE__->mk_classdata('ran_setup');
 

diff --git a/t/lib/TestApp.pm b/t/lib/TestApp.pm
index e0a6385..f5a7c56 100644 (file)
--- a/t/lib/TestApp.pm
+++ b/t/lib/TestApp.pm
@@ -97,6 +97,6 @@ package Catalyst::Plugin::Test::Inline;
 
 use strict;
 
-use base qw/Catalyst::Base Class::Data::Inheritable/;
+use base qw/Class::Data::Inheritable/;
 
 1;

diff --git a/t/lib/TestApp/Controller/Args.pm b/t/lib/TestApp/Controller/Args.pm
index 6ec7539..8f16996 100644 (file)
--- a/t/lib/TestApp/Controller/Args.pm
+++ b/t/lib/TestApp/Controller/Args.pm
@@ -1,7 +1,7 @@
 package TestApp::Controller::Args;
 
 use strict;
-use base 'Catalyst::Base';
+use base 'Catalyst::Controller';
 
 sub args :Local  {
     my ( $self, $c ) = @_;

diff --git a/t/lib/TestApp/Controller/Dump.pm b/t/lib/TestApp/Controller/Dump.pm
index 5ea3ba0..8c78fc8 100644 (file)
--- a/t/lib/TestApp/Controller/Dump.pm
+++ b/t/lib/TestApp/Controller/Dump.pm
@@ -1,7 +1,7 @@
 package TestApp::Controller::Dump;
 
 use strict;
-use base 'Catalyst::Base';
+use base 'Catalyst::Controller';
 
 sub default : Action Private {
     my ( $self, $c ) = @_;

diff --git a/t/lib/TestApp/Controller/Engine/Request/URI.pm b/t/lib/TestApp/Controller/Engine/Request/URI.pm
index 44a2185..2acfd67 100644 (file)
--- a/t/lib/TestApp/Controller/Engine/Request/URI.pm
+++ b/t/lib/TestApp/Controller/Engine/Request/URI.pm
@@ -1,7 +1,7 @@
 package TestApp::Controller::Engine::Request::URI;
 
 use strict;
-use base 'Catalyst::Base';
+use base 'Catalyst::Controller';
 
 sub default : Private {
     my ( $self, $c ) = @_;

diff --git a/t/lib/TestApp/Controller/Engine/Request/Uploads.pm b/t/lib/TestApp/Controller/Engine/Request/Uploads.pm
index fbd4acf..f51df9d 100644 (file)
--- a/t/lib/TestApp/Controller/Engine/Request/Uploads.pm
+++ b/t/lib/TestApp/Controller/Engine/Request/Uploads.pm
@@ -1,7 +1,7 @@
 package TestApp::Controller::Engine::Request::Uploads;
 
 use strict;
-use base 'Catalyst::Base';
+use base 'Catalyst::Controller';
 
 sub slurp : Relative {
     my ( $self, $c ) = @_;

diff --git a/t/lib/TestApp/Controller/Engine/Response/Cookies.pm b/t/lib/TestApp/Controller/Engine/Response/Cookies.pm
index 8531fe7..320c2e1 100644 (file)
--- a/t/lib/TestApp/Controller/Engine/Response/Cookies.pm
+++ b/t/lib/TestApp/Controller/Engine/Response/Cookies.pm
@@ -1,7 +1,7 @@
 package TestApp::Controller::Engine::Response::Cookies;
 
 use strict;
-use base 'Catalyst::Base';
+use base 'Catalyst::Controller';
 
 sub one : Local {
     my ( $self, $c ) = @_;

diff --git a/t/lib/TestApp/Controller/Engine/Response/Errors.pm b/t/lib/TestApp/Controller/Engine/Response/Errors.pm
index 7e60a7f..562997e 100644 (file)
--- a/t/lib/TestApp/Controller/Engine/Response/Errors.pm
+++ b/t/lib/TestApp/Controller/Engine/Response/Errors.pm
@@ -1,7 +1,7 @@
 package TestApp::Controller::Engine::Response::Errors;
 
 use strict;
-use base 'Catalyst::Base';
+use base 'Catalyst::Controller';
 
 sub one : Relative {
     my ( $self, $c ) = @_;

diff --git a/t/lib/TestApp/Controller/Engine/Response/Headers.pm b/t/lib/TestApp/Controller/Engine/Response/Headers.pm
index a93fe31..470eeaf 100644 (file)
--- a/t/lib/TestApp/Controller/Engine/Response/Headers.pm
+++ b/t/lib/TestApp/Controller/Engine/Response/Headers.pm
@@ -1,7 +1,7 @@
 package TestApp::Controller::Engine::Response::Headers;
 
 use strict;
-use base 'Catalyst::Base';
+use base 'Catalyst::Controller';
 
 sub one : Relative {
     my ( $self, $c ) = @_;

diff --git a/t/lib/TestApp/Controller/Engine/Response/Large.pm b/t/lib/TestApp/Controller/Engine/Response/Large.pm
index bbf6430..75d4ef3 100644 (file)
--- a/t/lib/TestApp/Controller/Engine/Response/Large.pm
+++ b/t/lib/TestApp/Controller/Engine/Response/Large.pm
@@ -1,7 +1,7 @@
 package TestApp::Controller::Engine::Response::Large;
 
 use strict;
-use base 'Catalyst::Base';
+use base 'Catalyst::Controller';
 
 sub one : Relative {
     my ( $self, $c ) = @_;

diff --git a/t/lib/TestApp/Controller/Engine/Response/Print.pm b/t/lib/TestApp/Controller/Engine/Response/Print.pm
index 1d1f52d..8d986f8 100644 (file)
--- a/t/lib/TestApp/Controller/Engine/Response/Print.pm
+++ b/t/lib/TestApp/Controller/Engine/Response/Print.pm
@@ -1,7 +1,7 @@
 package TestApp::Controller::Engine::Response::Print;
 
 use strict;
-use base 'Catalyst::Base';
+use base 'Catalyst::Controller';
 
 sub one :Relative {
     my ( $self, $c ) = @_;

diff --git a/t/lib/TestApp/Controller/Engine/Response/Redirect.pm b/t/lib/TestApp/Controller/Engine/Response/Redirect.pm
index f7d7ec0..d16d1ec 100644 (file)
--- a/t/lib/TestApp/Controller/Engine/Response/Redirect.pm
+++ b/t/lib/TestApp/Controller/Engine/Response/Redirect.pm
@@ -1,7 +1,7 @@
 package TestApp::Controller::Engine::Response::Redirect;
 
 use strict;
-use base 'Catalyst::Base';
+use base 'Catalyst::Controller';
 
 sub one : Relative {
     my ( $self, $c ) = @_;

diff --git a/t/lib/TestApp/Controller/Engine/Response/Status.pm b/t/lib/TestApp/Controller/Engine/Response/Status.pm
index 66fa243..44b5f26 100644 (file)
--- a/t/lib/TestApp/Controller/Engine/Response/Status.pm
+++ b/t/lib/TestApp/Controller/Engine/Response/Status.pm
@@ -1,7 +1,7 @@
 package TestApp::Controller::Engine::Response::Status;
 
 use strict;
-use base 'Catalyst::Base';
+use base 'Catalyst::Controller';
 
 sub begin : Private {
     my ( $self, $c ) = @_;

diff --git a/t/lib/TestApp/Controller/Index.pm b/t/lib/TestApp/Controller/Index.pm
index 9b655d2..cc40f99 100644 (file)
--- a/t/lib/TestApp/Controller/Index.pm
+++ b/t/lib/TestApp/Controller/Index.pm
@@ -1,7 +1,7 @@
 package TestApp::Controller::Index;
 
 use strict;
-use base 'Catalyst::Base';
+use base 'Catalyst::Controller';
 
 sub index : Private {
     my ( $self, $c ) = @_;

diff --git a/t/lib/TestApp/Controller/Priorities.pm b/t/lib/TestApp/Controller/Priorities.pm
index ec98d5b..751270b 100644 (file)
--- a/t/lib/TestApp/Controller/Priorities.pm
+++ b/t/lib/TestApp/Controller/Priorities.pm
@@ -1,7 +1,7 @@
 package TestApp::Controller::Priorities;
 
 use strict;
-use base 'Catalyst::Base';
+use base 'Catalyst::Controller';
 
 #
 #   Regex vs. Local

diff --git a/t/lib/TestApp/Controller/Priorities/loc_vs_index.pm b/t/lib/TestApp/Controller/Priorities/loc_vs_index.pm
index 86a2ab1..b8edfca 100644 (file)
--- a/t/lib/TestApp/Controller/Priorities/loc_vs_index.pm
+++ b/t/lib/TestApp/Controller/Priorities/loc_vs_index.pm
@@ -1,7 +1,7 @@
 package TestApp::Controller::Priorities::loc_vs_index;
 
 use strict;
-use base 'Catalyst::Base';
+use base 'Catalyst::Controller';
 
 sub index :Private { $_[1]->res->body( 'index' ) }
 

diff --git a/t/lib/TestApp/Controller/Priorities/locre_vs_index.pm b/t/lib/TestApp/Controller/Priorities/locre_vs_index.pm
index db4cb0d..9f5f4c2 100644 (file)
--- a/t/lib/TestApp/Controller/Priorities/locre_vs_index.pm
+++ b/t/lib/TestApp/Controller/Priorities/locre_vs_index.pm
@@ -1,7 +1,7 @@
 package TestApp::Controller::Priorities::locre_vs_index;
 
 use strict;
-use base 'Catalyst::Base';
+use base 'Catalyst::Controller';
 
 sub index :Private { $_[1]->res->body( 'index' ) }
 

diff --git a/t/lib/TestApp/Controller/Priorities/path_vs_index.pm b/t/lib/TestApp/Controller/Priorities/path_vs_index.pm
index 3a58c9e..f1c47f9 100644 (file)
--- a/t/lib/TestApp/Controller/Priorities/path_vs_index.pm
+++ b/t/lib/TestApp/Controller/Priorities/path_vs_index.pm
@@ -1,7 +1,7 @@
 package TestApp::Controller::Priorities::path_vs_index;
 
 use strict;
-use base 'Catalyst::Base';
+use base 'Catalyst::Controller';
 
 sub index :Private { $_[1]->res->body( 'index' ) }
 

diff --git a/t/lib/TestApp/Controller/Priorities/re_vs_index.pm b/t/lib/TestApp/Controller/Priorities/re_vs_index.pm
index 67dfd1d..da56b89 100644 (file)
--- a/t/lib/TestApp/Controller/Priorities/re_vs_index.pm
+++ b/t/lib/TestApp/Controller/Priorities/re_vs_index.pm
@@ -1,7 +1,7 @@
 package TestApp::Controller::Priorities::re_vs_index;
 
 use strict;
-use base 'Catalyst::Base';
+use base 'Catalyst::Controller';
 
 sub index :Private { $_[1]->res->body( 'index' ) }
 

diff --git a/t/lib/TestAppOnDemand/Controller/Body.pm b/t/lib/TestAppOnDemand/Controller/Body.pm
index aca4a5e..6e9eeae 100644 (file)
--- a/t/lib/TestAppOnDemand/Controller/Body.pm
+++ b/t/lib/TestAppOnDemand/Controller/Body.pm
@@ -1,7 +1,7 @@
 package TestAppOnDemand::Controller::Body;
 
 use strict;
-use base 'Catalyst::Base';
+use base 'Catalyst::Controller';
 
 use Data::Dump ();
 
@@ -26,4 +26,4 @@ sub read : Local {
     $c->res->body( join ( '|', map { length $_ } @chunks ) );
 }
 
-1;
\ No newline at end of file
+1;