Added Maypole::Config, and changed other classes to reflect that.

[maypole.git] / t / 1.t

diff --git a/t/1.t b/t/1.t
index 50aa24c4d6933994b2903e0db2d1dd045d8f9aa1..3aaa0e986c231f345abcb50447cbf82af24a9e44 100644 (file)
--- a/t/1.t
+++ b/t/1.t
@@ -2,8 +2,8 @@
 use Test::More;
 use lib 'ex'; # Where BeerDB should live
 BEGIN { if (eval { require BeerDB }) { 
-            plan tests => 5;
-        } else { Test::More->import(skip_all =>"SQLite not working or BeerDB module not found: $@") }
+            plan tests => 3;
+        } else { Test::More->import(skip_all =>"SQLite not working or BeerDB module could not be loaded: $@") }
       }
 use Maypole::CLI qw(BeerDB);
 use Maypole::Constants;
@@ -11,10 +11,5 @@ $ENV{MAYPOLE_TEMPLATES} = "t/templates";
 
 isa_ok( (bless {},"BeerDB") , "Maypole");
 
-@ARGV = ("http://localhost/beerdb/");
-is(BeerDB->handler, OK, "OK");
-like($Maypole::CLI::buffer, qr/frontpage/, "Got the front page");
-
-@ARGV = ("http://localhost/beerdb/beer/list");
-is(BeerDB->handler, OK, "OK");
-like($Maypole::CLI::buffer, qr/Organic Best/, "Found a beer in the list");
+like(BeerDB->call_url("http://localhost/beerdb/"), qr/frontpage/, "Got the front page");
+like(BeerDB->call_url("http://localhost/beerdb/beer/list"), qr/Organic Best/, "Found a beer in the list");