From 90296674b1cd8d9170e072ff87ddb69987e7c420 Mon Sep 17 00:00:00 2001 From: Vladimir Dementyev Date: Wed, 2 Jan 2019 14:56:10 -0500 Subject: feature: add ActionCable::Connection::TestCase --- actioncable/lib/action_cable/connection.rb | 1 + .../lib/action_cable/connection/test_case.rb | 241 +++++++++++++++++++++ 2 files changed, 242 insertions(+) create mode 100644 actioncable/lib/action_cable/connection/test_case.rb (limited to 'actioncable/lib') diff --git a/actioncable/lib/action_cable/connection.rb b/actioncable/lib/action_cable/connection.rb index 804b89a707..20b5dbe78d 100644 --- a/actioncable/lib/action_cable/connection.rb +++ b/actioncable/lib/action_cable/connection.rb @@ -15,6 +15,7 @@ module ActionCable autoload :StreamEventLoop autoload :Subscriptions autoload :TaggedLoggerProxy + autoload :TestCase autoload :WebSocket end end diff --git a/actioncable/lib/action_cable/connection/test_case.rb b/actioncable/lib/action_cable/connection/test_case.rb new file mode 100644 index 0000000000..ac3bf32df5 --- /dev/null +++ b/actioncable/lib/action_cable/connection/test_case.rb @@ -0,0 +1,241 @@ +# frozen_string_literal: true + +require "active_support" +require "active_support/test_case" +require "active_support/core_ext/hash/indifferent_access" +require "action_dispatch" +require "action_dispatch/http/headers" +require "action_dispatch/testing/test_request" + +module ActionCable + module Connection + class NonInferrableConnectionError < ::StandardError + def initialize(name) + super "Unable to determine the connection to test from #{name}. " + + "You'll need to specify it using `tests YourConnection` in your " + + "test case definition." + end + end + + module Assertions + # Asserts that the connection is rejected (via +reject_unauthorized_connection+). + # + # # Asserts that connection without user_id fails + # assert_reject_connection { connect params: { user_id: '' } } + def assert_reject_connection(&block) + res = + begin + block.call + false + rescue ActionCable::Connection::Authorization::UnauthorizedError + true + end + + assert res, "Expected to reject connection but no rejection were made" + end + end + + # We don't want to use the whole "encryption stack" for connection + # unit-tests, but we want to make sure that users test against the correct types + # of cookies (i.e. signed or encrypted or plain) + class TestCookieJar < ActiveSupport::HashWithIndifferentAccess + def signed + self[:signed] ||= {}.with_indifferent_access + end + + def encrypted + self[:encrypted] ||= {}.with_indifferent_access + end + end + + class TestRequest < ActionDispatch::TestRequest + attr_accessor :session, :cookie_jar + + attr_writer :cookie_jar + end + + module TestConnection + attr_reader :logger, :request + + def initialize(request) + inner_logger = ActiveSupport::Logger.new(StringIO.new) + tagged_logging = ActiveSupport::TaggedLogging.new(inner_logger) + @logger = ActionCable::Connection::TaggedLoggerProxy.new(tagged_logging, tags: []) + @request = request + @env = request.env + end + end + + # Superclass for Action Cable connection unit tests. + # + # == Basic example + # + # Unit tests are written as follows: + # 1. First, one uses the +connect+ method to simulate connection. + # 2. Then, one asserts whether the current state is as expected (e.g. identifiers). + # + # For example: + # + # module ApplicationCable + # class ConnectionTest < ActionCable::Connection::TestCase + # def test_connects_with_cookies + # cookies["user_id"] = users[:john].id + # # Simulate a connection + # connect + # + # # Asserts that the connection identifier is correct + # assert_equal "John", connection.user.name + # end + # + # def test_does_not_connect_without_user + # assert_reject_connection do + # connect + # end + # end + # end + # end + # + # You can also provide additional information about underlying HTTP request + # (params, headers, session and Rack env): + # + # def test_connect_with_headers_and_query_string + # connect "/cable?user_id=1", headers: { "X-API-TOKEN" => 'secret-my' } + # + # assert_equal connection.user_id, "1" + # end + # + # def test_connect_with_params + # connect params: { user_id: 1 } + # + # assert_equal connection.user_id, "1" + # end + # + # You can also manage request cookies: + # + # def test_connect_with_cookies + # # plain cookies + # cookies["user_id"] = 1 + # # or signed/encrypted + # # cookies.signed["user_id"] = 1 + # + # connect + # + # assert_equal connection.user_id, "1" + # end + # + # == Connection is automatically inferred + # + # ActionCable::Connection::TestCase will automatically infer the connection under test + # from the test class name. If the channel cannot be inferred from the test + # class name, you can explicitly set it with +tests+. + # + # class ConnectionTest < ActionCable::Connection::TestCase + # tests ApplicationCable::Connection + # end + # + class TestCase < ActiveSupport::TestCase + module Behavior + extend ActiveSupport::Concern + + DEFAULT_PATH = "/cable" + + include ActiveSupport::Testing::ConstantLookup + include Assertions + + included do + class_attribute :_connection_class + + attr_reader :connection + + ActiveSupport.run_load_hooks(:action_cable_connection_test_case, self) + end + + module ClassMethods + def tests(connection) + case connection + when String, Symbol + self._connection_class = connection.to_s.camelize.constantize + when Module + self._connection_class = connection + else + raise NonInferrableConnectionError.new(connection) + end + end + + def connection_class + if connection = self._connection_class + connection + else + tests determine_default_connection(name) + end + end + + def determine_default_connection(name) + connection = determine_constant_from_test_name(name) do |constant| + Class === constant && constant < ActionCable::Connection::Base + end + raise NonInferrableConnectionError.new(name) if connection.nil? + connection + end + end + + # Performs connection attempt (i.e. calls #connect method). + # + # Accepts request path as the first argument and the following request options: + # - params – url parameters (Hash) + # - headers – request headers (Hash) + # - session – session data (Hash) + # - env – addittional Rack env configuration (Hash) + def connect(path = ActionCable.server.config.mount_path, **request_params) + path ||= DEFAULT_PATH + + connection = self.class.connection_class.allocate + connection.singleton_class.include(TestConnection) + connection.send(:initialize, build_test_request(path, request_params)) + connection.connect if connection.respond_to?(:connect) + + # Only set instance variable if connected successfully + @connection = connection + end + + # Disconnect the connection under test (i.e. calls #disconnect) + def disconnect + raise "Must be connected!" if connection.nil? + + connection.disconnect if connection.respond_to?(:disconnect) + @connection = nil + end + + def cookies + @cookie_jar ||= TestCookieJar.new + end + + private + + def build_test_request(path, params: nil, headers: {}, session: {}, env: {}) + wrapped_headers = ActionDispatch::Http::Headers.from_hash(headers) + + uri = URI.parse(path) + + query_string = params.nil? ? uri.query : params.to_query + + request_env = { + "QUERY_STRING" => query_string, + "PATH_INFO" => uri.path + }.merge(env) + + if wrapped_headers.present? + ActionDispatch::Http::Headers.from_hash(request_env).merge!(wrapped_headers) + end + + TestRequest.create(request_env).tap do |request| + request.session = session.with_indifferent_access + request.cookie_jar = cookies + end + end + end + + include Behavior + end + end +end -- cgit v1.2.3 From 86b489e3d6a9efbefbc62e8531d0f5850934d4e1 Mon Sep 17 00:00:00 2001 From: Javan Makhmali Date: Wed, 9 Jan 2019 08:09:51 -0500 Subject: Move all npm packages to @rails scope Fixes #33083 --- .../lib/rails/generators/channel/templates/javascript/consumer.js.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actioncable/lib') diff --git a/actioncable/lib/rails/generators/channel/templates/javascript/consumer.js.tt b/actioncable/lib/rails/generators/channel/templates/javascript/consumer.js.tt index 76ca3d0f2f..eec7e54b8a 100644 --- a/actioncable/lib/rails/generators/channel/templates/javascript/consumer.js.tt +++ b/actioncable/lib/rails/generators/channel/templates/javascript/consumer.js.tt @@ -1,6 +1,6 @@ // Action Cable provides the framework to deal with WebSockets in Rails. // You can generate new channels where WebSocket features live using the `rails generate channel` command. -import ActionCable from "actioncable" +import ActionCable from "@rails/actioncable" export default ActionCable.createConsumer() -- cgit v1.2.3 From 3631d7eee4bd034f2eefe1b9892d5fcd565579ac Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Mon, 14 Jan 2019 00:26:27 +0100 Subject: Update Action Cable connection testing. * Don't reimplement assert_raises Also test what happens in case there's no explicit rejection. * Avoid OpenStruct. Remove space beneath private. * Simplify verification methods for code under test. * Match documentation with other Rails docs. Also remove mention of the custom path argument for now. Unsure how useful that really is. --- .../lib/action_cable/connection/test_case.rb | 83 ++++++++++------------ 1 file changed, 39 insertions(+), 44 deletions(-) (limited to 'actioncable/lib') diff --git a/actioncable/lib/action_cable/connection/test_case.rb b/actioncable/lib/action_cable/connection/test_case.rb index ac3bf32df5..233fd837e0 100644 --- a/actioncable/lib/action_cable/connection/test_case.rb +++ b/actioncable/lib/action_cable/connection/test_case.rb @@ -23,15 +23,7 @@ module ActionCable # # Asserts that connection without user_id fails # assert_reject_connection { connect params: { user_id: '' } } def assert_reject_connection(&block) - res = - begin - block.call - false - rescue ActionCable::Connection::Authorization::UnauthorizedError - true - end - - assert res, "Expected to reject connection but no rejection were made" + assert_raises(Authorization::UnauthorizedError, "Expected to reject connection but no rejection was made", &block) end end @@ -66,61 +58,64 @@ module ActionCable end end - # Superclass for Action Cable connection unit tests. + # Unit test Action Cable connections. + # + # Useful to check whether a connection's +identified_by+ gets assigned properly + # and that any improper connection requests are rejected. # # == Basic example # # Unit tests are written as follows: - # 1. First, one uses the +connect+ method to simulate connection. - # 2. Then, one asserts whether the current state is as expected (e.g. identifiers). - # - # For example: - # - # module ApplicationCable - # class ConnectionTest < ActionCable::Connection::TestCase - # def test_connects_with_cookies - # cookies["user_id"] = users[:john].id - # # Simulate a connection - # connect - # - # # Asserts that the connection identifier is correct - # assert_equal "John", connection.user.name - # end - # - # def test_does_not_connect_without_user - # assert_reject_connection do - # connect - # end - # end + # + # 1. Simulate a connection attempt by calling +connect+. + # 2. Assert state, e.g. identifiers, has been assigned. + # + # + # class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase + # def test_connects_with_proper_cookie + # # Simulate the connection request with a cookie. + # cookies["user_id"] = users(:john).id + + # connect + # + # # Assert the connection identifier matches the fixture. + # assert_equal users(:john).id, connection.user.id + # end + # + # def test_rejects_connection_without_proper_cookie + # assert_reject_connection { connect } # end # end # - # You can also provide additional information about underlying HTTP request - # (params, headers, session and Rack env): + # +connect+ accepts additional information the HTTP request with the + # +params+, +headers+, +session+ and Rack +env+ options. # # def test_connect_with_headers_and_query_string - # connect "/cable?user_id=1", headers: { "X-API-TOKEN" => 'secret-my' } + # connect params: { user_id: 1 }, headers: { "X-API-TOKEN" => "secret-my" } # - # assert_equal connection.user_id, "1" + # assert_equal "1", connection.user.id + # assert_equal "secret-my", connection.token # end # # def test_connect_with_params # connect params: { user_id: 1 } # - # assert_equal connection.user_id, "1" + # assert_equal "1", connection.user.id # end # - # You can also manage request cookies: + # You can also setup the correct cookies before the connection request: # # def test_connect_with_cookies - # # plain cookies + # # Plain cookies: # cookies["user_id"] = 1 - # # or signed/encrypted + # + # # Or signed/encrypted: # # cookies.signed["user_id"] = 1 + # # cookies.encrypted["user_id"] = 1 # # connect # - # assert_equal connection.user_id, "1" + # assert_equal "1", connection.user_id # end # # == Connection is automatically inferred @@ -179,13 +174,14 @@ module ActionCable end end - # Performs connection attempt (i.e. calls #connect method). + # Performs connection attempt to exert #connect on the connection under test. # # Accepts request path as the first argument and the following request options: + # # - params – url parameters (Hash) # - headers – request headers (Hash) # - session – session data (Hash) - # - env – addittional Rack env configuration (Hash) + # - env – additional Rack env configuration (Hash) def connect(path = ActionCable.server.config.mount_path, **request_params) path ||= DEFAULT_PATH @@ -198,7 +194,7 @@ module ActionCable @connection = connection end - # Disconnect the connection under test (i.e. calls #disconnect) + # Exert #disconnect on the connection under test. def disconnect raise "Must be connected!" if connection.nil? @@ -211,7 +207,6 @@ module ActionCable end private - def build_test_request(path, params: nil, headers: {}, session: {}, env: {}) wrapped_headers = ActionDispatch::Http::Headers.from_hash(headers) -- cgit v1.2.3 From 0f41aa30d30afff051e68afe67c53b626d5b05c0 Mon Sep 17 00:00:00 2001 From: Vladimir Dementyev Date: Sun, 13 Jan 2019 21:54:31 -0500 Subject: Add channel test generator --- actioncable/lib/rails/generators/channel/USAGE | 3 ++- .../rails/generators/channel/channel_generator.rb | 2 ++ .../rails/generators/test_unit/channel_generator.rb | 20 ++++++++++++++++++++ .../test_unit/templates/channel_test.rb.tt | 10 ++++++++++ 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 actioncable/lib/rails/generators/test_unit/channel_generator.rb create mode 100644 actioncable/lib/rails/generators/test_unit/templates/channel_test.rb.tt (limited to 'actioncable/lib') diff --git a/actioncable/lib/rails/generators/channel/USAGE b/actioncable/lib/rails/generators/channel/USAGE index ea9662436c..bb5dd7e2db 100644 --- a/actioncable/lib/rails/generators/channel/USAGE +++ b/actioncable/lib/rails/generators/channel/USAGE @@ -7,6 +7,7 @@ Example: ======== rails generate channel Chat speak - creates a Chat channel class and JavaScript asset: + creates a Chat channel class, test and JavaScript asset: Channel: app/channels/chat_channel.rb + Test: test/channels/chat_channel_test.rb Assets: app/javascript/channels/chat_channel.js diff --git a/actioncable/lib/rails/generators/channel/channel_generator.rb b/actioncable/lib/rails/generators/channel/channel_generator.rb index ef51981e89..0b80d1f96b 100644 --- a/actioncable/lib/rails/generators/channel/channel_generator.rb +++ b/actioncable/lib/rails/generators/channel/channel_generator.rb @@ -11,6 +11,8 @@ module Rails check_class_collision suffix: "Channel" + hook_for :test_framework + def create_channel_file template "channel.rb", File.join("app/channels", class_path, "#{file_name}_channel.rb") diff --git a/actioncable/lib/rails/generators/test_unit/channel_generator.rb b/actioncable/lib/rails/generators/test_unit/channel_generator.rb new file mode 100644 index 0000000000..7d13a12f0a --- /dev/null +++ b/actioncable/lib/rails/generators/test_unit/channel_generator.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +module TestUnit + module Generators + class ChannelGenerator < ::Rails::Generators::NamedBase + source_root File.expand_path("templates", __dir__) + + check_class_collision suffix: "ChannelTest" + + def create_test_files + template "channel_test.rb", File.join("test/channels", class_path, "#{file_name}_channel_test.rb") + end + + private + def file_name # :doc: + @_file_name ||= super.sub(/_channel\z/i, "") + end + end + end +end diff --git a/actioncable/lib/rails/generators/test_unit/templates/channel_test.rb.tt b/actioncable/lib/rails/generators/test_unit/templates/channel_test.rb.tt new file mode 100644 index 0000000000..301dc0b6fe --- /dev/null +++ b/actioncable/lib/rails/generators/test_unit/templates/channel_test.rb.tt @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +require "test_helper" + +class <%= class_name %>ChannelTest < ActionCable::Channel::TestCase + # test "subscribes" do + # subscribe + # assert subscription.confirmed? + # end +end -- cgit v1.2.3 From a4099debcfd7e5e1fe3e5fd9111b7cb0242eb56d Mon Sep 17 00:00:00 2001 From: Vladimir Dementyev Date: Sun, 13 Jan 2019 22:58:47 -0500 Subject: Add Action Cable Testing guides --- actioncable/lib/action_cable/connection/test_case.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actioncable/lib') diff --git a/actioncable/lib/action_cable/connection/test_case.rb b/actioncable/lib/action_cable/connection/test_case.rb index 233fd837e0..26a183d1ec 100644 --- a/actioncable/lib/action_cable/connection/test_case.rb +++ b/actioncable/lib/action_cable/connection/test_case.rb @@ -75,7 +75,7 @@ module ActionCable # def test_connects_with_proper_cookie # # Simulate the connection request with a cookie. # cookies["user_id"] = users(:john).id - + # # connect # # # Assert the connection identifier matches the fixture. -- cgit v1.2.3 From a43052cbbcb4f6671cf16fa45c906984fe601fa0 Mon Sep 17 00:00:00 2001 From: bogdanvlviv Date: Wed, 16 Jan 2019 15:14:35 +0000 Subject: Remove `frozen_string_literal` from Action Cable's template files Related to 837f602fa1b3281113dac965a8ef96de3cac8b02 Fix the testing guide. --- actioncable/lib/rails/generators/test_unit/templates/channel_test.rb.tt | 2 -- 1 file changed, 2 deletions(-) (limited to 'actioncable/lib') diff --git a/actioncable/lib/rails/generators/test_unit/templates/channel_test.rb.tt b/actioncable/lib/rails/generators/test_unit/templates/channel_test.rb.tt index 301dc0b6fe..7307654611 100644 --- a/actioncable/lib/rails/generators/test_unit/templates/channel_test.rb.tt +++ b/actioncable/lib/rails/generators/test_unit/templates/channel_test.rb.tt @@ -1,5 +1,3 @@ -# frozen_string_literal: true - require "test_helper" class <%= class_name %>ChannelTest < ActionCable::Channel::TestCase -- cgit v1.2.3