-use Test::More tests => 44;
+use Test::More tests => 46;
use strict;
use warnings;
map { "MyApp::$_"; }
qw/C::Controller M::Model V::View Controller::C Model::M View::V Controller::Model::Dummy::Model Model::Dummy::Model/;
-my $thingie={};
-bless $thingie,'MyApp::Model::Test::Object';
-push @complist,$thingie;
{
package MyApp;
__PACKAGE__->components( { map { ( ref($_)||$_ , $_ ) } @complist } );
+ my $thingie={};
+ bless $thingie, 'Some::Test::Object';
+ __PACKAGE__->components->{'MyApp::Model::Test::Object'} = $thingie;
+
# allow $c->log->warn to work
__PACKAGE__->setup_log;
}
is( MyApp->model('Dummy::Model'), 'MyApp::Model::Dummy::Model', 'Model::Dummy::Model ok' );
-isa_ok( MyApp->model('Test::Object'), 'MyApp::Model::Test::Object', 'Test::Object ok' );
+isa_ok( MyApp->model('Test::Object'), 'Some::Test::Object', 'Test::Object ok' );
is( MyApp->controller('Model::Dummy::Model'), 'MyApp::Controller::Model::Dummy::Model', 'Controller::Model::Dummy::Model ok' );
no warnings 'redefine';
local *Catalyst::Log::warn = sub { $warnings++ };
- like (MyApp->model , qr/^MyApp\::(M|Model)\::/ , 'model() with no defaults returns *something*');
+ ok( my $model = MyApp->model );
+
+ ok( (($model =~ /^MyApp\::(M|Model)\::/) ||
+ $model->isa('Some::Test::Object')),
+ 'model() with no defaults returns *something*' );
+
ok( $warnings, 'model() w/o a default is random, warnings thrown' );
}
my $c = bless {}, 'MyApp';
+ # test accept-context with class rather than instance
+ MyApp->model('M', qw/foo bar/);
+ is_deeply($args, [qw/foo bar/], 'MyApp->model args passed to ACCEPT_CONTEXT ok');
+
+
$c->model('M', qw/foo bar/);
is_deeply($args, [qw/foo bar/], '$c->model args passed to ACCEPT_CONTEXT ok');
# regexp fallback
$c->view('::View::V', qw/foo3 bar3/);
is_deeply($args, [qw/foo3 bar3/], 'args passed to ACCEPT_CONTEXT ok');
+
+
}