diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2015-07-04 21:30:48 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2015-07-04 21:30:48 +0200 |
| commit | 0de65cf2d8860377d45020a83866073c5fec188c (patch) | |
| tree | d39b559162936fd79049595d69098fd7712a8fe3 /test | |
| parent | 9886a995f5f0b32d0d400074c48221cb0f6b911e (diff) | |
| parent | 5de01033150b70982f23a42670c55348a7371c4b (diff) | |
| download | rails-0de65cf2d8860377d45020a83866073c5fec188c.tar.gz rails-0de65cf2d8860377d45020a83866073c5fec188c.tar.bz2 rails-0de65cf2d8860377d45020a83866073c5fec188c.zip | |
Merge branch 'master' of github.com:basecamp/action_cable
Diffstat (limited to 'test')
| -rw-r--r-- | test/channel_test.rb | 2 | ||||
| -rw-r--r-- | test/server_test.rb | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/test/server_test.rb b/test/server_test.rb index 824875bb99..1e02497f61 100644 --- a/test/server_test.rb +++ b/test/server_test.rb @@ -8,7 +8,7 @@ class ServerTest < ActionCableTest end end - class ChatServer < ActionCable::Server + class ChatServer < ActionCable::Server::Base register_channels ChatChannel end |