aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/test/server
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2018-06-08 18:54:57 -0400
committerGitHub <noreply@github.com>2018-06-08 18:54:57 -0400
commit9204c0c5fa96acc2474eaadc8fa538c7f90d7219 (patch)
tree1e1a6d50191431a71a334b393fd320c948a9f4c5 /actioncable/test/server
parent34b16ce86526c9b8ce9abfe1190eadd0caf7be49 (diff)
parent74a9a2927774e21b62913eca9103be78515a4719 (diff)
downloadrails-9204c0c5fa96acc2474eaadc8fa538c7f90d7219.tar.gz
rails-9204c0c5fa96acc2474eaadc8fa538c7f90d7219.tar.bz2
rails-9204c0c5fa96acc2474eaadc8fa538c7f90d7219.zip
Merge pull request #33102 from bogdanvlviv/refactor-actioncable-tests
Refactor actioncable's tests
Diffstat (limited to 'actioncable/test/server')
-rw-r--r--actioncable/test/server/base_test.rb5
-rw-r--r--actioncable/test/server/broadcasting_test.rb2
2 files changed, 2 insertions, 5 deletions
diff --git a/actioncable/test/server/base_test.rb b/actioncable/test/server/base_test.rb
index 3b5931f0a4..d46debea45 100644
--- a/actioncable/test/server/base_test.rb
+++ b/actioncable/test/server/base_test.rb
@@ -3,11 +3,8 @@
require "test_helper"
require "stubs/test_server"
require "active_support/core_ext/hash/indifferent_access"
-require "active_support/testing/method_call_assertions"
-
-class BaseTest < ActiveSupport::TestCase
- include ActiveSupport::Testing::MethodCallAssertions
+class BaseTest < ActionCable::TestCase
def setup
@server = ActionCable::Server::Base.new
@server.config.cable = { adapter: "async" }.with_indifferent_access
diff --git a/actioncable/test/server/broadcasting_test.rb b/actioncable/test/server/broadcasting_test.rb
index 72cec26234..03c900182a 100644
--- a/actioncable/test/server/broadcasting_test.rb
+++ b/actioncable/test/server/broadcasting_test.rb
@@ -3,7 +3,7 @@
require "test_helper"
require "stubs/test_server"
-class BroadcastingTest < ActiveSupport::TestCase
+class BroadcastingTest < ActionCable::TestCase
test "fetching a broadcaster converts the broadcasting queue to a string" do
broadcasting = :test_queue
server = TestServer.new