[Jifty-commit] r3638 - in jifty/trunk: lib/Jifty/Web/Form
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Mon Jul 9 19:51:51 EDT 2007
Author: clkao
Date: Mon Jul 9 19:51:51 2007
New Revision: 3638
Modified:
jifty/trunk/lib/Jifty/Web/Form/Field.pm
jifty/trunk/t/TestApp/t/02-dispatch-show-rule-in-wrong-ruleset.t
Log:
Oops, debug info not killed before last commit.
Modified: jifty/trunk/lib/Jifty/Web/Form/Field.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Form/Field.pm (original)
+++ jifty/trunk/lib/Jifty/Web/Form/Field.pm Mon Jul 9 19:51:51 2007
@@ -81,7 +81,6 @@
# a mapped argument, then do the mapping and mark the field as hidden.
# but ignore that if the field is a container in the model
my ($key, $value) = Jifty::Request::Mapper->query_parameters($self->input_name, $self->current_value);
- warn "$key vs ".$self->input_name;
if ($key ne $self->input_name && !$self->action->arguments->{$self->name}{container}) {
Jifty::Util->require('Jifty::Web::Form::Field::Hidden');
bless $self, "Jifty::Web::Form::Field::Hidden";
Modified: jifty/trunk/t/TestApp/t/02-dispatch-show-rule-in-wrong-ruleset.t
==============================================================================
--- jifty/trunk/t/TestApp/t/02-dispatch-show-rule-in-wrong-ruleset.t (original)
+++ jifty/trunk/t/TestApp/t/02-dispatch-show-rule-in-wrong-ruleset.t Mon Jul 9 19:51:51 2007
@@ -6,6 +6,7 @@
use Jifty::SubTest;
use Jifty::Test tests => 8;
use Jifty::Test::WWW::Mechanize;
+use Test::Log4perl;
my $server = Jifty::Test->make_server;
@@ -14,11 +15,14 @@
my $URL = $server->started_ok;
my $mech = Jifty::Test::WWW::Mechanize->new();
+{
+ my $log = Test::Log4perl->expect(['', warn => qr/You can't call a 'show' rule in a 'before' or 'after' block in the dispatcher/ ]);
$mech->get("$URL/before_stage_show", "Got /before_stage_show");
$mech->content_lacks("This is content");
is( $mech->status , '404');
-
+}
$mech->get_ok("$URL/on_stage_show", "Got /on_stage_show");
+#diag $mech->content;
$mech->content_contains("his is content");
$mech->get("$URL/after_stage_show", "Got /after_stage_show");
More information about the Jifty-commit
mailing list