aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/test
diff options
context:
space:
mode:
authorJon Moss <me@jonathanmoss.me>2016-01-15 19:07:18 -0500
committerJon Moss <me@jonathanmoss.me>2016-01-18 18:59:30 -0500
commit4c5d5b75abe85d59e5cc9de9904fdef3b23ec25b (patch)
tree63a2b21cdcf1a411d8babc260448fa0a32e0d266 /actioncable/test
parent6aeaed4c1a370084e82c6712a32422a58dac8b8c (diff)
downloadrails-4c5d5b75abe85d59e5cc9de9904fdef3b23ec25b.tar.gz
rails-4c5d5b75abe85d59e5cc9de9904fdef3b23ec25b.tar.bz2
rails-4c5d5b75abe85d59e5cc9de9904fdef3b23ec25b.zip
ActionCable::StorageAdapter ==> ActionCable::SubscriptionAdapter
Diffstat (limited to 'actioncable/test')
-rw-r--r--actioncable/test/stubs/test_adapter.rb2
-rw-r--r--actioncable/test/stubs/test_server.rb4
-rw-r--r--actioncable/test/subscription_adapter/base_test.rb (renamed from actioncable/test/storage_adapter/base_test.rb)6
3 files changed, 6 insertions, 6 deletions
diff --git a/actioncable/test/stubs/test_adapter.rb b/actioncable/test/stubs/test_adapter.rb
index c18ca5dc9d..bbd142b287 100644
--- a/actioncable/test/stubs/test_adapter.rb
+++ b/actioncable/test/stubs/test_adapter.rb
@@ -1,4 +1,4 @@
-class SuccessAdapter < ActionCable::StorageAdapter::Base
+class SuccessAdapter < ActionCable::SubscriptionAdapter::Base
def broadcast(channel, payload)
end
diff --git a/actioncable/test/stubs/test_server.rb b/actioncable/test/stubs/test_server.rb
index e1eb9f113a..067266ed57 100644
--- a/actioncable/test/stubs/test_server.rb
+++ b/actioncable/test/stubs/test_server.rb
@@ -7,11 +7,11 @@ class TestServer
def initialize
@logger = ActiveSupport::TaggedLogging.new ActiveSupport::Logger.new(StringIO.new)
- @config = OpenStruct.new(log_tags: [], storage_adapter: SuccessAdapter)
+ @config = OpenStruct.new(log_tags: [], subscription_adapter: SuccessAdapter)
end
def adapter
- @config.storage_adapter.new(self)
+ @config.subscription_adapter.new(self)
end
def send_async
diff --git a/actioncable/test/storage_adapter/base_test.rb b/actioncable/test/subscription_adapter/base_test.rb
index 47632df387..7a7ae131e6 100644
--- a/actioncable/test/storage_adapter/base_test.rb
+++ b/actioncable/test/subscription_adapter/base_test.rb
@@ -1,15 +1,15 @@
require 'test_helper'
require 'stubs/test_server'
-class ActionCable::StorageAdapter::BaseTest < ActionCable::TestCase
+class ActionCable::SubscriptionAdapter::BaseTest < ActionCable::TestCase
## TEST THAT ERRORS ARE RETURNED FOR INHERITORS THAT DON'T OVERRIDE METHODS
- class BrokenAdapter < ActionCable::StorageAdapter::Base
+ class BrokenAdapter < ActionCable::SubscriptionAdapter::Base
end
setup do
@server = TestServer.new
- @server.config.storage_adapter = BrokenAdapter
+ @server.config.subscription_adapter = BrokenAdapter
@server.config.allowed_request_origins = %w( http://rubyonrails.com )
end