--- trunk/t/02-frey-web.t	2008/07/17 17:04:21	154
+++ trunk/t/02-Frey-Web.t	2009/01/07 19:41:48	961
@@ -2,14 +2,15 @@
 use strict;
 use warnings;
 
-use Test::More tests => 18;
+use Test::More tests => 31;
 use lib 'lib';
 
 use Data::Dump qw/dump/;
 
-my $debug = 1 if @ARGV;
+my $debug = @ARGV ? 0 : 1;
 
 BEGIN {
+	use_ok('Frey::Bootstrap');
 	use_ok('Frey::Web');
 	use_ok('Frey');
 	use_ok('Test::HTML::Lint');
@@ -25,34 +26,55 @@
 isa_ok( Frey::Web->meta, 'Moose::Meta::Role' );
 
 
-ok( my $o = Mock->new( debug => $debug ), 'new' );
+ok( my $o = Mock->new( debug => $debug, inline_smaller_than => 1 ), 'new' );
 diag $o->dump(2) if $debug;
 
-ok( $o->add_js( '/static/lib/Joose.js' ), 'add_js' );
+ok( $o->add_head( '/static/lib/Joose.js' ), 'add_head js' );
 
-ok( my @js = $o->js, 'js' );
+ok( my @head = $o->head, 'js' );
 
-diag dump( @js ) if $debug;
+diag dump( @head ) if $debug;
 
-ok( $o->add_css( '/static/introspect.css' ), 'add_css' );
+ok( $o->add_head( '/static/introspect.css' ),  'add_head css' );
+ok( $o->add_head( "<!--\nhead comment\n-->" ), 'add_head comment' );
+ok( $o->add_head( "<span>head html</span>>" ), 'add_head html' );
 
-ok( my $html = $o->page( title => 'Test', body => '<!-- in-body -->' ), 'page' );
+html_ok( $o->warnings_html, 'warnings_html' );
+
+ok( my $html = $o->html_page( title => 'Test', body => '<!-- in-body -->' ), 'page' );
 diag $html if $debug;
 
 like( $html, qr{text/javascript.*\.js}, 'have js' );
 like( $html, qr{text/css.*\.css}, 'have css' );
+like( $html, qr{head comment}, 'have comment' );
+like( $html, qr{head html}, 'have html' );
+like( $html, qr{icon}, 'have icon' );
 
 html_ok( $html, 'html lint' );
 
-ok( my $s = $o->add_head( 'static/app.css' ), 'add_head css' );
+ok( my $s = $o->add_head( 'static/frey.css' ), 'add_head css' );
 diag $s if $debug;
 ok( $s = $o->add_head( 'static/js/ext-2.1/ext-all.js' ), 'add_head js' );
 diag $s if $debug;
 
-ok( my $html2 = $o->page( title => 'Test2', body => '<!-- in-body 2 -->' ), 'page' );
+ok( $o->title, 'has title' );
+
+ok( my $html2 = $o->html_page( title => 'Test2', body => '<!-- in-body 2 -->' ), 'page' );
 diag $html2 if $debug;
 
 cmp_ok( length( $html ), '<', length( $html2 ), 'bigger html' );
 
-like( $html2, qr{app\.css}, 'have css' );
+like( $html2, qr{frey\.css}, 'have css' );
 like( $html2, qr{ext}, 'have js' );
+
+ok( my $error = $o->error('test,ignore'), 'error' );
+diag $error if $debug;
+like( $error, qr{test,ignore.*$0}s, "have $0" );
+
+ok( $o->dump_max_bytes, 'dump_max_bytes' );
+
+ok( $html = $o->html_self, 'html_self' );
+diag $html if $debug;
+like( $html, qr{=HASH}s, "have self" );
+
+