[Jifty-commit] jifty branch, master, updated. ae21742430849de13801201fb844407fe9035b77

Jifty commits jifty-commit at lists.jifty.org
Sat May 22 08:49:07 EDT 2010


The branch, master has been updated
       via  ae21742430849de13801201fb844407fe9035b77 (commit)
      from  f1f16ea87f6cea671ec5ee1b5888e652c97485e1 (commit)

Summary of changes:
 t/TestApp-Dispatcher/t/00-basic.t                  |    2 +-
 .../t/02-dispatch-show-rule-in-wrong-ruleset.t     |    6 +++---
 t/TestApp/t/regex_meta_in_path_info.t              |    3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

- Log -----------------------------------------------------------------
commit ae21742430849de13801201fb844407fe9035b77
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Sat May 22 08:49:29 2010 -0400

    Test fixes for 404s no longer being warnings

diff --git a/t/TestApp-Dispatcher/t/00-basic.t b/t/TestApp-Dispatcher/t/00-basic.t
index 871f275..ceadfb7 100644
--- a/t/TestApp-Dispatcher/t/00-basic.t
+++ b/t/TestApp-Dispatcher/t/00-basic.t
@@ -33,4 +33,4 @@ get_ok("/on_not_exist_show");
 $mech->content_contains("woot");
 
 get_nok("/something_that_really_not_exists");
-$mech->warnings_like(qr/404/);
+$mech->content_like(qr/we don&#39;t think exists/);
diff --git a/t/TestApp/t/02-dispatch-show-rule-in-wrong-ruleset.t b/t/TestApp/t/02-dispatch-show-rule-in-wrong-ruleset.t
index e702dea..7c17ee2 100644
--- a/t/TestApp/t/02-dispatch-show-rule-in-wrong-ruleset.t
+++ b/t/TestApp/t/02-dispatch-show-rule-in-wrong-ruleset.t
@@ -2,7 +2,7 @@
 use warnings;
 use strict;
 
-use Jifty::Test::Dist tests => 11;
+use Jifty::Test::Dist tests => 9;
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;
@@ -15,7 +15,7 @@ my $mech    = Jifty::Test::WWW::Mechanize->new();
 $mech->get("$URL/before_stage_show");
 $mech->content_lacks("This is content");
 is( $mech->status , '404');
-$mech->warnings_like([qr/can't call a 'show' rule in a 'before' or 'after' block/, qr/404/]);
+$mech->warnings_like([qr/can't call a 'show' rule in a 'before' or 'after' block/]);
 
 $mech->get("$URL/on_stage_show");
 $mech->content_contains("his is content");
@@ -23,6 +23,6 @@ $mech->content_contains("his is content");
 $mech->get("$URL/after_stage_show");
 $mech->content_lacks("This is content");
 is( $mech->status , '404');
-$mech->warnings_like([qr/404/, qr/can't call a 'show' rule in a 'before' or 'after' block/]);
+$mech->warnings_like([qr/can't call a 'show' rule in a 'before' or 'after' block/]);
 
 1;
diff --git a/t/TestApp/t/regex_meta_in_path_info.t b/t/TestApp/t/regex_meta_in_path_info.t
index 679f6ec..49298cc 100644
--- a/t/TestApp/t/regex_meta_in_path_info.t
+++ b/t/TestApp/t/regex_meta_in_path_info.t
@@ -6,7 +6,7 @@
 use warnings;
 use strict;
 
-use Jifty::Test::Dist tests => 3;
+use Jifty::Test::Dist tests => 2;
 use Jifty::Test::WWW::Mechanize;
 
 my $server  = Jifty::Test->make_server;
@@ -15,4 +15,3 @@ my $mech    = Jifty::Test::WWW::Mechanize->new();
 
 $mech->get("$URL/*****");
 is( $mech->status, '404', 'regex metachars in URL does not cause error' );
-$mech->warnings_like(qr/404/);

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


More information about the Jifty-commit mailing list