X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Frow%2Finflate_result.t;h=ecdd68c5e11b4ed3c95c2b4d8012b98e497e61a7;hb=fed15b9163bcb281a3a654643949a9cd1f9a3928;hp=370c205b7e452b152b394bb5855c518d0b984a0a;hpb=de621449d983d7dbc139687a1d9f157524009942;p=dbsrgits%2FDBIx-Class.git diff --git a/t/row/inflate_result.t b/t/row/inflate_result.t index 370c205..ecdd68c 100644 --- a/t/row/inflate_result.t +++ b/t/row/inflate_result.t @@ -1,8 +1,15 @@ +use warnings; +use strict; + +use Test::More; + +use lib qw(t/lib); +use DBICTest; + package My::Schema::Result::User; use strict; use warnings; -use DBIx::Class::ResultClass::HashRefInflator; use base qw/DBIx::Class::Core/; ### Define what our admin class is, for ensure_class_loaded() @@ -21,7 +28,6 @@ __PACKAGE__->set_primary_key('user_id'); sub inflate_result { my $self = shift; my $ret = $self->next::method(@_); - if ( $ret->admin ) { ### If this is an admin, rebless for extra functions $self->ensure_class_loaded($admin_class); bless $ret, $admin_class; @@ -60,13 +66,6 @@ My::Schema->register_class( User => 'My::Schema::Result::User' ); 1; package main; - -use lib qw(t/lib); -use DBICTest; -use DBIx::Class::ResultClass::HashRefInflator; - -use Test::More; - my $user_data = { email => 'someguy@place.com', password => 'pass1', @@ -79,7 +78,7 @@ my $admin_data = { admin => 1 }; -ok( my $schema = My::Schema->connection('dbi:SQLite:dbname=:memory:') ); +ok( my $schema = My::Schema->connection(DBICTest->_database) ); ok( $schema->storage->dbh->do( @@ -87,16 +86,13 @@ ok( ) ); -my $rs = $schema->resultset('User'); - TODO: { local $TODO = 'New objects should also be inflated'; - my $user = $rs->create($user_data); - my $admin = $rs->create($admin_data); + my $user = $schema->resultset('User')->create($user_data); + my $admin = $schema->resultset('User')->create($admin_data); is( ref $user, 'My::Schema::Result::User' ); is( ref $admin, 'My::Schema::Result::User::Admin' ); - } my $user = $schema->resultset('User')->single($user_data);