Include `ActiveSupport::Testing::MethodCallAssertions` to `ActionCable::TestCase`

Remove all `include ActiveSupport::Testing::MethodCallAssertions`
in actioncable's tests since we can do it only in `ActionCable::TestCase`
in order to prevent code duplication.
We use the same approach for other modules of Rails.
This commit is contained in:
bogdanvlviv 2018-06-08 23:25:32 +03:00
parent d97f1670bd
commit 74a9a29277
No known key found for this signature in database
GPG Key ID: E4ACD76A6DB6DFDD
13 changed files with 3 additions and 36 deletions

View File

@ -1,13 +1,10 @@
# frozen_string_literal: true # frozen_string_literal: true
require "test_helper" require "test_helper"
require "active_support/testing/method_call_assertions"
require "stubs/test_connection" require "stubs/test_connection"
require "stubs/room" require "stubs/room"
class ActionCable::Channel::BroadcastingTest < ActionCable::TestCase class ActionCable::Channel::BroadcastingTest < ActionCable::TestCase
include ActiveSupport::Testing::MethodCallAssertions
class ChatChannel < ActionCable::Channel::Base class ChatChannel < ActionCable::Channel::Base
end end

View File

@ -4,11 +4,8 @@ require "test_helper"
require "stubs/test_connection" require "stubs/test_connection"
require "stubs/room" require "stubs/room"
require "active_support/time" require "active_support/time"
require "active_support/testing/method_call_assertions"
class ActionCable::Channel::PeriodicTimersTest < ActionCable::TestCase class ActionCable::Channel::PeriodicTimersTest < ActionCable::TestCase
include ActiveSupport::Testing::MethodCallAssertions
class ChatChannel < ActionCable::Channel::Base class ChatChannel < ActionCable::Channel::Base
# Method name arg # Method name arg
periodically :send_updates, every: 1 periodically :send_updates, every: 1

View File

