activity_notification 2.1.4 → 2.2.3

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/subscriber.rb

@@ -61,7 +61,9 @@ module ActivityNotification
     def build_subscription(subscription_params = {})
       created_at = Time.current
       if subscription_params[:subscribing] == false && subscription_params[:subscribing_to_email].nil?
-        subscription_params[:subscribing_to_email] = subscription_params[:subscribing] 
+        subscription_params[:subscribing_to_email] = subscription_params[:subscribing]
+      elsif subscription_params[:subscribing_to_email].nil?
+        subscription_params[:subscribing_to_email] = ActivityNotification.config.subscribe_to_email_as_default
       end
       subscription = Subscription.new(subscription_params)
       subscription.assign_attributes(target: self)
@@ -157,7 +159,7 @@ module ActivityNotification
       # @param [String]  key                  Key of the notification
       # @param [Boolean] subscribe_as_default Default subscription value to use when the subscription record does not configured
       # @return [Boolean] If the target subscribes to the notification
-      def _subscribes_to_notification_email?(key, subscribe_as_default = ActivityNotification.config.subscribe_as_default)
+      def _subscribes_to_notification_email?(key, subscribe_as_default = ActivityNotification.config.subscribe_to_email_as_default)
         evaluate_subscription(subscriptions.where(key: key).first, :subscribing_to_email?, subscribe_as_default)
       end
       alias_method :_subscribes_to_email?, :_subscribes_to_notification_email?
@@ -170,7 +172,7 @@ module ActivityNotification
       # @param [String, Symbol] optional_target_name Class name of the optional target implementation (e.g. :amazon_sns, :slack)
       # @param [Boolean]        subscribe_as_default Default subscription value to use when the subscription record does not configured
       # @return [Boolean] If the target subscribes to the specified optional target
-      def _subscribes_to_optional_target?(key, optional_target_name, subscribe_as_default = ActivityNotification.config.subscribe_as_default)
+      def _subscribes_to_optional_target?(key, optional_target_name, subscribe_as_default = ActivityNotification.config.subscribe_to_optional_targets_as_default)
         _subscribes_to_notification?(key, subscribe_as_default) &&
           evaluate_subscription(subscriptions.where(key: key).first, :subscribing_to_optional_target?, subscribe_as_default, optional_target_name, subscribe_as_default)
       end
@@ -189,4 +191,4 @@ module ActivityNotification
       end
 
   end
-end
+end

data/lib/activity_notification/models/concerns/swagger/notification_schema.rb

@@ -49,22 +49,22 @@ module ActivityNotification
             key :example, "Article"
           end
           property :group_id do
-            key :oneOf, [
-              { type: :integer },
-              { type: :string },
-              { nullable: true }
-            ]
+            # key :oneOf, [
+            #   { type: :integer },
+            #   { type: :string },
+            #   { nullable: true }
+            # ]
             key :description, "This parameter type is integer with ActiveRecord, but will be string with Mongoid or Dynamoid ORMs."
             key :nullable, true
             key :example, 11
           end
           property :group_owner_id do
-            key :oneOf, [
-              { type: :integer },
-              { type: :string },
-              { type: :object },
-              { nullable: true }
-            ]
+            # key :oneOf, [
+            #   { type: :integer },
+            #   { type: :string },
+            #   { type: :object },
+            #   { nullable: true }
+            # ]
             key :description, "This parameter type is integer with ActiveRecord, but will be string or object including $oid with Mongoid or Dynamoid ORMs."
             key :nullable, true
             key :example, 123
@@ -75,11 +75,11 @@ module ActivityNotification
             key :example, "User"
           end
           property :notifier_id do
-            key :oneOf, [
-              { type: :integer },
-              { type: :string },
-              { nullable: true }
-            ]
+            # key :oneOf, [
+            #   { type: :integer },
+            #   { type: :string },
+            #   { nullable: true }
+            # ]
             key :description, "This parameter type is integer with ActiveRecord, but will be string with Mongoid or Dynamoid ORMs."
             key :nullable, true
             key :example, 2

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.
     #
@@ -545,7 +541,7 @@ module ActivityNotification
     # @param [String]  key                  Key of the notification
     # @param [Boolean] subscribe_as_default Default subscription value to use when the subscription record does not configured
     # @return [Boolean] If the target subscribes the notification email or the subscription management is not allowed for the target
