diff --git a/actioncable/test/channel/broadcasting_test.rb b/actioncable/test/channel/broadcasting_test.rb index b2f8681892..2cbfabc1d0 100644 --- a/actioncable/test/channel/broadcasting_test.rb +++ b/actioncable/test/channel/broadcasting_test.rb @@ -1,13 +1,10 @@ # frozen_string_literal: true require "test_helper" -require "active_support/testing/method_call_assertions" require "stubs/test_connection" require "stubs/room" class ActionCable::Channel::BroadcastingTest < ActionCable::TestCase - include ActiveSupport::Testing::MethodCallAssertions - class ChatChannel < ActionCable::Channel::Base end diff --git a/actioncable/test/channel/periodic_timers_test.rb b/actioncable/test/channel/periodic_timers_test.rb index d6b8992148..0c979f4c7c 100644 --- a/actioncable/test/channel/periodic_timers_test.rb +++ b/actioncable/test/channel/periodic_timers_test.rb @@ -4,11 +4,8 @@ require "test_helper" require "stubs/test_connection" require "stubs/room" require "active_support/time" -require "active_support/testing/method_call_assertions" class ActionCable::Channel::PeriodicTimersTest < ActionCable::TestCase - include ActiveSupport::Testing::MethodCallAssertions - class ChatChannel < ActionCable::Channel::Base # Method name arg periodically :send_updates, every: 1 diff --git a/actioncable/test/channel/stream_test.rb b/actioncable/test/channel/stream_test.rb index ed42f1acd4..bfe1f92946 100644 --- a/actioncable/test/channel/stream_test.rb +++ b/actioncable/test/channel/stream_test.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require "test_helper" -require "active_support/testing/method_call_assertions" require "minitest/mock" require "stubs/test_connection" require "stubs/room" @@ -164,8 +163,6 @@ module ActionCable::StreamTests end class StreamFromTest < ActionCable::TestCase - include ActiveSupport::Testing::MethodCallAssertions - setup do @server = TestServer.new(subscription_adapter: ActionCable::SubscriptionAdapter::Async) @server.config.allowed_request_origins = %w( http://rubyonrails.com ) diff --git a/actioncable/test/client_test.rb b/actioncable/test/client_test.rb index 92fe59c803..e5f43488c4 100644 --- a/actioncable/test/client_test.rb +++ b/actioncable/test/client_test.rb @@ -7,7 +7,6 @@ require "websocket-client-simple" require "json" require "active_support/hash_with_indifferent_access" -require "active_support/testing/method_call_assertions" #### # 😷 Warning suppression 😷 @@ -28,8 +27,6 @@ WebSocket::Frame::Data.prepend Module.new { #### class ClientTest < ActionCable::TestCase - include ActiveSupport::Testing::MethodCallAssertions - WAIT_WHEN_EXPECTING_EVENT = 2 WAIT_WHEN_NOT_EXPECTING_EVENT = 0.5 diff --git a/actioncable/test/connection/authorization_test.rb b/actioncable/test/connection/authorization_test.rb index be41d510ff..f77e543435 100644 --- a/actioncable/test/connection/authorization_test.rb +++ b/actioncable/test/connection/authorization_test.rb @@ -1,12 +1,9 @@ # frozen_string_literal: true require "test_helper" -require "active_support/testing/method_call_assertions" require "stubs/test_server" class ActionCable::Connection::AuthorizationTest < ActionCable::TestCase - include ActiveSupport::Testing::MethodCallAssertions - class Connection < ActionCable::Connection::Base attr_reader :websocket diff --git a/actioncable/test/connection/base_test.rb b/actioncable/test/connection/base_test.rb index 9e480ab60d..6ffa0961bc 100644 --- a/actioncable/test/connection/base_test.rb +++ b/actioncable/test/connection/base_test.rb @@ -3,11 +3,8 @@ require "test_helper" require "stubs/test_server" require "active_support/core_ext/object/json" -require "active_support/testing/method_call_assertions" class ActionCable::Connection::BaseTest < ActionCable::TestCase - include ActiveSupport::Testing::MethodCallAssertions - class Connection < ActionCable::Connection::Base attr_reader :websocket, :subscriptions, :message_buffer, :connected diff --git a/actioncable/test/connection/client_socket_test.rb b/actioncable/test/connection/client_socket_test.rb index 07bdc7c52a..9176c7ac8b 100644 --- a/actioncable/test/connection/client_socket_test.rb +++ b/actioncable/test/connection/client_socket_test.rb @@ -2,11 +2,8 @@ require "test_helper" require "stubs/test_server" -require "active_support/testing/method_call_assertions" class ActionCable::Connection::ClientSocketTest < ActionCable::TestCase - include ActiveSupport::Testing::MethodCallAssertions - class Connection < ActionCable::Connection::Base attr_reader :connected, :websocket, :errors diff --git a/actioncable/test/connection/identifier_test.rb b/actioncable/test/connection/identifier_test.rb index a7e23b4cd8..707f4bab72 100644 --- a/actioncable/test/connection/identifier_test.rb +++ b/actioncable/test/connection/identifier_test.rb @@ -1,13 +1,10 @@ # frozen_string_literal: true require "test_helper" -require "active_support/testing/method_call_assertions" require "stubs/test_server" require "stubs/user" class ActionCable::Connection::IdentifierTest < ActionCable::TestCase - include ActiveSupport::Testing::MethodCallAssertions - class Connection < ActionCable::Connection::Base identified_by :current_user attr_reader :websocket diff --git a/actioncable/test/connection/stream_test.rb b/actioncable/test/connection/stream_test.rb index daf7c37c79..0f4576db40 100644 --- a/actioncable/test/connection/stream_test.rb +++ b/actioncable/test/connection/stream_test.rb @@ -1,13 +1,10 @@ # frozen_string_literal: true require "test_helper" -require "active_support/testing/method_call_assertions" require "minitest/mock" require "stubs/test_server" class ActionCable::Connection::StreamTest < ActionCable::TestCase - include ActiveSupport::Testing::MethodCallAssertions - class Connection < ActionCable::Connection::Base attr_reader :connected, :websocket, :errors diff --git a/actioncable/test/connection/subscriptions_test.rb b/actioncable/test/connection/subscriptions_test.rb index 7bc8c4241c..902085c5d6 100644 --- a/actioncable/test/connection/subscriptions_test.rb +++ b/actioncable/test/connection/subscriptions_test.rb @@ -1,11 +1,8 @@ # frozen_string_literal: true require "test_helper" -require "active_support/testing/method_call_assertions" class ActionCable::Connection::SubscriptionsTest < ActionCable::TestCase - include ActiveSupport::Testing::MethodCallAssertions - class Connection < ActionCable::Connection::Base attr_reader :websocket diff --git a/actioncable/test/server/base_test.rb b/actioncable/test/server/base_test.rb index ad06e7ca3c..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 < ActionCable::TestCase - include ActiveSupport::Testing::MethodCallAssertions - def setup @server = ActionCable::Server::Base.new @server.config.cable = { adapter: "async" }.with_indifferent_access diff --git a/actioncable/test/subscription_adapter/redis_test.rb b/actioncable/test/subscription_adapter/redis_test.rb index 523c205dca..3dc995331a 100644 --- a/actioncable/test/subscription_adapter/redis_test.rb +++ b/actioncable/test/subscription_adapter/redis_test.rb @@ -4,7 +4,6 @@ require "test_helper" require_relative "common" require_relative "channel_prefix" -require "active_support/testing/method_call_assertions" require "action_cable/subscription_adapter/redis" class RedisAdapterTest < ActionCable::TestCase @@ -31,8 +30,6 @@ class RedisAdapterTest::AlternateConfiguration < RedisAdapterTest end class RedisAdapterTest::Connector < ActionCable::TestCase - include ActiveSupport::Testing::MethodCallAssertions - test "slices url, host, port, db, and password from config" do config = { url: 1, host: 2, port: 3, db: 4, password: 5 } diff --git a/actioncable/test/test_helper.rb b/actioncable/test/test_helper.rb index 755f7b71b4..ac7881c950 100644 --- a/actioncable/test/test_helper.rb +++ b/actioncable/test/test_helper.rb @@ -2,6 +2,7 @@ require "action_cable" require "active_support/testing/autorun" +require "active_support/testing/method_call_assertions" require "puma" require "rack/mock" @@ -15,6 +16,8 @@ end Dir[File.expand_path("stubs/*.rb", __dir__)].each { |file| require file } class ActionCable::TestCase < ActiveSupport::TestCase + include ActiveSupport::Testing::MethodCallAssertions + def wait_for_async wait_for_executor Concurrent.global_io_executor end