allow is_established to be used client-side as well

mojolicious · Apr 9, 2015 · adfe975 · adfe975
1 parent 4f0399d
commit adfe975
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/lib/Mojo/Transaction/WebSocket.pm b/lib/Mojo/Transaction/WebSocket.pm
@@ -106,7 +106,7 @@ sub client_challenge {
     if ($headers->sec_websocket_extensions // '') =~ /permessage-deflate/;
 
   return _challenge($self->req->headers->sec_websocket_key) eq
-    $headers->sec_websocket_accept;
+    $headers->sec_websocket_accept && ++$self->{open};
 }
 
 sub client_handshake {

diff --git a/t/mojo/websocket.t b/t/mojo/websocket.t
@@ -161,10 +161,11 @@ ok $body =~ /^(\d+)failed!$/ && $1 == 15, 'right content';
 
 # Server directly sends a message
 $result = '';
-my ($status, $msg);
+my ($established, $status, $msg);
 $ua->websocket(
   '/early_start' => sub {
     my ($ua, $tx) = @_;
+    $established = $tx->is_established;
     $tx->on(
       finish => sub {
         my ($tx, $code, $reason) = @_;
@@ -182,9 +183,10 @@ $ua->websocket(
   }
 );
 Mojo::IOLoop->start;
-is $status, 1000,                 'right status';
-is $msg,    'I ♥ Mojolicious!', 'right message';
-is $result, 'test0test2test1',    'right result';
+ok $established, 'connection established';
+is $status,      1000, 'right status';
+is $msg,         'I ♥ Mojolicious!', 'right message';
+is $result,      'test0test2test1', 'right result';
 
 # Connection denied
 ($stash, $code, $ws) = ();