Merge branch 'upstream'

[maypole.git] / t / 01basics.t

diff --git a/t/01basics.t b/t/01basics.t
index 2b1518dead6a4b6a2d34c9c766d65d83b14bd5d4..324bb0bceaa0ad2eedb89e67f7bb5109905b6747 100644 (file)
--- a/t/01basics.t
+++ b/t/01basics.t
@@ -1,13 +1,17 @@
-# vim:ft=perl
+#!/usr/bin/perl -w
 use Test::More;
-use lib 'ex'; # Where BeerDB should live
+use Data::Dumper;
+use lib 'examples'; # Where BeerDB should live
 BEGIN {
+    $ENV{BEERDB_DEBUG} = 0;
+
     eval { require BeerDB };
     Test::More->import( skip_all =>
         "SQLite not working or BeerDB module could not be loaded: $@"
     ) if $@;
 
-    plan tests => 15;
+    plan tests => 18;
+    
 }
 use Maypole::CLI qw(BeerDB);
 use Maypole::Constants;
@@ -15,8 +19,6 @@ $ENV{MAYPOLE_TEMPLATES} = "t/templates";
 
 isa_ok( (bless {},"BeerDB") , "Maypole");
 
-BeerDB->config->view_options({COMPILE_DIR => '/home/simon/dev/maypole/compiled'});
-
 # Test the effect of trailing slash on config->uri_base and request URI
 (my $uri_base = BeerDB->config->uri_base) =~ s:/$::;
 BeerDB->config->uri_base($uri_base);
@@ -31,16 +33,26 @@ like(BeerDB->call_url("http://localhost/beerdb"), qr/frontpage/,
      "Got frontpage, trailing '/' on uri_base but not request");
 
 like(BeerDB->call_url("http://localhost/beerdb/beer/list"), qr/Organic Best/, "Found a beer in the list");
-my (%classdata)=split /\n/, BeerDB->call_url("http://localhost/beerdb/beer/classdata");
+
+my $classdata_page = BeerDB->call_url("http://localhost/beerdb/beer/classdata");
+my (%classdata)=split /\n+/, $classdata_page;
+#warn $classdata_page;
+#warn Dumper(%classdata);
+
 is ($classdata{plural},'beers','classdata.plural');
 is ($classdata{moniker},'beer','classdata.moniker');
 like ($classdata{cgi},qr/^HTML::Element/,'classdata.cgi');
 is ($classdata{table},'beer','classdata.table');
 is ($classdata{name},'BeerDB::Beer','classdata.name');
 is ($classdata{colnames},'Abv','classdata.colnames');
-is($classdata{columns}, 'abv brewery id name notes price score style url',
+is($classdata{columns}, 'abv brewery id name notes price score style tasted url',
    'classdata.columns');
 is($classdata{list_columns}, 'score name price style brewery url',
    'classdata.list_columns');
 is ($classdata{related_accessors},'pubs','classdata.related_accessors');
 
+# test Maypole::load_custom_class()
+can_ok(BeerDB::Beer => 'fooey');     # defined in BeerDB::Beer
+can_ok(BeerDB::Beer => 'floob');     # defined in BeerDB::Base
+
+is_deeply( [@BeerDB::Beer::ISA], [qw/Class::DBI::SQLite  Maypole::Model::CDBI BeerDB::Base/] );