X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Flib%2FPluginTestApp.pm;h=b462fa024bdf878ba8d83d5af34d2a7b2dbe1cdc;hp=c476736008f955d417e5b7d353d1177a8f54e24e;hb=82010ea176741c7a4f2baf3f6f27377b1d9f6b15;hpb=052a2d89ac696b137f1456a339a77c1607dfe544 diff --git a/t/lib/PluginTestApp.pm b/t/lib/PluginTestApp.pm index c476736..b462fa0 100644 --- a/t/lib/PluginTestApp.pm +++ b/t/lib/PluginTestApp.pm @@ -1,52 +1,13 @@ package PluginTestApp; use Test::More; -use Catalyst qw( - Test::Plugin - +TestApp::Plugin::FullyQualified - ); - -sub compile_time_plugins : Local { - my ( $self, $c ) = @_; - - isa_ok $c, 'Catalyst::Plugin::Test::Plugin'; - isa_ok $c, 'TestApp::Plugin::FullyQualified'; - - can_ok $c, 'registered_plugins'; - $c->_test_plugins; - - $c->res->body("ok"); -} - -sub run_time_plugins : Local { - my ( $self, $c ) = @_; - - $c->_test_plugins; - my $faux_plugin = 'Faux::Plugin'; - -# Trick perl into thinking the plugin is already loaded - $INC{'Faux/Plugin.pm'} = 1; - - __PACKAGE__->plugin( faux => $faux_plugin ); - - isa_ok $c, 'Catalyst::Plugin::Test::Plugin'; - isa_ok $c, 'TestApp::Plugin::FullyQualified'; - ok !$c->isa($faux_plugin), - '... and it should not inherit from the instant plugin'; - can_ok $c, 'faux'; - is $c->faux->count, 1, '... and it should behave correctly'; - is_deeply [ $c->registered_plugins ], - [ - qw/Catalyst::Plugin::Test::Plugin - Faux::Plugin - TestApp::Plugin::FullyQualified/ - ], - 'registered_plugins() should report all plugins'; - ok $c->registered_plugins('Faux::Plugin'), - '... and even the specific instant plugin'; - - $c->res->body("ok"); -} +use Catalyst ( + 'Test::Plugin', + '+TestApp::Plugin::FullyQualified', + (eval { require MooseX::Role::Parameterized; 1 } + ? ('+TestApp::Plugin::ParameterizedRole' => { method_name => 'affe' }) + : ()), +); sub _test_plugins { my $c = shift; @@ -54,7 +15,7 @@ sub _test_plugins { [ qw/Catalyst::Plugin::Test::Plugin TestApp::Plugin::FullyQualified/ - ], + ], '... and it should report the correct plugins'; ok $c->registered_plugins('Catalyst::Plugin::Test::Plugin'), '... or if we have a particular plugin';