@ -1,7 +1,6 @@
# frozen_string_literal: true # frozen_string_literal: true
require "test_helper" require "test_helper"
require "active_support/testing/method_call_assertions"
require "minitest/mock" require "minitest/mock"
require "stubs/test_connection" require "stubs/test_connection"
require "stubs/room" require "stubs/room"
@ -164,8 +163,6 @@ module ActionCable::StreamTests
end end
class StreamFromTest < ActionCable::TestCase class StreamFromTest < ActionCable::TestCase
include ActiveSupport::Testing::MethodCallAssertions
setup do setup do
@server = TestServer.new(subscription_adapter: ActionCable::SubscriptionAdapter::Async) @server = TestServer.new(subscription_adapter: ActionCable::SubscriptionAdapter::Async)
@server.config.allowed_request_origins = %w( http://rubyonrails.com ) @server.config.allowed_request_origins = %w( http://rubyonrails.com )

View File

@ -7,7 +7,6 @@ require "websocket-client-simple"
require "json" require "json"
require "active_support/hash_with_indifferent_access" require "active_support/hash_with_indifferent_access"
require "active_support/testing/method_call_assertions"
#### ####
# 😷 Warning suppression 😷 # 😷 Warning suppression 😷
@ -28,8 +27,6 @@ WebSocket::Frame::Data.prepend Module.new {
#### ####
class ClientTest < ActionCable::TestCase class ClientTest < ActionCable::TestCase
include ActiveSupport::Testing::MethodCallAssertions
WAIT_WHEN_EXPECTING_EVENT = 2 WAIT_WHEN_EXPECTING_EVENT = 2
WAIT_WHEN_NOT_EXPECTING_EVENT = 0.5 WAIT_WHEN_NOT_EXPECTING_EVENT = 0.5

View File

@ -1,12 +1,9 @@
# frozen_string_literal: true # frozen_string_literal: true
require "test_helper" require "test_helper"
require "active_support/testing/method_call_assertions"
require "stubs/test_server" require "stubs/test_server"
class ActionCable::Connection::AuthorizationTest < ActionCable::TestCase class ActionCable::Connection::AuthorizationTest < ActionCable::TestCase
include ActiveSupport::Testing::MethodCallAssertions
class Connection < ActionCable::Connection::Base class Connection < ActionCable::Connection::Base
attr_reader :websocket attr_reader :websocket

View File

@ -3,11 +3,8 @@
require "test_helper" require "test_helper"
require "stubs/test_server" require "stubs/test_server"
require "active_support/core_ext/object/json" require "active_support/core_ext/object/json"
require "active_support/testing/method_call_assertions"
class ActionCable::Connection::BaseTest < ActionCable::TestCase class ActionCable::Connection::BaseTest < ActionCable::TestCase
include ActiveSupport::Testing::MethodCallAssertions
class Connection < ActionCable::Connection::Base class Connection < ActionCable::Connection::Base
attr_reader :websocket, :subscriptions, :message_buffer, :connected attr_reader :websocket, :subscriptions, :message_buffer, :connected

View File

@ -2,11 +2,8 @@
require "test_helper" require "test_helper"
require "stubs/test_server" require "stubs/test_server"
require "active_support/testing/method_call_assertions"
class ActionCable::Connection::ClientSocketTest < ActionCable::TestCase class ActionCable::Connection::ClientSocketTest < ActionCable::TestCase
include ActiveSupport::Testing::MethodCallAssertions
class Connection < ActionCable::Connection::Base class Connection < ActionCable::Connection::Base
attr_reader :connected, :websocket, :errors attr_reader :connected, :websocket, :errors

View File

@ -1,13 +1,10 @@
# frozen_string_literal: true # frozen_string_literal: true
require "test_helper" require "test_helper"
require "active_support/testing/method_call_assertions"
require "stubs/test_server" require "stubs/test_server"
require "stubs/user" require "stubs/user"
class ActionCable::Connection::IdentifierTest < ActionCable::TestCase class ActionCable::Connection::IdentifierTest < ActionCable::TestCase
include ActiveSupport::Testing::MethodCallAssertions
class Connection < ActionCable::Connection::Base class Connection < ActionCable::Connection::Base
identified_by :current_user identified_by :current_user
attr_reader :websocket attr_reader :websocket

View File

@ -1,13 +1,10 @@
# frozen_string_literal: true # frozen_string_literal: true
require "test_helper" require "test_helper"
require "active_support/testing/method_call_assertions"
require "minitest/mock" require "minitest/mock"
require "stubs/test_server" require "stubs/test_server"
class ActionCable::Connection::StreamTest < ActionCable::TestCase class ActionCable::Connection::StreamTest < ActionCable::TestCase
include ActiveSupport::Testing::MethodCallAssertions
class Connection < ActionCable::Connection::Base class Connection < ActionCable::Connection::Base
attr_reader :connected, :websocket, :errors attr_reader :connected, :websocket, :errors

View File

@ -1,11 +1,8 @@
# frozen_string_literal: true # frozen_string_literal: true
require "test_helper" require "test_helper"
require "active_support/testing/method_call_assertions"
class ActionCable::Connection::SubscriptionsTest < ActionCable::TestCase class ActionCable::Connection::SubscriptionsTest < ActionCable::TestCase
include ActiveSupport::Testing::MethodCallAssertions
class Connection < ActionCable::Connection::Base class Connection < ActionCable::Connection::Base
attr_reader :websocket attr_reader :websocket

View File

@ -3,11 +3,8 @@
require "test_helper" require "test_helper"
require "stubs/test_server" require "stubs/test_server"
require "active_support/core_ext/hash/indifferent_access" require "active_support/core_ext/hash/indifferent_access"
require "active_support/testing/method_call_assertions"
class BaseTest < ActionCable::TestCase class BaseTest < ActionCable::TestCase
include ActiveSupport::Testing::MethodCallAssertions
def setup def setup
@server = ActionCable::Server::Base.new @server = ActionCable::Server::Base.new
@server.config.cable = { adapter: "async" }.with_indifferent_access @server.config.cable = { adapter: "async" }.with_indifferent_access

View File

@ -4,7 +4,6 @@ require "test_helper"
require_relative "common" require_relative "common"
require_relative "channel_prefix" require_relative "channel_prefix"
require "active_support/testing/method_call_assertions"
require "action_cable/subscription_adapter/redis" require "action_cable/subscription_adapter/redis"
class RedisAdapterTest < ActionCable::TestCase class RedisAdapterTest < ActionCable::TestCase
@ -31,8 +30,6 @@ class RedisAdapterTest::AlternateConfiguration < RedisAdapterTest
end end
class RedisAdapterTest::Connector < ActionCable::TestCase class RedisAdapterTest::Connector < ActionCable::TestCase
include ActiveSupport::Testing::MethodCallAssertions
test "slices url, host, port, db, and password from config" do test "slices url, host, port, db, and password from config" do
config = { url: 1, host: 2, port: 3, db: 4, password: 5 } config = { url: 1, host: 2, port: 3, db: 4, password: 5 }

View File

@ -2,6 +2,7 @@
require "action_cable" require "action_cable"
require "active_support/testing/autorun" require "active_support/testing/autorun"
require "active_support/testing/method_call_assertions"
require "puma" require "puma"
require "rack/mock" require "rack/mock"
@ -15,6 +16,8 @@ end
Dir[File.expand_path("stubs/*.rb", __dir__)].each { |file| require file } Dir[File.expand_path("stubs/*.rb", __dir__)].each { |file| require file }
class ActionCable::TestCase < ActiveSupport::TestCase class ActionCable::TestCase < ActiveSupport::TestCase
include ActiveSupport::Testing::MethodCallAssertions
def wait_for_async def wait_for_async
wait_for_executor Concurrent.global_io_executor wait_for_executor Concurrent.global_io_executor
end end