1 files changed, 14 insertions, 9 deletions
diff --git a/test/connection/string_identifier_test.rb b/test/connection/string_identifier_test.rb
index 87a9025008..ab69df57b3 100644
--- a/test/connection/string_identifier_test.rb
+++ b/test/connection/string_identifier_test.rb
@@ -1,34 +1,39 @@
 require 'test_helper'
 require 'stubs/test_server'
 
-class ActionCable::Connection::StringIdentifierTest < ActiveSupport::TestCase
+class ActionCable::Connection::StringIdentifierTest < ActionCable::TestCase
   class Connection < ActionCable::Connection::Base
     identified_by :current_token
 
     def connect
       self.current_token = "random-string"
     end
-  end
-
-  setup do
-    @server = TestServer.new
 
-    env = Rack::MockRequest.env_for "/test", 'HTTP_CONNECTION' => 'upgrade', 'HTTP_UPGRADE' => 'websocket'
-    @connection = Connection.new(@server, env)
+    def send_async(method, *args)
+      # Bypass Celluloid
+      send method, *args
+    end
   end
 
   test "connection identifier" do
-    open_connection_with_stubbed_pubsub
-    assert_equal "random-string", @connection.connection_identifier
+    run_in_eventmachine do
+      open_connection_with_stubbed_pubsub
+      assert_equal "random-string", @connection.connection_identifier
+    end
   end
 
   protected
     def open_connection_with_stubbed_pubsub
+      @server = TestServer.new
       @server.stubs(:pubsub).returns(stub_everything('pubsub'))
+
       open_connection
     end
 
     def open_connection
+      env = Rack::MockRequest.env_for "/test", 'HTTP_CONNECTION' => 'upgrade', 'HTTP_UPGRADE' => 'websocket'
+      @connection = Connection.new(@server, env)
+
       @connection.process
       @connection.send :on_open
     end