diff --git a/.travis.yml b/.travis.yml index f471edf..e44b7d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,12 @@ matrix: include: - rvm: ruby-head gemfile: Gemfile + - rvm: 2.7 + gemfile: gemfiles/rspec4rails6.gemfile - rvm: 2.6 gemfile: gemfiles/rspec4rails6.gemfile + - rvm: 2.7 + gemfile: gemfiles/rspec4rails5.gemfile - rvm: 2.6 gemfile: gemfiles/rspec4rails5.gemfile - rvm: 2.6 diff --git a/lib/action_cable/testing/connection/test_case.rb b/lib/action_cable/testing/connection/test_case.rb index 069f53e..3afbd34 100644 --- a/lib/action_cable/testing/connection/test_case.rb +++ b/lib/action_cable/testing/connection/test_case.rb @@ -193,7 +193,7 @@ def connect(path = ActionCable.server.config.mount_path, cookies: nil, **request connection = self.class.connection_class.allocate connection.singleton_class.include(TestConnection) - connection.send(:initialize, build_test_request(path, request_params)) + connection.send(:initialize, build_test_request(path, **request_params)) connection.connect if connection.respond_to?(:connect) # Only set instance variable if connected successfully diff --git a/lib/rspec/rails/matchers/action_cable/have_broadcasted_to.rb b/lib/rspec/rails/matchers/action_cable/have_broadcasted_to.rb index cff635e..ca16bd4 100644 --- a/lib/rspec/rails/matchers/action_cable/have_broadcasted_to.rb +++ b/lib/rspec/rails/matchers/action_cable/have_broadcasted_to.rb @@ -17,10 +17,10 @@ def initialize(target, channel:) set_expected_number(:exactly, 1) end - def with(data = nil) + def with(data = nil, &block) @data = data @data = @data.with_indifferent_access if @data.is_a?(Hash) - @block = Proc.new if block_given? + @block = block if block_given? self end