Merge commit '2.13' into HEAD

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

diff --git a/t/01basics.t b/t/01basics.t
index ba7b83434e7feba3735a7f459e14f4c2931d51e4..324bb0bceaa0ad2eedb89e67f7bb5109905b6747 100644 (file)
--- a/t/01basics.t
+++ b/t/01basics.t
@@ -1,6 +1,7 @@
 #!/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;
 
@@ -32,7 +33,12 @@ 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');
@@ -48,4 +54,5 @@ 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/Maypole::Model::CDBI Class::DBI::SQLite BeerDB::Base/] );
+
+is_deeply( [@BeerDB::Beer::ISA], [qw/Class::DBI::SQLite  Maypole::Model::CDBI BeerDB::Base/] );