Fix code review comments

- adapter -> pubsub (re)rename internally
- Change variable names to match method names
- Add EventMachine `~> 1.0` as a runtime dependency of ActionCable
- Refactor dependency loading for adapters

2 files changed, 2 insertions, 2 deletions

diff --git a/actioncable/test/stubs/test_connection.rb b/actioncable/test/stubs/test_connection.rb
index fe87dbcb36..da98201900 100644
--- a/actioncable/test/stubs/test_connection.rb
+++ b/actioncable/test/stubs/test_connection.rb
@@ -11,7 +11,7 @@ class TestConnection
     @transmissions = []
   end
 
-  def adapter
+  def pubsub
     SuccessAdapter.new(TestServer.new)
   end
 
diff --git a/actioncable/test/stubs/test_server.rb b/actioncable/test/stubs/test_server.rb
index 067266ed57..6e6541a952 100644
--- a/actioncable/test/stubs/test_server.rb
+++ b/actioncable/test/stubs/test_server.rb
@@ -10,7 +10,7 @@ class TestServer
     @config = OpenStruct.new(log_tags: [], subscription_adapter: SuccessAdapter)
   end
 
-  def adapter
+  def pubsub
     @config.subscription_adapter.new(self)
   end