[Jifty-commit] jifty branch, master, updated. 589e90e2eced00f945a55048f7cf18d388dd641a

[Jifty commits]

The branch, master has been updated
       via  589e90e2eced00f945a55048f7cf18d388dd641a (commit)
       via  c22ebf60fe3120cbda9827239f6a027dbd350bc2 (commit)
      from  dd2a6a41e78f8ee1a96e16e54ead3db72c81dc59 (commit)

Summary of changes:
 lib/Jifty/View/Declare/CRUD.pm     |    3 +--
 t/TestApp/t/continuation-by-hand.t |    3 +--
 t/TestApp/t/crud.t                 |    3 ++-
 3 files changed, 4 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit c22ebf60fe3120cbda9827239f6a027dbd350bc2
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Dec 8 12:01:48 2010 -0500

    "title is" can't be used when mixing mason and TD
    
    Test that the new title construct works.  The change also eliminates a
    warning in t/TestApp/t/crud.t.

diff --git a/lib/Jifty/View/Declare/CRUD.pm b/lib/Jifty/View/Declare/CRUD.pm
index aa13bb4..a9e45a5 100644
--- a/lib/Jifty/View/Declare/CRUD.pm
+++ b/lib/Jifty/View/Declare/CRUD.pm
@@ -382,9 +382,8 @@ Contains the master form and page region containing the list of items. This is m
 
 =cut
 
-template 'index.html' => page {
+template 'index.html' => page { title => shift->page_title } content {
     my $self = shift;
-    title is $self->page_title;
     form {
         render_region(
             name     => $self->object_type.'-list',
diff --git a/t/TestApp/t/crud.t b/t/TestApp/t/crud.t
index cf13fc3..2f4d998 100644
--- a/t/TestApp/t/crud.t
+++ b/t/TestApp/t/crud.t
@@ -2,7 +2,7 @@
 use warnings;
 use strict;
 
-use Jifty::Test::Dist tests => 3;
+use Jifty::Test::Dist tests => 4;
 use Jifty::Test::WWW::Mechanize;
 
 my $server = Jifty::Test->make_server;
@@ -13,5 +13,6 @@ my $url = $server->started_ok;
 my $mech = Jifty::Test::WWW::Mechanize->new;
 
 $mech->get_ok("$url/crud/User");
+$mech->title_is("User");
 
 # TODO FIXME XXX Surely more tests are needed... and don't call me Shirley.

commit 589e90e2eced00f945a55048f7cf18d388dd641a
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Dec 8 13:42:23 2010 -0500

    Use Jifty::Test::Dist which handles the chdir more correctly
    
    It also makes sure not to break Jifty::Test->load_test_configs, which
    the manual chdir did.

diff --git a/t/TestApp/t/continuation-by-hand.t b/t/TestApp/t/continuation-by-hand.t
index b52bec4..d8bb5cb 100644
--- a/t/TestApp/t/continuation-by-hand.t
+++ b/t/TestApp/t/continuation-by-hand.t
@@ -9,9 +9,8 @@ Creating a custom request and saving it in a continuation should work.
 
 =cut
 
-BEGIN {chdir "t/TestApp"}
 use lib '../../lib';
-use Jifty::Test tests => 6, actual_server => 1;
+use Jifty::Test::Dist tests => 6, actual_server => 1;
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;

-----------------------------------------------------------------------