a few more introspection tests

mojolicious · Mar 19, 2012 · e78a3b1 · e78a3b1
1 parent d7885a3
commit e78a3b1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/lib/Mojolicious/Controller.pm b/lib/Mojolicious/Controller.pm
@@ -904,7 +904,6 @@ Automatically select best possible representation for resource from C<Accept>
 request header, C<format> stash value or C<format> GET/POST parameter,
 defaults to rendering an empty C<204> response.
 
-  # Negotiate content
   $c->respond_to(
     json => sub { $c->render_json({just => 'works'}) },
     xml  => {text => '<just>works</just>'},

diff --git a/lib/Mojolicious/Plugin/TagHelpers.pm b/lib/Mojolicious/Plugin/TagHelpers.pm
@@ -18,11 +18,7 @@ sub register {
   # Add "checkbox" helper
   $app->helper(
     check_box => sub {
-      $self->_input(
-        shift, shift,
-        value => shift,
-        @_, type => 'checkbox'
-      );
+      $self->_input(shift, shift, value => shift, @_, type => 'checkbox');
     }
   );
 
@@ -33,12 +29,12 @@ sub register {
   # Add "form_for" helper
   $app->helper(
     form_for => sub {
-      my $c   = shift;
-      my @url = (shift);
+      my ($c, @url) = (shift, shift);
+      push @url, shift if ref $_[0] eq 'HASH';
 
       # POST detection
       my @post;
-      if (my $r = $c->app->routes->find(@url)) {
+      if (my $r = $c->app->routes->find($url[0])) {
         my %methods = (GET => 1, POST => 1);
         do {
           my @via = @{$r->via || []};
@@ -47,9 +43,6 @@ sub register {
         @post = (method => 'POST') if $methods{POST} && !$methods{GET};
       }
 
-      # Captures
-      push @url, shift if ref $_[0] eq 'HASH';
-
       return $self->_tag('form', action => $c->url_for(@url), @post, @_);
     }
   );
@@ -88,8 +81,7 @@ sub register {
       }
 
       # Path
-      my $src;
-      $src = shift if @_ % 2;
+      my $src = @_ % 2 ? shift : undef;
 
       # Attributes
       my %attrs = @_;
@@ -272,8 +264,7 @@ sub _input {
   my %attrs;
   if (@_ % 2) {
     my $value = shift;
-    %attrs = @_;
-    $attrs{value} = $value;
+    %attrs = (@_, value => $value);
   }
 
   # Even
@@ -324,9 +315,7 @@ sub _tag {
 
   # Block
   if ($cb || defined $content) {
-    $tag .= '>';
-    $tag .= $cb ? $cb->() : $content;
-    $tag .= "</$name>";
+    $tag .= '>' . ($cb ? $cb->() : $content) . "</$name>";
   }
 
   # Empty element

diff --git a/t/mojolicious/app.t b/t/mojolicious/app.t
@@ -7,7 +7,7 @@ BEGIN {
   $ENV{MOJO_MODE}       = 'development';
 }
 
-use Test::More tests => 280;
+use Test::More tests => 282;
 
 use FindBin;
 use lib "$FindBin::Bin/lib";
@@ -25,6 +25,12 @@ my $t = Test::Mojo->new('MojoliciousTest');
 # Application is already available
 is $t->app->routes->find('something')->to_string, '/test4/:something',
   'right pattern';
+is $t->app->routes->find('test3')->pattern->defaults->{namespace},
+  'MojoliciousTestController',
+  'right namespace';
+is $t->app->routes->find('authenticated')->pattern->defaults->{controller},
+  'foo',
+  'right controller';
 is $t->app->sessions->cookie_domain, '.example.com', 'right domain';
 is $t->app->sessions->cookie_path,   '/bar',         'right path';
 

diff --git a/t/mojolicious/production_app.t b/t/mojolicious/production_app.t
@@ -7,7 +7,7 @@ BEGIN {
   $ENV{MOJO_MODE}       = 'production';
 }
 
-use Test::More tests => 65;
+use Test::More tests => 67;
 
 use FindBin;
 use lib "$FindBin::Bin/lib";
@@ -20,6 +20,12 @@ my $t = Test::Mojo->new('MojoliciousTest');
 # Application is already available
 is $t->app->routes->find('something')->to_string, '/test4/:something',
   'right pattern';
+is $t->app->routes->find('test3')->pattern->defaults->{namespace},
+  'MojoliciousTestController',
+  'right namespace';
+is $t->app->routes->find('authenticated')->pattern->defaults->{controller},
+  'foo',
+  'right controller';
 is $t->app->sessions->cookie_domain, '.example.com', 'right domain';
 is $t->app->sessions->cookie_path,   '/bar',         'right path';