-    def subscribes_to_notification_email?(key, subscribe_as_default = ActivityNotification.config.subscribe_as_default)
+    def subscribes_to_notification_email?(key, subscribe_as_default = ActivityNotification.config.subscribe_to_email_as_default)
       !subscription_allowed?(key) || _subscribes_to_notification_email?(key, subscribe_as_default)
     end
     alias_method :subscribes_to_email?, :subscribes_to_notification_email?
@@ -557,7 +553,7 @@ module ActivityNotification
     # @param [String, Symbol] optional_target_name Class name of the optional target implementation (e.g. :amazon_sns, :slack)
     # @param [Boolean]        subscribe_as_default Default subscription value to use when the subscription record does not configured
     # @return [Boolean] If the target subscribes the notification email or the subscription management is not allowed for the target
-    def subscribes_to_optional_target?(key, optional_target_name, subscribe_as_default = ActivityNotification.config.subscribe_as_default)
+    def subscribes_to_optional_target?(key, optional_target_name, subscribe_as_default = ActivityNotification.config.subscribe_to_optional_targets_as_default)
       !subscription_allowed?(key) || _subscribes_to_optional_target?(key, optional_target_name, subscribe_as_default)
     end
 
@@ -693,4 +689,4 @@ module ActivityNotification
       end
 
   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/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/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/dynamoid/subscription.rb

@@ -21,7 +21,7 @@ module ActivityNotification
 
         field :key,                       :string
         field :subscribing,               :boolean, default: ActivityNotification.config.subscribe_as_default
-        field :subscribing_to_email,      :boolean, default: ActivityNotification.config.subscribe_as_default
+        field :subscribing_to_email,      :boolean, default: ActivityNotification.config.subscribe_to_email_as_default
         field :subscribed_at,             :datetime
         field :unsubscribed_at,           :datetime
         field :subscribed_to_email_at,    :datetime

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/orm/mongoid/subscription.rb

@@ -20,7 +20,7 @@ module ActivityNotification
 
         field :key,                       type: String
         field :subscribing,               type: Boolean, default: ActivityNotification.config.subscribe_as_default
-        field :subscribing_to_email,      type: Boolean, default: ActivityNotification.config.subscribe_as_default
+        field :subscribing_to_email,      type: Boolean, default: ActivityNotification.config.subscribe_to_email_as_default
         field :subscribed_at,             type: DateTime
         field :unsubscribed_at,           type: DateTime
         field :subscribed_to_email_at,    type: DateTime

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.3"
 end

data/lib/generators/templates/activity_notification.rb

@@ -31,6 +31,16 @@ ActivityNotification.configure do |config|
   # Set false when you want to unsubscribe to any notifications as default.
   config.subscribe_as_default = true
 
+  # Configure default email subscription value to use when the subscription record does not configured.
+  # Note that you can configure them for each method calling as default argument.
+  # Set false when you want to unsubscribe to email notifications as default.
+  # config.subscribe_to_email_as_default = true
+
+  # Configure default optional target subscription value to use when the subscription record does not configured.
+  # Note that you can configure them for each method calling as default argument.
+  # Set false when you want to unsubscribe to optinal target notifications as default.
+  # config.subscribe_to_optional_targets_as_default = true
+
   # Configure the e-mail address which will be shown in ActivityNotification::Mailer,
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.
   config.mailer_sender = 'please-change-me-at-config-initializers-activity_notification@example.com'
@@ -76,7 +86,7 @@ ActivityNotification.configure do |config|
   # Set true when you want to turn on WebSocket API subscription using ActionCable as default.
   config.action_cable_api_enabled = false
 
-  # Configure if ctivity_notification publishes WebSocket notifications using ActionCable only to authenticated target with Devise.
+  # Configure if activity_notification publishes WebSocket notifications using ActionCable only to authenticated target with Devise.
   # Note that you can configure them for each model by acts_as roles.
   # Set true when you want to use Device integration with WebSocket subscription using ActionCable as default.
   config.action_cable_with_devise = false
@@ -87,4 +97,8 @@ ActivityNotification.configure do |config|
   # Configure notification API channel prefix for ActionCable.
   config.notification_api_channel_prefix = 'activity_notification_api_channel'
 
+  # Configure if activity_notification internally rescues optional target errors. Default value is true.
+  # See https://github.com/simukappu/activity_notification/issues/155 for more details.
+  config.rescue_optional_target_errors = true
+
 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