1 files changed, 21 insertions, 1 deletions
diff --git a/actioncable/test/connection/base_test.rb b/actioncable/test/connection/base_test.rb
index e2b017a9a1..fb11f9be64 100644
--- a/actioncable/test/connection/base_test.rb
+++ b/actioncable/test/connection/base_test.rb
@@ -56,7 +56,7 @@ class ActionCable::Connection::BaseTest < ActionCable::TestCase
     run_in_eventmachine do
       connection = open_connection
 
-      connection.websocket.expects(:transmit).with(regexp_matches(/\_ping/))
+      connection.websocket.expects(:transmit).with({ identifier: "_ping", type: "confirm_subscription" }.to_json)
       connection.message_buffer.expects(:process!)
 
       connection.process
@@ -108,6 +108,26 @@ class ActionCable::Connection::BaseTest < ActionCable::TestCase
     end
   end
 
+  test "rejecting a connection causes a 404" do
+    run_in_eventmachine do
+      class CallMeMaybe
+        def call(*)
+          raise 'Do not call me!'
+        end
+      end
+
+      env = Rack::MockRequest.env_for(
+        "/test",
+        { 'HTTP_CONNECTION' => 'upgrade', 'HTTP_UPGRADE' => 'websocket',
+          'HTTP_ORIGIN' => 'http://rubyonrails.org', 'rack.hijack' => CallMeMaybe.new }
+      )
+
+      connection = ActionCable::Connection::Base.new(@server, env)
+      response = connection.process
+      assert_equal 404, response[0]
+    end
+  end
+
   private
     def open_connection
       env = Rack::MockRequest.env_for "/test", 'HTTP_CONNECTION' => 'upgrade', 'HTTP_UPGRADE' => 'websocket',