--- trunk/t/20-html.t	2008/06/29 15:40:26	22
+++ trunk/t/20-html.t	2008/06/29 16:24:41	23
@@ -2,28 +2,34 @@
 use strict;
 use warnings;
 
-my $debug = shift @ARGV;
-
-use Test::More tests => 8;
+use Test::More tests => 9;
 use lib 'lib';
 
 #use Devel::LeakTrace::Fast;
 use Data::Dump qw/dump/;
 
 BEGIN {
-	use_ok('HTML');
+	use_ok('Frey::HTML');
 	use_ok('Strix::User');
 }
 
-ok( my $u = Strix::User->new( id => 1 ), 'new' );
-isa_ok( $u, 'Strix::User' );
+$Frey::HTML::debug = 1 if @ARGV;
+my $debug = $Frey::HTML::debug;
 
-ok( my $h1 = HTML->view( 'user' => $u ), 'view' );
+ok( my $h1 = Frey::HTML->page( 'status' ), 'status' );
 diag $h1 if $debug;
 
-ok( HTML->add_javascript('static/jquery-1.2.6.js'), 'add_javascript' );
+ok( Frey::HTML->add_javascript('static/jquery-1.2.6.js'), 'add_javascript' );
 
-ok( my $h2 = HTML->view( 'user' => $u ), 'view' );
+ok( my $h2 = Frey::HTML->page( 'status' ), 'status' );
 diag $h2 if $debug;
 
-cmp_ok( length($h1), '<', length($h2), 'bigger with javascript' );
+cmp_ok( length( $h1 . '' ), '<', length( $h2 . '' ), 'bigger with javascript' );
+
+ok( my $u = Strix::User->new( id => 1 ), 'Strix::User->new' );
+isa_ok( $u, 'Strix::User' );
+
+ok( my $h3 = Frey::HTML->page( 'user' => $u ), 'user' );
+diag $h3 if $debug;
+
+print Frey::HTML->page( 'status' ) if $debug;