diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/channel/base_test.rb | 4 | ||||
| -rw-r--r-- | test/connection/authorization_test.rb | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/test/channel/base_test.rb b/test/channel/base_test.rb index 7eb8e15845..580338b44a 100644 --- a/test/channel/base_test.rb +++ b/test/channel/base_test.rb @@ -20,8 +20,8 @@ class ActionCable::Channel::BaseTest < ActiveSupport::TestCase class ChatChannel < BasicChannel attr_reader :room, :last_action - on_subscribe :toggle_subscribed - on_unsubscribe :toggle_subscribed + after_subscribe :toggle_subscribed + after_unsubscribe :toggle_subscribed def initialize(*) @subscribed = false diff --git a/test/connection/authorization_test.rb b/test/connection/authorization_test.rb index 762c90fbbc..68668b2835 100644 --- a/test/connection/authorization_test.rb +++ b/test/connection/authorization_test.rb @@ -8,17 +8,25 @@ class ActionCable::Connection::AuthorizationTest < ActionCable::TestCase def connect reject_unauthorized_connection end + + def send_async(method, *args) + # Bypass Celluloid + send method, *args + end end test "unauthorized connection" do run_in_eventmachine do server = TestServer.new - env = Rack::MockRequest.env_for "/test", 'HTTP_CONNECTION' => 'upgrade', 'HTTP_UPGRADE' => 'websocket' + server.config.allowed_request_origins = %w( http://rubyonrails.com ) + + env = Rack::MockRequest.env_for "/test", 'HTTP_CONNECTION' => 'upgrade', 'HTTP_UPGRADE' => 'websocket', + 'HTTP_ORIGIN' => 'http://rubyonrails.com' connection = Connection.new(server, env) connection.websocket.expects(:close) + connection.process - connection.send :on_open end end end |