--- trunk/t/11-strix-view-user.t	2008/07/11 12:47:50	96
+++ trunk/t/20-fey-web-row.t	2008/07/11 17:53:08	98
@@ -4,18 +4,21 @@
 
 my $debug = shift @ARGV;
 
-use Test::More tests => 19;
+use Test::More tests => 20;
 use lib 'lib';
 
 #use Devel::LeakTrace::Fast;
 use Data::Dump qw/dump/;
 
 BEGIN {
-	use_ok('Strix::View::User');
+	use_ok('Frey::Web::Row');
 }
 
-ok( my $u = Strix::View::User->new( id => 1, ime => 'foo', prezime => 'bar' ), 'new' );
-isa_ok( $u, 'Strix::View::User' );
+ok( my $fey = Strix::User->new( id => 1, ime => 'foo', prezime => 'bar' ), 'Strix::User' );
+diag dump( $fey ) if $debug;
+
+ok( my $u = Frey::Web::Row->new( fey => $fey ), 'new' );
+isa_ok( $u, 'Frey::Web::Row' );
 
 diag dump( $u ) if $debug;
 
@@ -23,40 +26,40 @@
 diag dump( @c ) if $debug;
 
 #while ( $u = $i->next ) {
-#	isa_ok( $u, 'Strix::View::User' );
+#	isa_ok( $u, 'Frey::Web::Row' );
 #}
 
 ok( my $h1 = $u->process(), 'process view/div' );
 diag $h1 if $debug;
 like( $h1, qr|<div class="view">|, 'div view' );
 
-$u->_render_as('edit');
+$u->render_as('edit');
 ok( my $h2 = $u->process(), 'process edit/div' );
 diag $h2 if $debug;
 like( $h2, qr|<div class="editform">|, 'div editform' );
 
 cmp_ok( $h1, 'ne', $h2, 'view and edit differs' );
 
-$u->_layout('table');
-$u->_render_as('view');
+$u->layout('table');
+$u->render_as('view');
 ok( $h1 = $u->process(), 'process view/table' );
 diag $h1 if $debug;
 like( $h1, qr|<tr>|, 'tr' );
 
-$u->_render_as('edit');
+$u->render_as('edit');
 ok( $h2 = $u->process(), 'process edit/table' );
 diag $h2 if $debug;
 like( $h2, qr|<tr>|, 'tr' );
 
 cmp_ok( $h1, 'ne', $h2, 'view and edit differs' );
 
-$u->_layout('columns');
-$u->_render_as('view');
+$u->layout('columns');
+$u->render_as('view');
 ok( $h1 = $u->process(), 'process view/table' );
 diag $h1 if $debug;
 like( $h1, qr|<tr>|, 'tr' );
 
-$u->_render_as('edit');
+$u->render_as('edit');
 ok( $h2 = $u->process(), 'process edit/table' );
 diag $h2 if $debug;
 like( $h2, qr|<tr|, 'tr' );