]> git.decadent.org.uk Git - maypole.git/commitdiff
projects / maypole.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c4b63ea)
fixed tests, fixed syntax error in Apache::MVC
authorAaron Trevena <aaron.trevena@gmail.com>
Fri, 18 Apr 2008 10:32:30 +0000 (10:32 +0000)
committerAaron Trevena <aaron.trevena@gmail.com>
Fri, 18 Apr 2008 10:32:30 +0000 (10:32 +0000)
git-svn-id: http://svn.maypole.perl.org/Maypole/trunk@592 48953598-375a-da11-a14b-00016c27c3ee

lib/Apache/MVC.pm patch | blob | history
t/01basics.t patch | blob | history
t/templates/custom/classdata patch | blob | history

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 20046a6606bfde2b37b9804a0264081d329d75de..0dba642b9cdb2237fd623c5da5f8ce6f3b324246 100644 (file)
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -217,7 +217,7 @@ sub redirect_request {
 
   $r->ar->status($status);
   $r->ar->headers_out->set('Location' => $redirect_url);
-  $r->output('<html><head><title>redirecting...</title></head><body><h2>redirecting..</h2></body></html>') unless ($r->output)
+  $r->output('<html><head><title>redirecting...</title></head><body><h2>redirecting..</h2></body></html>') unless ($r->output);
   return OK;
 }
 
diff --git a/t/01basics.t b/t/01basics.t
index 6fa0c1e1241f1b410004e797600bac45456cb800..324bb0bceaa0ad2eedb89e67f7bb5109905b6747 100644 (file)
--- a/t/01basics.t
+++ b/t/01basics.t
@@ -1,5 +1,6 @@
 #!/usr/bin/perl -w
 use Test::More;
+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');
diff --git a/t/templates/custom/classdata b/t/templates/custom/classdata
index d5f60cc680ab103f644e09b50b5f075813f5356c..788e2c70674b53c88fbb1e55f3c17b5975e8c670 100644 (file)
--- a/t/templates/custom/classdata
+++ b/t/templates/custom/classdata
@@ -1,18 +1,35 @@
 name
+
 [% classmetadata.name %]
+
 table
+
 [% classmetadata.table %]
+
 columns
+
 [% classmetadata.columns.join(' ')%]
+
 list_columns
+
 [% classmetadata.list_columns.join(' ') %]
+
 colnames
+
 [% classmetadata.colnames.abv %]
+
 related_accessors
+
 [% classmetadata.related_accessors.join(' ') %]
+
 moniker
+
 [% classmetadata.moniker %]
+
 plural
+
 [% classmetadata.plural %]
+
 cgi
+
 [% classmetadata.cgi.abv%]
Package: Maypole [unmaintained]