activity_notification 2.1.4 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c77b0e25a955b70ea7753d4591e26eebaa5d8ac3ebd858fc0dbb1457a1443543
-  data.tar.gz: c3f39d43832aca955a9904cc9918ba247bc34b32fb5b9e2a99efdd11fb04fea5
+  metadata.gz: 771b080e7877b6a83105bc0f8842440fc4f2a12c0fa56b6e55f4d2b24b3e9d20
+  data.tar.gz: 2b8dcbeb13208ef8a44e3fa246ac464f1e36c8140cc1e087ebc6b39e55da1107
 SHA512:
-  metadata.gz: 4ff3b5496a2f94cdc794c5fac124cdeb749738eb3b244f58e4622882dfbfdcddeb35518f41d7f801ad0f4c47d8695cc4c157e6d4244ae394fc2797f08f20a826
-  data.tar.gz: 93cf90f670ebca89d40812870f2e4ad526f5f373609a56ece0199ef50f63383204bd624a1e3af3ac65f31d431494fdac19a7c5b1bc62887fd20c961a3cb8daa2
+  metadata.gz: e573698b449a5aef558b312c4fd0a7023d28adf2ab4210f941efc6a3025c4126cf4428ca561addf760e4e6a875696ffe6ba06d0bc0501007f663f4e59f3c0a07
+  data.tar.gz: 7c8d4771871af1dedd7440fcb670b9a50b5820fa9f09e3be5df9d2f6618002174dfaf00d7f71f6e725aecc28267b8a2263050ecbed662d3c6038a7dabd9383fe

data/.travis.yml

@@ -5,14 +5,13 @@ branches:
     - images
 
 rvm:
-#  - 2.7.0 # Need to respond to warnings for Ruby 3.0
-  - 2.6.5
-#  - 2.5.7
-#  - 2.4.9
+  - 2.7.2
+#  - 2.6.6
+#  - 2.5.8
+#  - 2.4.10 #EOL
 #  - 2.3.8 #EOL
 
 gemfile:
-  - gemfiles/Gemfile.rails-4.2
   - gemfiles/Gemfile.rails-5.0
   - gemfiles/Gemfile.rails-5.1
   - gemfiles/Gemfile.rails-5.2
@@ -27,9 +26,6 @@ env:
   - AN_ORM=dynamoid
 
 matrix:
-  exclude:
-    - gemfile: gemfiles/Gemfile.rails-4.2
-      env: AN_ORM=dynamoid
   include:
     - rvm: ruby-head
       gemfile: Gemfile
@@ -53,18 +49,12 @@ sudo: false
 
 cache: bundler
 
-before_install:
-  # Specify bundler version as '< 2.0' for Rails 4.2
-  - gem install bundler --no-document -v '1.17.3'
-
 install:
-  # Specify bundler version as '< 2.0' for Rails 4.2
-  - bundle _1.17.3_ install
+  - bundle install
   - if [ "$AN_ORM" = "dynamoid" ]; then bin/install_dynamodblocal.sh; fi
 
 before_script:
