action-cable-testing 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9193234672a859c68a8e8d2a68dab7a7ed89b8038f77f3ffd91cd9fc77f4fb8
-  data.tar.gz: e314c6633804c930a8963f9c8b0540214b4e070f9d0c77c29199efc164c1f55f
+  metadata.gz: 4685e6b9a972c44862aaa6fe59c4454c93d4557cbad57bd1a2eefdf9e9f6e572
+  data.tar.gz: e3ca2c5959b3f55032da62efabd94ff7829e724957acb2cf67b94b98fd4c9771
 SHA512:
-  metadata.gz: cbe3764f6edf4b3d894b59440c1591a50c6677270102f408314c4fb329e124ae88f903d0ba202125bc59fed96df22e5971734a568a5b84f3a87d59df19d2ecba
-  data.tar.gz: bd252a3a5c11a65606c0da763e53b1a80a88a038e21f231ec902ae2f210d997589414e5b53f77e30ab655cb644a93184e12b3e211a3082160e6ddc6f57c461a5
+  metadata.gz: 0764c04d9aad6eb8eaa6a890c9e442053db169f1ec0676b00f45dc8e7345268c2688adad1db6afba1496f43d7e1e8e362cf366d66c75939dab402414734673d6
+  data.tar.gz: f2fe591556834380e989906a906bf2ba1a298098aa02675e4aa99a9b353902dd7cb775ca37a8fd60a44947c51d71bc6b1344358538d29b55700234e010c343d5

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Change log
 
-## master
+## 0.6.0 (2019-08-19)
+
+- **Ruby 2.4+** is required.
+
+- Fix Rails 6 compatibility. ([@palkan][])
 
 ## 0.5.0 (2019-02-24)
 

data/README.md

@@ -4,13 +4,12 @@
 
 This gem provides missing testing utils for [Action Cable][].
 
