aboutsummaryrefslogtreecommitdiffstats
path: root/test/channel_test.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-07-04 21:30:48 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-07-04 21:30:48 +0200
commit0de65cf2d8860377d45020a83866073c5fec188c (patch)
treed39b559162936fd79049595d69098fd7712a8fe3 /test/channel_test.rb
parent9886a995f5f0b32d0d400074c48221cb0f6b911e (diff)
parent5de01033150b70982f23a42670c55348a7371c4b (diff)
downloadrails-0de65cf2d8860377d45020a83866073c5fec188c.tar.gz
rails-0de65cf2d8860377d45020a83866073c5fec188c.tar.bz2
rails-0de65cf2d8860377d45020a83866073c5fec188c.zip
Merge branch 'master' of github.com:basecamp/action_cable
Diffstat (limited to 'test/channel_test.rb')
-rw-r--r--test/channel_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/channel_test.rb b/test/channel_test.rb
index ad5fa04356..96987977ea 100644
--- a/test/channel_test.rb
+++ b/test/channel_test.rb
@@ -8,7 +8,7 @@ class ChannelTest < ActionCableTest
end
end
- class PingServer < ActionCable::Server
+ class PingServer < ActionCable::Server::Base
register_channels PingChannel
end