-  # Specify bundler version as '< 2.0' for Rails 4.2
-  - bundle _1.17.3_ update
+  - bundle update
   - if [ "$AN_TEST_DB" = "mysql" ]; then mysql -e 'create database activity_notification_test'; fi
   - if [ "$AN_TEST_DB" = "postgresql" ]; then psql -c 'create database activity_notification_test' -U postgres; fi
   - if [ "$AN_ORM" = "dynamoid" ]; then bin/start_dynamodblocal.sh; fi

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 2.2.0 / 2020-12-05
+[Full Changelog](http://github.com/simukappu/activity_notification/compare/v2.1.4...v2.2.0)
+
+Enhancements:
+
+* Remove support for Rails 4.2 - [#151](https://github.com/simukappu/activity_notification/issues/151)
+* Turn on deprecation warnings in RSpec testing for Ruby 2.7 - [#122](https://github.com/simukappu/activity_notification/issues/122)
+* Remove Ruby 2.7 deprecation warnings - [#122](https://github.com/simukappu/activity_notification/issues/122)
+
+Breaking Changes:
+
+* Specify DynamoDB global secondary index name
+* Update additional fields to store into DynamoDB when *config.store_with_associated_records* is true
+
 ## 2.1.4 / 2020-11-07
 [Full Changelog](http://github.com/simukappu/activity_notification/compare/v2.1.3...v2.1.4)
 

data/README.md

@@ -10,7 +10,7 @@
 
 *activity_notification* provides integrated user activity notifications for [Ruby on Rails](https://rubyonrails.org). You can easily use it to configure multiple notification targets and make activity notifications with notifiable models, like adding comments, responding etc.
 
-*activity_notification* supports Rails 4.2+ with [ActiveRecord](https://guides.rubyonrails.org/active_record_basics.html), [Mongoid](https://mongoid.org) and [Dynamoid](https://github.com/Dynamoid/dynamoid) ORM. It is tested for [MySQL](https://www.mysql.com), [PostgreSQL](https://www.postgresql.org), [SQLite3](https://www.sqlite.org) with ActiveRecord, [MongoDB](https://www.mongodb.com) with Mongoid and [Amazon DynamoDB](https://aws.amazon.com/dynamodb) with Dynamoid. The latest *activity_notification* [v2](https://rubygems.org/gems/activity_notification) is almost compatible with [v1](https://rubygems.org/gems/activity_notification/versions/1.7.1).
+*activity_notification* supports Rails 5.0+ with [ActiveRecord](https://guides.rubyonrails.org/active_record_basics.html), [Mongoid](https://mongoid.org) and [Dynamoid](https://github.com/Dynamoid/dynamoid) ORM. It is tested for [MySQL](https://www.mysql.com), [PostgreSQL](https://www.postgresql.org), [SQLite3](https://www.sqlite.org) with ActiveRecord, [MongoDB](https://www.mongodb.com) with Mongoid and [Amazon DynamoDB](https://aws.amazon.com/dynamodb) with Dynamoid. If you are using Rails 4.2, use [v2.1.4](https://rubygems.org/gems/activity_notification/versions/2.1.4) or older version of *activity_notification*.
 
 
 ## About

data/activity_notification.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.required_ruby_version = '>= 2.1.0'
 
-  s.add_dependency 'railties', '>= 4.2.0', '< 6.1'
+  s.add_dependency 'railties', '>= 5.0.0', '< 6.1'
   s.add_dependency 'i18n', '>= 0.5.0'
   s.add_dependency 'jquery-rails', '>= 3.1.1'
   s.add_dependency 'swagger-blocks', '>= 3.0.0'

data/app/controllers/activity_notification/notifications_controller.rb

@@ -117,26 +117,6 @@ module ActivityNotification
       super
     end
 
-    # :nocov:
-    if Rails::VERSION::MAJOR == 4
-      # Defines custom renderer class method for Rails 4.2
-      def self.renderer
-        view_context = ActionView::Base.new(ActionController::Base.view_paths, {})
-        view_context.class_eval do 
-          include Rails.application.routes.url_helpers
-          def default_url_options
-            ActionMailer::Base.default_url_options
-          end
-          def render(params = {})
-            assign(params[:assigns])
-            super(params)
-          end
-        end
-        view_context
-      end
-    end
-    # :nocov:
-
     protected
 
       # Sets @notification instance variable from request parameters.

data/bin/bundle_update.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 bundle update
-BUNDLE_GEMFILE=gemfiles/Gemfile.rails-4.2 bundle update
 BUNDLE_GEMFILE=gemfiles/Gemfile.rails-5.0 bundle update
 BUNDLE_GEMFILE=gemfiles/Gemfile.rails-5.1 bundle update
 BUNDLE_GEMFILE=gemfiles/Gemfile.rails-5.2 bundle update

data/lib/activity_notification/common.rb

@@ -16,7 +16,11 @@ module ActivityNotification
     when Symbol
       symbol_method = context.method(thing)
       if symbol_method.arity > 1
-        symbol_method.call(ActivityNotification.get_controller, *args)
+        if args.last.kind_of?(Hash)
+          symbol_method.call(ActivityNotification.get_controller, *args[0...-1], **args[-1])
+        else
+          symbol_method.call(ActivityNotification.get_controller, *args)
+        end
       elsif symbol_method.arity > 0
         symbol_method.call(ActivityNotification.get_controller)
       else
@@ -74,7 +78,11 @@ module ActivityNotification
       when Symbol
         symbol_method = method(thing)
         if symbol_method.arity > 0
-          symbol_method.call(*args)
+          if args.last.kind_of?(Hash)
+            symbol_method.call(*args[0...-1], **args[-1])
+          else
+            symbol_method.call(*args)
+          end
         else
           symbol_method.call
         end
@@ -131,4 +139,4 @@ module ActivityNotification
       "#{self.printable_type} (#{id})"
     end
   end
-end
+end

data/lib/activity_notification/controllers/common_controller.rb

@@ -130,25 +130,9 @@ module ActivityNotification
             load_index if params[:reload].to_s.to_boolean(true)
             format.js
           else
-            compatibly_redirect_back(@index_options) and return
+            redirect_back(fallback_location: { action: :index }, **@index_options) and return
           end
         end
       end
-
-      # Redirect to back.
-      # @api protected
-      # @return [Boolean] True
-      def compatibly_redirect_back(request_params = {})
-        # :nocov:
-        if Rails::VERSION::MAJOR >= 5
-          redirect_back fallback_location: { action: :index }, **request_params
-        elsif request.referer
-          redirect_to :back, **request_params
-        else
-          redirect_to action: :index, **request_params
-        end
-        # :nocov:
-        true
-      end
   end
 end

data/lib/activity_notification/models/concerns/notifiable.rb

@@ -456,7 +456,7 @@ module ActivityNotification
           unless generated_notifications.to_a.empty?
             record = self.class.human_attribute_name("generated_notifications_as_notifiable_for_#{target_type.to_s.pluralize.underscore}").downcase
             self.errors.add(:base, :'restrict_dependent_destroy.has_many', record: record)
-            if Rails::VERSION::MAJOR >= 5 then throw(:abort) else false end
+            throw(:abort)
           end
         when :destroy
           generated_notifications.each { |n| n.destroy }

data/lib/activity_notification/models/concerns/target.rb

@@ -213,16 +213,12 @@ module ActivityNotification
       resolve_value(_notification_action_cable_with_devise)
     end
 
-    # :nocov:
-    if Rails::VERSION::MAJOR >= 5
-      # Returns notification ActionCable channel class name from action_cable_with_devise? configuration.
-      #
-      # @return [String] Notification ActionCable channel class name from action_cable_with_devise? configuration
-      def notification_action_cable_channel_class_name
-        notification_action_cable_with_devise? ? "ActivityNotification::NotificationWithDeviseChannel" : "ActivityNotification::NotificationChannel"
-      end
+    # Returns notification ActionCable channel class name from action_cable_with_devise? configuration.
+    #
+    # @return [String] Notification ActionCable channel class name from action_cable_with_devise? configuration
+    def notification_action_cable_channel_class_name
+      notification_action_cable_with_devise? ? "ActivityNotification::NotificationWithDeviseChannel" : "ActivityNotification::NotificationChannel"
     end
-    # :nocov:
 
     # Returns Devise resource model associated with this target.
     #

data/lib/activity_notification/orm/active_record.rb

@@ -6,7 +6,7 @@ module ActivityNotification
       # Defines has_many association with ActivityNotification models.
       # @return [ActiveRecord_AssociationRelation<Object>] Database query of associated model instances
       def has_many_records(name, options = {})
-        has_many name, options
+        has_many name, **options
       end
     end
   end

data/lib/activity_notification/orm/active_record/notification.rb

@@ -23,14 +23,14 @@ module ActivityNotification
         # Belongs to group instance of this notification as polymorphic association.
         # @scope instance
         # @return [Object] Group instance of this notification
-        belongs_to :group,         { polymorphic: true }.merge(Rails::VERSION::MAJOR >= 5 ? { optional: true } : {})
+        belongs_to :group,         **{ polymorphic: true, optional: true }
 
         # Belongs to group owner notification instance of this notification.
         # Only group member instance has :group_owner value.
         # Group owner instance has nil as :group_owner association.
         # @scope instance
         # @return [Notification] Group owner notification instance of this notification
-        belongs_to :group_owner, { class_name: "ActivityNotification::Notification" }.merge(Rails::VERSION::MAJOR >= 5 ? { optional: true } : {})
+        belongs_to :group_owner, **{ class_name: "ActivityNotification::Notification", optional: true }
 
         # Has many group member notification instances of this notification.
         # Only group owner instance has :group_members value.
@@ -42,7 +42,7 @@ module ActivityNotification
         # Belongs to :notifier instance of this notification.
         # @scope instance
         # @return [Object] Notifier instance of this notification
-        belongs_to :notifier,      { polymorphic: true }.merge(Rails::VERSION::MAJOR >= 5 ? { optional: true } : {})
+        belongs_to :notifier,      **{ polymorphic: true, optional: true }
 
         # Serialize parameters Hash
         serialize  :parameters, Hash

data/lib/activity_notification/orm/dynamoid/notification.rb

@@ -42,7 +42,7 @@ module ActivityNotification
         # Group owner instance has nil as :group_owner association.
         # @scope instance
         # @return [Notification] Group owner notification instance of this notification
-        belongs_to :group_owner, { class_name: "ActivityNotification::Notification", foreign_key: :group_owner_id }.merge(Rails::VERSION::MAJOR >= 5 ? { optional: true } : {})
+        belongs_to :group_owner, { class_name: "ActivityNotification::Notification", foreign_key: :group_owner_id, optional: true }
 
         # Customized method that belongs to group owner notification instance of this notification.
         # @raise [Errors::RecordNotFound] Record not found error

data/lib/activity_notification/orm/mongoid/notification.rb

@@ -41,7 +41,7 @@ module ActivityNotification
         # Group owner instance has nil as :group_owner association.
         # @scope instance
         # @return [Notification] Group owner notification instance of this notification
-        belongs_to :group_owner, { class_name: "ActivityNotification::Notification" }.merge(Rails::VERSION::MAJOR >= 5 ? { optional: true } : {})
+        belongs_to :group_owner, { class_name: "ActivityNotification::Notification", optional: true }
 
         # Has many group member notification instances of this notification.
         # Only group owner instance has :group_members value.

data/lib/activity_notification/renderable.rb

@@ -29,8 +29,8 @@ module ActivityNotification
       )
 
       # Generate the :default fallback key without using pluralization key :count
-      default = I18n.t(k, attrs)
-      I18n.t(k, attrs.merge(count: group_notification_count, default: default))
+      default = I18n.t(k, **attrs)
+      I18n.t(k, **attrs.merge(count: group_notification_count, default: default))
     end
 
     # Renders notification from views.

data/lib/activity_notification/roles/acts_as_notifiable.rb

@@ -239,25 +239,21 @@ module ActivityNotification
           configured_params.update(add_destroy_dependency(target_type, options[:dependent_notifications]))
         end
 
-        # :nocov:
-        if Rails::VERSION::MAJOR >= 5
-          if options[:action_cable_allowed] || (ActivityNotification.config.action_cable_enabled && options[:action_cable_allowed] != false)
-            options[:optional_targets] ||= {}
-            require 'activity_notification/optional_targets/action_cable_channel'
-            unless options[:optional_targets].has_key?(ActivityNotification::OptionalTarget::ActionCableChannel)
-              options[:optional_targets][ActivityNotification::OptionalTarget::ActionCableChannel] = {}
-            end
+        if options[:action_cable_allowed] || (ActivityNotification.config.action_cable_enabled && options[:action_cable_allowed] != false)
+          options[:optional_targets] ||= {}
+          require 'activity_notification/optional_targets/action_cable_channel'
+          unless options[:optional_targets].has_key?(ActivityNotification::OptionalTarget::ActionCableChannel)
+            options[:optional_targets][ActivityNotification::OptionalTarget::ActionCableChannel] = {}
           end
+        end
 
-          if options[:action_cable_api_allowed] || (ActivityNotification.config.action_cable_api_enabled && options[:action_cable_api_allowed] != false)
-            options[:optional_targets] ||= {}
-            require 'activity_notification/optional_targets/action_cable_api_channel'
-            unless options[:optional_targets].has_key?(ActivityNotification::OptionalTarget::ActionCableApiChannel)
-              options[:optional_targets][ActivityNotification::OptionalTarget::ActionCableApiChannel] = {}
-            end
+        if options[:action_cable_api_allowed] || (ActivityNotification.config.action_cable_api_enabled && options[:action_cable_api_allowed] != false)
+          options[:optional_targets] ||= {}
+          require 'activity_notification/optional_targets/action_cable_api_channel'
+          unless options[:optional_targets].has_key?(ActivityNotification::OptionalTarget::ActionCableApiChannel)
+            options[:optional_targets][ActivityNotification::OptionalTarget::ActionCableApiChannel] = {}
           end
         end
-        # :nocov:
 
         if options[:optional_targets].is_a?(Hash)
           options[:optional_targets] = arrange_optional_targets_option(options[:optional_targets])

data/lib/activity_notification/version.rb

@@ -1,3 +1,3 @@
 module ActivityNotification
-  VERSION = "2.1.4"
+  VERSION = "2.2.0"
 end

data/lib/generators/templates/migrations/migration.rb

@@ -1,5 +1,5 @@
 # Migration responsible for creating a table with notifications
-class <%= @migration_name %> < ActiveRecord::Migration<%= Rails::VERSION::MAJOR >= 5 ? "[#{Rails.version.to_f}]" : "" %>
+class <%= @migration_name %> < ActiveRecord::Migration<%= "[#{Rails.version.to_f}]" %>
   # Create tables
   def change
     <% if @migration_tables.include?('notifications') %>create_table :notifications do |t|

data/spec/channels/notification_api_channel_spec.rb

@@ -1,51 +1,49 @@
-if Rails::VERSION::MAJOR >= 5
-  require 'channels/notification_api_channel_shared_examples'
-
-  # @See https://github.com/palkan/action-cable-testing
-  describe ActivityNotification::NotificationApiChannel, type: :channel do
-    let(:test_target)        { create(:user) }
-    let(:target_type)        { "User" }
-    let(:typed_target_param) { "user_id" }
-    let(:extra_params)       { {} }
-
-    context "when target.notification_action_cable_with_devise? returns true" do
-      before do
-        @user_notification_action_cable_with_devise = User._notification_action_cable_with_devise
-        User._notification_action_cable_with_devise = true
-      end
-
-      after do
-        User._notification_action_cable_with_devise = @user_notification_action_cable_with_devise
-      end
-
-      it "rejects subscription even if target_type and target_id parameters are passed" do
-        subscribe({ target_type: target_type, target_id: test_target.id })
-        expect(subscription).to be_rejected
-        expect {
-          expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_api_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
-        }.to raise_error(/Must be subscribed!/)
-      end
+require 'channels/notification_api_channel_shared_examples'
+
+# @See https://github.com/palkan/action-cable-testing
+describe ActivityNotification::NotificationApiChannel, type: :channel do
+  let(:test_target)        { create(:user) }
+  let(:target_type)        { "User" }
+  let(:typed_target_param) { "user_id" }
+  let(:extra_params)       { {} }
+
+  context "when target.notification_action_cable_with_devise? returns true" do
+    before do
+      @user_notification_action_cable_with_devise = User._notification_action_cable_with_devise
+      User._notification_action_cable_with_devise = true
     end
 
-    context "when target.notification_action_cable_with_devise? returns false" do
-      before do
-        @user_notification_action_cable_with_devise = User._notification_action_cable_with_devise
-        User._notification_action_cable_with_devise = false
-        @auth_headers = {}
-      end
-
-      after do
-        User._notification_action_cable_with_devise = @user_notification_action_cable_with_devise
-      end
+    after do
+      User._notification_action_cable_with_devise = @user_notification_action_cable_with_devise
+    end
 
-      it "successfully subscribes with target_type and target_id parameters" do
-        subscribe({ target_type: target_type, target_id: test_target.id })
-        expect(subscription).to be_confirmed
+    it "rejects subscription even if target_type and target_id parameters are passed" do
+      subscribe({ target_type: target_type, target_id: test_target.id })
+      expect(subscription).to be_rejected
+      expect {
         expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_api_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
-        expect(subscription).to have_stream_from("activity_notification_api_channel_User##{test_target.id}")
-      end
+      }.to raise_error(/Must be subscribed!/)
+    end
+  end
 
-      it_behaves_like :notification_api_channel
+  context "when target.notification_action_cable_with_devise? returns false" do
+    before do
+      @user_notification_action_cable_with_devise = User._notification_action_cable_with_devise
+      User._notification_action_cable_with_devise = false
+      @auth_headers = {}
     end
+
+    after do
+      User._notification_action_cable_with_devise = @user_notification_action_cable_with_devise
+    end
+
+    it "successfully subscribes with target_type and target_id parameters" do
+      subscribe({ target_type: target_type, target_id: test_target.id })
+      expect(subscription).to be_confirmed
+      expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_api_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
+      expect(subscription).to have_stream_from("activity_notification_api_channel_User##{test_target.id}")
+    end
+
+    it_behaves_like :notification_api_channel
   end
-end
+end

data/spec/channels/notification_api_with_devise_channel_spec.rb

@@ -1,78 +1,76 @@
-if Rails::VERSION::MAJOR >= 5
-  require 'channels/notification_api_channel_shared_examples'
+require 'channels/notification_api_channel_shared_examples'
 
-  # @See https://github.com/palkan/action-cable-testing
-  describe ActivityNotification::NotificationApiWithDeviseChannel, type: :channel do
-    let(:test_user)            { create(:confirmed_user) }
-    let(:unauthenticated_user) { create(:confirmed_user) }
-    let(:test_target)          { create(:admin, user: test_user) }
-    let(:target_type)          { "Admin" }
-    let(:typed_target_param)   { "admin_id" }
-    let(:extra_params)         { { devise_type: :users } }
-    let(:valid_session)        {}
+# @See https://github.com/palkan/action-cable-testing
+describe ActivityNotification::NotificationApiWithDeviseChannel, type: :channel do
+  let(:test_user)            { create(:confirmed_user) }
+  let(:unauthenticated_user) { create(:confirmed_user) }
+  let(:test_target)          { create(:admin, user: test_user) }
+  let(:target_type)          { "Admin" }
+  let(:typed_target_param)   { "admin_id" }
+  let(:extra_params)         { { devise_type: :users } }
+  let(:valid_session)        {}
 
-    # @See https://github.com/lynndylanhurley/devise_token_auth
-    def sign_in(current_target)
-      @auth_headers = current_target.create_new_auth_token
-    end
+  # @See https://github.com/lynndylanhurley/devise_token_auth
+  def sign_in(current_target)
+    @auth_headers = current_target.create_new_auth_token
+  end
 
-    before do
-      @user_notification_action_cable_with_devise = User._notification_action_cable_with_devise
-      User._notification_action_cable_with_devise = true
-    end
+  before do
+    @user_notification_action_cable_with_devise = User._notification_action_cable_with_devise
+    User._notification_action_cable_with_devise = true
+  end
 
-    after do
-      User._notification_action_cable_with_devise = @user_notification_action_cable_with_devise
-    end
+  after do
+    User._notification_action_cable_with_devise = @user_notification_action_cable_with_devise
+  end
 
-    context "signed in with devise as authenticated user" do
-      before do
-        sign_in test_user
-      end
-    
-      it_behaves_like :notification_api_channel
+  context "signed in with devise as authenticated user" do
+    before do
+      sign_in test_user
     end
+  
+    it_behaves_like :notification_api_channel
+  end
 
-    context "signed in with devise as unauthenticated user" do
-      let(:target_params) { { target_type: target_type, devise_type: :users } }
+  context "signed in with devise as unauthenticated user" do
+    let(:target_params) { { target_type: target_type, devise_type: :users } }
 
-      before do
-        sign_in unauthenticated_user
-      end
+    before do
+      sign_in unauthenticated_user
+    end
 
-      it "rejects subscription" do
-        subscribe(target_params.merge({ typed_target_param => test_target }).merge(@auth_headers))
-        expect(subscription).to be_rejected
-        expect {
-          expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_api_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
-        }.to raise_error(/Must be subscribed!/)
-      end
+    it "rejects subscription" do
+      subscribe(target_params.merge({ typed_target_param => test_target }).merge(@auth_headers))
+      expect(subscription).to be_rejected
+      expect {
+        expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_api_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
+      }.to raise_error(/Must be subscribed!/)
     end
+  end
 
-    context "unsigned in with devise" do
-      let(:target_params) { { target_type: target_type, devise_type: :users } }
+  context "unsigned in with devise" do
+    let(:target_params) { { target_type: target_type, devise_type: :users } }
 
-      it "rejects subscription" do
-        subscribe(target_params.merge({ typed_target_param => test_target }))
-        expect(subscription).to be_rejected
-        expect {
-          expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_api_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
-        }.to raise_error(/Must be subscribed!/)
-      end
+    it "rejects subscription" do
+      subscribe(target_params.merge({ typed_target_param => test_target }))
+      expect(subscription).to be_rejected
+      expect {
+        expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_api_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
+      }.to raise_error(/Must be subscribed!/)
     end
+  end
 
-    context "without target_id and (typed_target)_id parameters for devise integrated channel with devise_type option" do
-      let(:target_params) { { target_type: target_type, devise_type: :users } }
+  context "without target_id and (typed_target)_id parameters for devise integrated channel with devise_type option" do
+    let(:target_params) { { target_type: target_type, devise_type: :users } }
 
-      before do
-        sign_in test_target.user
-      end
+    before do
+      sign_in test_target.user
+    end
 
-      it "successfully subscribes" do
-        subscribe(target_params.merge(@auth_headers))
-        expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_api_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
-        expect(subscription).to have_stream_from("activity_notification_api_channel_Admin##{test_target.id}")
-      end
+    it "successfully subscribes" do
+      subscribe(target_params.merge(@auth_headers))
+      expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_api_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
+      expect(subscription).to have_stream_from("activity_notification_api_channel_Admin##{test_target.id}")
     end
   end
 end