fixed url_for bug where deeply nested WebSocket routes would not work…

… correctly
mojolicious · Sep 26, 2014 · 3878d57 · 3878d57
1 parent eea6404
commit 3878d57
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -5,6 +5,8 @@
   - Improved performance of next, next_sibling, previous and previous_sibling
     methods in Mojo::DOM significantly.
   - Improved Mojo::Cache to allow caching to be disabled. (mvgrimes, sri)
+  - Fixed url_for bug where deeply nested WebSocket routes would not work
+    correctly.
 
 5.44  2014-09-23
   - Fixed bug in Mojolicious::Renderer that prevented proxy objects from being

diff --git a/lib/Mojolicious/Routes/Route.pm b/lib/Mojolicious/Routes/Route.pm
@@ -74,7 +74,7 @@ sub has_websocket {
   my $self = shift;
   return 1 if $self->is_websocket;
   return undef unless my $parent = $self->parent;
-  return $parent->is_websocket;
+  return $parent->has_websocket;
 }
 
 sub is_endpoint { $_[0]->inline ? undef : !@{$_[0]->children} }

diff --git a/t/mojo/websocket.t b/t/mojo/websocket.t
@@ -382,7 +382,7 @@ $ua->websocket(
 );
 Mojo::IOLoop->start;
 ok $finished, 'transaction is finished';
-ok !$ws, 'no websocket';
+ok !$ws, 'not a websocket';
 is $code, 500, 'right status';
 is $msg, 'Internal Server Error', 'right message';
 
@@ -398,7 +398,7 @@ $ua->websocket(
   }
 );
 Mojo::IOLoop->start;
-ok !$ws, 'no websocket';
+ok !$ws, 'not a websocket';
 is $code, 403,            'right status';
 is $msg,  "i'm a teapot", 'right message';
 

diff --git a/t/mojolicious/routes.t b/t/mojolicious/routes.t
@@ -186,6 +186,10 @@ is $second->render('', {}), '/second', 'right result';
 $target->add_child($first)->add_child($second);
 is $second->render('', {}), '/target/second', 'right result';
 
+# /websocket
+$r->websocket('/websocket' => {controller => 'ws'})->route('/')
+  ->to(action => 'just')->route->to(works => 1);
+
 # /slash
 $r->route('/slash')->to(controller => 'just')->route('/')
   ->to(action => 'slash');
@@ -828,13 +832,24 @@ $m = Mojolicious::Routes::Match->new(root => $r);
 $m->match($c => {method => 'GET', path => '/target/third'});
 is_deeply $m->stack, [], 'empty stack';
 
+# WebSocket
+$m = Mojolicious::Routes::Match->new(root => $r);
+$m->match($c => {method => 'GET', path => '/websocket'});
+is_deeply $m->stack, [], 'empty stack';
+$m->match($c => {method => 'GET', path => '/websocket', websocket => 1});
+is_deeply $m->stack, [{controller => 'ws', action => 'just', works => 1}],
+  'right structure';
+is $m->path_for->{path}, '/websocket', 'right path';
+ok $m->path_for->{websocket}, 'is a websocket';
+
 # Just a slash with a format after a path
 $m = Mojolicious::Routes::Match->new(root => $r);
 $m->match($c => {method => 'GET', path => '/slash.txt'});
 is_deeply $m->stack,
   [{controller => 'just', action => 'slash', format => 'txt'}],
   'right structure';
 is $m->path_for->{path}, '/slash', 'right path';
+ok !$m->path_for->{websocket}, 'not a websocket';
 is $m->path_for(format => 'html')->{path}, '/slash.html', 'right path';
 
 # Nameless placeholder