-**NOTE:** this gem [has](https://github.com/rails/rails/pull/33659) [been](https://github.com/rails/rails/pull/33969) [merged](https://github.com/rails/rails/pull/34845) into Rails 6.0.
+**NOTE:** this gem [has](https://github.com/rails/rails/pull/33659) [been](https://github.com/rails/rails/pull/33969) [merged](https://github.com/rails/rails/pull/34845) into Rails 6.0 and [into RSpec 4](https://github.com/rspec/rspec-rails/pull/2113).
 
 If you're using Minitest – you don't need this gem anymore.
 
 If you're using RSpec < 4, you still can use this gem to write Action Cable specs even for Rails 6.
 
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -274,10 +273,10 @@ Or when broacasting to an object:
 ```ruby
 RSpec.describe CommentsController do
   describe "POST #create" do
-    let(:post) { create :post }
+    let(:the_post) { create :post }
 
-    expect { post :create, comment: { text: 'Cool!', post_id: post.id } }.to
-      have_broadcasted_to(post).from_channel(PostChannel).with(text: 'Cool!')
+    expect { post :create, comment: { text: 'Cool!', post_id: the_post.id } }.to
+      have_broadcasted_to(the_post).from_channel(PostChannel).with(text: 'Cool!')
   end
 end
 ```
@@ -337,6 +336,8 @@ end
 
 #### Shared contexts to switch between adapters
 
+**NOTE:** this feature is gem-only and hasn't been migrated to RSpec 4. You can still use the gem for that by adding `require "rspec/rails/shared_contexts/action_cable"` to your `rspec_helper.rb`.
+
 Sometimes you may want to use _real_ Action Cable adapter instead of the test one (for example, in Capybara-like tests).
 
 We provide shared contexts to do that:

data/lib/action_cable/testing/channel/test_case.rb

@@ -5,6 +5,9 @@ require "active_support/test_case"
 require "active_support/core_ext/hash/indifferent_access"
 require "json"
 
+require "action_cable/testing/rails_six"
+using ActionCable::Testing::Rails6
+
 module ActionCable
   module Channel
     class NonInferrableChannelError < ::StandardError
@@ -292,9 +295,7 @@ module ActionCable
           def broadcasting_for(stream_or_object)
             return stream_or_object if stream_or_object.is_a?(String)
 
-            self.class.channel_class.broadcasting_for(
-              [self.class.channel_class.channel_name, stream_or_object]
-            )
+            self.class.channel_class.broadcasting_for(stream_or_object)
           end
       end
 

data/lib/action_cable/testing/rails_six.rb

@@ -15,7 +15,7 @@ module ActionCable
     module Rails6
       begin
         # Has been added only after 6.0.0.beta1
-        unless ActionCable::Channel.respond_to?(:serialize_broadcasting)
+        unless ActionCable::Channel::Base.respond_to?(:serialize_broadcasting)
           refine ActionCable::Channel::Broadcasting::ClassMethods do
             def broadcasting_for(model)
               super([channel_name, model])

data/lib/action_cable/testing/rspec.rb

@@ -2,25 +2,38 @@
 
 require "action-cable-testing"
 require "rspec/rails"
-require "rspec/rails/example/channel_example_group"
-require "rspec/rails/matchers/action_cable"
-require "rspec/rails/shared_contexts/action_cable"
 
-module RSpec # :nodoc:
-  module Rails
-    module FeatureCheck
-      module_function
-        def has_action_cable?
-          defined?(::ActionCable)
-        end
-    end
+if RSpec::Rails::FeatureCheck.respond_to?(:has_action_cable_testing?)
+  warn <<~MSG
+    You're using RSpec with Action Cable support.
+
+    You can remove `require "action_cable/testing/rspec"` from your RSpec setup.
+
+    NOTE: if you use Action Cable shared contexts ("action_cable:async", "action_cable:inline", etc.)
+    you still need to use the gem and add `require "rspec/rails/shared_contexts/action_cable"`.
+  MSG
+else
+  require "rspec/rails/example/channel_example_group"
+  require "rspec/rails/matchers/action_cable"
+
+  module RSpec # :nodoc:
+    module Rails
+      module FeatureCheck
+        module_function
+          def has_action_cable_testing?
+            defined?(::ActionCable)
+          end
+      end
 
-    self::DIRECTORY_MAPPINGS[:channel] = %w[spec channels]
+      self::DIRECTORY_MAPPINGS[:channel] = %w[spec channels]
+    end
   end
-end
 
-RSpec.configure do |config|
-  if defined?(ActionCable)
-    config.include RSpec::Rails::ChannelExampleGroup, type: :channel
+  RSpec.configure do |config|
+    if defined?(ActionCable)
+      config.include RSpec::Rails::ChannelExampleGroup, type: :channel
+    end
   end
 end
+
+require "rspec/rails/shared_contexts/action_cable"

data/lib/action_cable/testing/test_helper.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require "action_cable/testing/rails_six"
+using ActionCable::Testing::Rails6
+
 module ActionCable
   # Provides helper methods for testing Action Cable broadcasting
   module TestHelper
@@ -144,7 +147,7 @@ module ActionCable
         channel ||= @subscription
         return target unless channel && channel.respond_to?(:channel_name)
 
-        channel.broadcasting_for([channel.channel_name, target])
+        channel.broadcasting_for(target)
       end
 
       def warn_deprecated_channel!

data/lib/action_cable/testing/version.rb

@@ -2,6 +2,6 @@
 
 module ActionCable
   module Testing
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/lib/rspec/rails/matchers/action_cable/have_broadcasted_to.rb

@@ -1,5 +1,8 @@
 # rubocop: disable Style/FrozenStringLiteralComment
 
+require "action_cable/testing/rails_six"
+using ActionCable::Testing::Rails6
+
 module RSpec
   module Rails
     module Matchers
@@ -101,7 +104,7 @@ module RSpec
               @target
             else
               check_channel_presence
-              @channel.broadcasting_for([@channel.channel_name, @target])
+              @channel.broadcasting_for(@target)
             end
           end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action-cable-testing
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Vladimir Dementyev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actioncable
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: 0.68.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: 0.68.0
 description: Testing utils for Action Cable
 email:
 - dementiev.vm@gmail.com
@@ -178,15 +178,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Testing utils for Action Cable