activity_notification 1.4.4 → 2.2.4

data/spec/channels/notification_with_devise_channel_spec.rb

@@ -0,0 +1,97 @@
+require 'channels/notification_channel_shared_examples'
+
+#TODO Make it more smart test method
+module ActivityNotification
+  module Test
+    class NotificationWithDeviseChannel < ::ActivityNotification::NotificationWithDeviseChannel
+      @@custom_current_target = nil
+
+      def set_custom_current_target(custom_current_target)
+        @@custom_current_target = custom_current_target
+      end
+
+      def find_current_target(devise_type = nil)
+        super(devise_type)
+      rescue NoMethodError
+        devise_type = (devise_type || @target.notification_devise_resource.class.name).to_s
+        @@custom_current_target.is_a?(devise_type.to_model_class) ? @@custom_current_target : nil
+      end
+    end
+  end
+end
+
+# @See https://github.com/palkan/action-cable-testing
+describe ActivityNotification::Test::NotificationWithDeviseChannel, 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)        {}
+
+  #TODO Make it more smart test method
+  #include Devise::Test::IntegrationHelpers
+  def sign_in(current_target)
+    described_class.new(ActionCable::Channel::ConnectionStub.new, {}).set_custom_current_target(current_target)
+  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
+
+  context "signed in with devise as authenticated user" do
+    before do
+      sign_in test_user
+    end
+  
+    it_behaves_like :notification_channel
+  end
+
+  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
+
+    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_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 } }
+
+    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_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 } }
+
+    before do
+      sign_in test_target.user
+    end
+
+    it "successfully subscribes" do
+      subscribe(target_params)
+      expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
+      expect(subscription).to have_stream_from("activity_notification_channel_Admin##{test_target.id}")
+    end
+  end
+end

data/spec/concerns/apis/notification_api_spec.rb

@@ -51,8 +51,8 @@ shared_examples_for :notification_api do
             end
           }.to change { ActivityNotification::Mailer.deliveries.size }.by(2)
           expect(ActivityNotification::Mailer.deliveries.size).to eq(2)
-          expect(ActivityNotification::Mailer.deliveries.first.to[0]).to eq(@user_1.email)
-          expect(ActivityNotification::Mailer.deliveries.last.to[0]).to eq(@author_user.email)
+          expect(ActivityNotification::Mailer.deliveries.first.to[0]).to eq(@author_user.email)
+          expect(ActivityNotification::Mailer.deliveries.last.to[0]).to eq(@user_1.email)
         end
   
         it "sends notification email with active job queue" do
@@ -62,16 +62,41 @@ shared_examples_for :notification_api do
         end
       end
 
+      context "with notify_later true" do
+        it "generates notifications later" do
+          expect {
+            described_class.notify(:users, @comment_2, notify_later: true)
+          }.to have_enqueued_job(ActivityNotification::NotifyJob)
+        end
+
+        it "creates notification records later" do
+          perform_enqueued_jobs do
+            described_class.notify(:users, @comment_2, notify_later: true)
+          end
+          expect(@author_user.notifications.unopened_only.count).to eq(1)
+          expect(@user_1.notifications.unopened_only.count).to eq(1)
+          expect(@user_2.notifications.unopened_only.count).to eq(0)
+        end
+      end
+
       context "with send_later false" do
         it "sends notification email now" do
           described_class.notify(:users, @comment_2, send_later: false)
           expect(ActivityNotification::Mailer.deliveries.size).to eq(2)
-          expect(ActivityNotification::Mailer.deliveries.first.to[0]).to eq(@user_1.email)
-          expect(ActivityNotification::Mailer.deliveries.last.to[0]).to eq(@author_user.email)
+          expect(ActivityNotification::Mailer.deliveries.first.to[0]).to eq(@author_user.email)
+          expect(ActivityNotification::Mailer.deliveries.last.to[0]).to eq(@user_1.email)
         end
       end
 
       context "with pass_full_options" do
+        before do
+          @original_targets = Comment._notification_targets[:users]
+        end
+
+        after do
+          Comment._notification_targets[:users] = @original_targets
+        end
+
         context "as false (as default)" do
           it "accepts specified lambda with notifiable and key arguments" do
             Comment._notification_targets[:users] = ->(notifiable, key){ User.all if key == 'dummy_key' }
@@ -99,6 +124,63 @@ shared_examples_for :notification_api do
         end
       end
 
+      context "when some optional targets raise error" do
+        before do
+          require 'custom_optional_targets/raise_error'
+          @optional_target = CustomOptionalTarget::RaiseError.new
+          @current_optional_target = Comment._optional_targets[:users]
+          Comment.acts_as_notifiable :users, optional_targets: ->{ [@optional_target] }
+        end
+
+        after do
+          Comment._optional_targets[:users] = @current_optional_target
+        end
+
+        context "with true as ActivityNotification.config.rescue_optional_target_errors" do
+          it "generates notifications even if some optional targets raise error" do
+            rescue_optional_target_errors = ActivityNotification.config.rescue_optional_target_errors
+            ActivityNotification.config.rescue_optional_target_errors = true
+            notifications = described_class.notify(:users, @comment_2)
+            expect(notifications.size).to eq(2)
+            ActivityNotification.config.rescue_optional_target_errors = rescue_optional_target_errors
+          end
+        end
+
+        context "with false as ActivityNotification.config.rescue_optional_target_errors" do
+          it "raises an capturable exception" do
+            rescue_optional_target_errors = ActivityNotification.config.rescue_optional_target_errors
+            ActivityNotification.config.rescue_optional_target_errors = false
+            expect { described_class.notify(:users, @comment_2) }.to raise_error(RuntimeError)
+            ActivityNotification.config.rescue_optional_target_errors = rescue_optional_target_errors
+          end
+        end
+
+        it "allows an exception to be captured to continue" do
+          begin
+            notifications = described_class.notify(:users, @comment_2)
+            expect(notifications.size).to eq(2)
+          rescue => e
+            next
+          end
+        end
+      end
+    end
+
+    describe ".notify_later" do
+      it "generates notifications later" do
+        expect {
+          described_class.notify_later(:users, @comment_2)
+        }.to have_enqueued_job(ActivityNotification::NotifyJob)
+      end
+
+      it "creates notification records later" do
+        perform_enqueued_jobs do
+          described_class.notify_later(:users, @comment_2)
+        end
+        expect(@author_user.notifications.unopened_only.count).to eq(1)
+        expect(@user_1.notifications.unopened_only.count).to eq(1)
+        expect(@user_2.notifications.unopened_only.count).to eq(0)
+      end
     end
 
     describe ".notify_all" do
@@ -125,8 +207,8 @@ shared_examples_for :notification_api do
             end
           }.to change { ActivityNotification::Mailer.deliveries.size }.by(2)
           expect(ActivityNotification::Mailer.deliveries.size).to eq(2)
-          expect(ActivityNotification::Mailer.deliveries.first.to[0]).to eq(@user_1.email)
-          expect(ActivityNotification::Mailer.deliveries.last.to[0]).to eq(@author_user.email)
+          expect(ActivityNotification::Mailer.deliveries.first.to[0]).to eq(@author_user.email)
+          expect(ActivityNotification::Mailer.deliveries.last.to[0]).to eq(@user_1.email)
         end
 
         it "sends notification email with active job queue" do
@@ -136,13 +218,47 @@ shared_examples_for :notification_api do
         end
       end
 
+      context "with notify_later true" do
+        it "generates notifications later" do
+          expect {
+            described_class.notify_all([@author_user, @user_1], @comment_2, notify_later: true)
+          }.to have_enqueued_job(ActivityNotification::NotifyAllJob)
+        end
+
+        it "creates notification records later" do
+          perform_enqueued_jobs do
+            described_class.notify_all([@author_user, @user_1], @comment_2, notify_later: true)
+          end
+          expect(@author_user.notifications.unopened_only.count).to eq(1)
+          expect(@user_1.notifications.unopened_only.count).to eq(1)
+          expect(@user_2.notifications.unopened_only.count).to eq(0)
+        end
+      end
+
       context "with send_later false" do
         it "sends notification email now" do
           described_class.notify_all([@author_user, @user_1], @comment_2, send_later: false)
           expect(ActivityNotification::Mailer.deliveries.size).to eq(2)
-          expect(ActivityNotification::Mailer.deliveries.first.to[0]).to eq(@user_1.email)
-          expect(ActivityNotification::Mailer.deliveries.last.to[0]).to eq(@author_user.email)
+          expect(ActivityNotification::Mailer.deliveries.first.to[0]).to eq(@author_user.email)
+          expect(ActivityNotification::Mailer.deliveries.last.to[0]).to eq(@user_1.email)
+        end
+      end
+    end
+
+    describe ".notify_all_later" do
+      it "generates notifications later" do
+        expect {
+          described_class.notify_all_later([@author_user, @user_1], @comment_2)
+        }.to have_enqueued_job(ActivityNotification::NotifyAllJob)
+      end
+
+      it "creates notification records later" do
+        perform_enqueued_jobs do
+          described_class.notify_all_later([@author_user, @user_1], @comment_2)
         end
+        expect(@author_user.notifications.unopened_only.count).to eq(1)
+        expect(@user_1.notifications.unopened_only.count).to eq(1)
+        expect(@user_2.notifications.unopened_only.count).to eq(0)
       end
     end
 
@@ -176,6 +292,22 @@ shared_examples_for :notification_api do
         end
       end
 
+      context "with notify_later true" do
+        it "generates notifications later" do
+          expect {
+            described_class.notify_to(@user_1, @comment_2, notify_later: true)
+          }.to have_enqueued_job(ActivityNotification::NotifyToJob)
+        end
+
+        it "creates notification records later" do
+          perform_enqueued_jobs do
+            described_class.notify_to(@user_1, @comment_2, notify_later: true)
+          end
+          expect(@user_1.notifications.unopened_only.count).to eq(1)
+          expect(@user_2.notifications.unopened_only.count).to eq(0)
+        end
+      end
+
       context "with send_later false" do
         it "sends notification email now" do
           described_class.notify_to(@user_1, @comment_2, send_later: false)
@@ -217,7 +349,7 @@ shared_examples_for :notification_api do
           end
 
           it "has parameters of notifiable.notification_parameters" do
-            expect(created_notification.parameters)
+            expect(created_notification.parameters.stringify_keys)
               .to eq(
                 created_notification.notifiable.notification_parameters(
                   @user_1.class,
@@ -355,16 +487,33 @@ shared_examples_for :notification_api do
       end
     end
 
+    describe ".notify_later_to" do
+      it "generates notifications later" do
+        expect {
+          described_class.notify_later_to(@user_1, @comment_2)
+        }.to have_enqueued_job(ActivityNotification::NotifyToJob)
+      end
+
+      it "creates notification records later" do
+        perform_enqueued_jobs do
+          described_class.notify_later_to(@user_1, @comment_2)
+        end
+        expect(@user_1.notifications.unopened_only.count).to eq(1)
+        expect(@user_2.notifications.unopened_only.count).to eq(0)
+      end
+    end
+
     describe ".open_all_of" do
       before do
         described_class.notify_to(@user_1, @article, group: @article, key: 'key.1')
+        sleep(0.01)
         described_class.notify_to(@user_1, @comment_2, group: @comment_2, key: 'key.2')
         expect(@user_1.notifications.unopened_only.count).to eq(2)
         expect(@user_1.notifications.opened_only!.count).to eq(0)
       end
 
-      it "returns the number of opened notification records" do
-        expect(described_class.open_all_of(@user_1)).to eq(2)
+      it "returns array of opened notification records" do
+        expect(described_class.open_all_of(@user_1).size).to eq(2)
       end
 
       it "opens all notifications of the target" do
@@ -427,6 +576,22 @@ shared_examples_for :notification_api do
           expect(@user_1.notifications.opened_only!.count).to eq(1)
         end
       end
+
+      context 'with later_than options' do
+        it "opens filtered notifications only" do
+          described_class.open_all_of(@user_1, { later_than: (@user_1.notifications.earliest.created_at.in_time_zone + 0.001).iso8601(3) })
+          expect(@user_1.notifications.unopened_only.count).to eq(1)
+          expect(@user_1.notifications.opened_only!.count).to eq(1)
+        end
+      end
+
+      context 'with earlier_than options' do
+        it "opens filtered notifications only" do
+          described_class.open_all_of(@user_1, { earlier_than: @user_1.notifications.latest.created_at.iso8601(3) })
+          expect(@user_1.notifications.unopened_only.count).to eq(1)
+          expect(@user_1.notifications.opened_only!.count).to eq(1)
+        end
+      end
     end
 
     describe ".group_member_exists?" do
@@ -498,7 +663,7 @@ shared_examples_for :notification_api do
     describe ".available_options" do
       it "returns list of available options in notify api" do
         expect(described_class.available_options)
-          .to eq([:key, :group, :parameters, :notifier, :send_email, :send_later])
+          .to eq([:key, :group, :group_expiry_delay, :notifier, :parameters, :send_email, :send_later, :pass_full_options])
       end
     end
   end

data/spec/concerns/apis/subscription_api_spec.rb

@@ -45,6 +45,41 @@ shared_examples_for :subscription_api do
           expect(test_instance.subscribed_to_email_at).to         eq(Time.current)
           Timecop.return
         end
+
+        context "with true as ActivityNotification.config.subscribe_to_email_as_default" do
+          it "subscribe with current time" do
+            ActivityNotification.config.subscribe_to_email_as_default = true
+
+            expect(test_instance.subscribing?).to                   eq(false)
+            expect(test_instance.subscribing_to_email?).to          eq(false)
+            Timecop.freeze(Time.at(Time.now.to_i))
+            test_instance.subscribe
+            expect(test_instance.subscribing?).to                   eq(true)
+            expect(test_instance.subscribing_to_email?).to          eq(true)
+            expect(test_instance.subscribed_at).to                  eq(Time.current)
+            expect(test_instance.subscribed_to_email_at).to         eq(Time.current)
+            Timecop.return
+
+            ActivityNotification.config.subscribe_to_email_as_default = nil
+          end
+        end
+
+        context "with false as ActivityNotification.config.subscribe_to_email_as_default" do
+          it "subscribe with current time" do
+            ActivityNotification.config.subscribe_to_email_as_default = false
+
+            expect(test_instance.subscribing?).to                   eq(false)
+            expect(test_instance.subscribing_to_email?).to          eq(false)
+            Timecop.freeze(Time.at(Time.now.to_i))
+            test_instance.subscribe
+            expect(test_instance.subscribing?).to                   eq(true)
+            expect(test_instance.subscribing_to_email?).to          eq(false)
+            expect(test_instance.subscribed_at).to                  eq(Time.current)
+            Timecop.return
+
+            ActivityNotification.config.subscribe_to_email_as_default = nil
+          end
+        end
       end
 
       context "with subscribed_at option" do
@@ -58,6 +93,39 @@ shared_examples_for :subscription_api do
           expect(test_instance.subscribed_at.to_i).to             eq(subscribed_at.to_i)
           expect(test_instance.subscribed_to_email_at.to_i).to    eq(subscribed_at.to_i)
         end
+
+        context "with true as ActivityNotification.config.subscribe_to_email_as_default" do
+          it "subscribe with current time" do
+            ActivityNotification.config.subscribe_to_email_as_default = true
+
+            expect(test_instance.subscribing?).to                   eq(false)
+            expect(test_instance.subscribing_to_email?).to          eq(false)
+            subscribed_at = Time.current - 1.months
+            test_instance.subscribe(subscribed_at: subscribed_at)
+            expect(test_instance.subscribing?).to                   eq(true)
+            expect(test_instance.subscribing_to_email?).to          eq(true)
+            expect(test_instance.subscribed_at.to_i).to             eq(subscribed_at.to_i)
+            expect(test_instance.subscribed_to_email_at.to_i).to    eq(subscribed_at.to_i)
+
+            ActivityNotification.config.subscribe_to_email_as_default = nil
+          end
+        end
+
+        context "with false as ActivityNotification.config.subscribe_to_email_as_default" do
+          it "subscribe with current time" do
+            ActivityNotification.config.subscribe_to_email_as_default = false
+
+            expect(test_instance.subscribing?).to                   eq(false)
+            expect(test_instance.subscribing_to_email?).to          eq(false)
+            subscribed_at = Time.current - 1.months
+            test_instance.subscribe(subscribed_at: subscribed_at)
+            expect(test_instance.subscribing?).to                   eq(true)
+            expect(test_instance.subscribing_to_email?).to          eq(false)
+            expect(test_instance.subscribed_at.to_i).to             eq(subscribed_at.to_i)
+
+            ActivityNotification.config.subscribe_to_email_as_default = nil
+          end
+        end
       end
 
       context "with false as with_email_subscription" do
@@ -79,6 +147,36 @@ shared_examples_for :subscription_api do
           expect(test_instance.subscribing?).to                                     eq(true)
           expect(test_instance.subscribing_to_optional_target?(:console_output)).to eq(true)
         end
+
+        context "with true as ActivityNotification.config.subscribe_to_optional_targets_as_default" do
+          it "also subscribes to optional targets" do
+            ActivityNotification.config.subscribe_to_optional_targets_as_default = true
+
+            test_instance.unsubscribe_to_optional_target(:console_output)
+            expect(test_instance.subscribing?).to                                     eq(false)
+            expect(test_instance.subscribing_to_optional_target?(:console_output)).to eq(false)
+            test_instance.subscribe
+            expect(test_instance.subscribing?).to                                     eq(true)
+            expect(test_instance.subscribing_to_optional_target?(:console_output)).to eq(true)
+
+            ActivityNotification.config.subscribe_to_optional_targets_as_default = nil
+          end
+        end
+
+        context "with false as ActivityNotification.config.subscribe_to_optional_targets_as_default" do
+          it "does not subscribe to optional targets" do
+            ActivityNotification.config.subscribe_to_optional_targets_as_default = false
+
+            test_instance.unsubscribe_to_optional_target(:console_output)
+            expect(test_instance.subscribing?).to                                     eq(false)
+            expect(test_instance.subscribing_to_optional_target?(:console_output)).to eq(false)
+            test_instance.subscribe
+            expect(test_instance.subscribing?).to                                     eq(true)
+            expect(test_instance.subscribing_to_optional_target?(:console_output)).to eq(false)
+
+            ActivityNotification.config.subscribe_to_optional_targets_as_default = nil
+          end
+        end
       end
 
       context "with false as with_optional_targets" do
@@ -210,7 +308,7 @@ shared_examples_for :subscription_api do
         test_instance.update(optional_targets: {})
       end
 
-      context "without configured optional target subscpriotion" do
+      context "without configured optional target subscription" do
         context "without subscribe_as_default argument" do
           context "with true as ActivityNotification.config.subscribe_as_default" do
             it "returns true" do
@@ -219,6 +317,28 @@ shared_examples_for :subscription_api do
               expect(test_instance.subscribing_to_optional_target?(:console_output)).to be_truthy
               ActivityNotification.config.subscribe_as_default = subscribe_as_default
             end
+
+            context "with true as ActivityNotification.config.subscribe_to_optional_targets_as_default" do
+              it "returns true" do
+                subscribe_as_default = ActivityNotification.config.subscribe_as_default
+                ActivityNotification.config.subscribe_as_default = true
+                ActivityNotification.config.subscribe_to_optional_targets_as_default = true
+                expect(test_instance.subscribing_to_optional_target?(:console_output)).to be_truthy
+                ActivityNotification.config.subscribe_as_default = subscribe_as_default
+                ActivityNotification.config.subscribe_to_optional_targets_as_default = nil
+              end
+            end
+
+            context "with false as ActivityNotification.config.subscribe_to_optional_targets_as_default" do
+              it "returns false" do
+                subscribe_as_default = ActivityNotification.config.subscribe_as_default
+                ActivityNotification.config.subscribe_as_default = true
+                ActivityNotification.config.subscribe_to_optional_targets_as_default = false
+                expect(test_instance.subscribing_to_optional_target?(:console_output)).to be_falsey
+                ActivityNotification.config.subscribe_as_default = subscribe_as_default
+                ActivityNotification.config.subscribe_to_optional_targets_as_default = nil
+              end
+            end
           end
 
           context "with false as ActivityNotification.config.subscribe_as_default" do
@@ -228,11 +348,33 @@ shared_examples_for :subscription_api do
               expect(test_instance.subscribing_to_optional_target?(:console_output)).to be_falsey
               ActivityNotification.config.subscribe_as_default = subscribe_as_default
             end
+
+            context "with true as ActivityNotification.config.subscribe_to_optional_targets_as_default" do
+              it "returns false" do
+                subscribe_as_default = ActivityNotification.config.subscribe_as_default
+                ActivityNotification.config.subscribe_as_default = false
+                ActivityNotification.config.subscribe_to_optional_targets_as_default = true
+                expect(test_instance.subscribing_to_optional_target?(:console_output)).to be_falsey
+                ActivityNotification.config.subscribe_as_default = subscribe_as_default
+                ActivityNotification.config.subscribe_to_optional_targets_as_default = nil
+              end
+            end
+
+            context "with false as ActivityNotification.config.subscribe_to_optional_targets_as_default" do
+              it "returns false" do
+                subscribe_as_default = ActivityNotification.config.subscribe_as_default
+                ActivityNotification.config.subscribe_as_default = false
+                ActivityNotification.config.subscribe_to_optional_targets_as_default = false
+                expect(test_instance.subscribing_to_optional_target?(:console_output)).to be_falsey
+                ActivityNotification.config.subscribe_as_default = subscribe_as_default
+                ActivityNotification.config.subscribe_to_optional_targets_as_default = nil
+              end
+            end
           end
         end
       end
 
-      context "with configured subscpriotion" do
+      context "with configured subscription" do
         context "subscribing to optional target" do
           it "returns true" do
             test_instance.subscribe_to_optional_target(:console_output)
@@ -279,7 +421,7 @@ shared_examples_for :subscription_api do
           test_instance.subscribe_to_optional_target(:console_output)
           expect(test_instance.subscribing?).to                                         eq(true)
           expect(test_instance.subscribing_to_optional_target?(:console_output)).to     eq(true)
-          expect(test_instance.optional_targets[:subscribed_to_console_output_at]).to   eq(Time.current)
+          expect(test_instance.optional_targets[:subscribed_to_console_output_at]).to   eq(ActivityNotification::Subscription.convert_time_as_hash(Time.current))
           Timecop.return
         end
       end
@@ -310,7 +452,7 @@ shared_examples_for :subscription_api do
           test_instance.unsubscribe_to_optional_target(:console_output)
           expect(test_instance.subscribing?).to                                         eq(true)
           expect(test_instance.subscribing_to_optional_target?(:console_output)).to     eq(false)
-          expect(test_instance.optional_targets[:unsubscribed_to_console_output_at]).to eq(Time.current)
+          expect(test_instance.optional_targets[:unsubscribed_to_console_output_at]).to eq(ActivityNotification::Subscription.convert_time_as_hash(Time.current))
           Timecop.return
         end
       end

data/spec/concerns/common_spec.rb

@@ -34,7 +34,7 @@ shared_examples_for :common do
           test_instance.extend(AdditionalMethods)
           expect(ActivityNotification.resolve_value(test_instance, :custom_method)).to eq(1)
         end
-  
+
         it "returns specified symbol with controller and additional arguments" do
           module AdditionalMethods
             def custom_method(controller, key)
@@ -45,6 +45,17 @@ shared_examples_for :common do
           expect(ActivityNotification.resolve_value(test_instance, :custom_method, 'test1.key')).to eq(1)
           expect(ActivityNotification.resolve_value(test_instance, :custom_method, 'test2.key')).to eq(0)
         end
+
+        it "returns specified symbol with controller and additional arguments including hash as last argument" do
+           module AdditionalMethods
+             def custom_method(controller, key, options:)
+               controller == 'StubController' and key == 'test1.key' ? 1 : 0
+             end
+           end
+           test_instance.extend(AdditionalMethods)
+           expect(ActivityNotification.resolve_value(test_instance, :custom_method, 'test1.key', options: 1)).to eq(1)
+           expect(ActivityNotification.resolve_value(test_instance, :custom_method, 'test2.key', options: 1)).to eq(0)
+         end
       end
 
       context "with Proc" do
@@ -62,7 +73,7 @@ shared_examples_for :common do
           test_proc = ->(controller, model){ controller == 'StubController' and model == test_instance ? 1 : 0 }
           expect(ActivityNotification.resolve_value(test_instance, test_proc)).to eq(1)
         end
-  
+
         it "returns specified lambda with controller, context(model) and additional arguments" do
           test_proc = ->(controller, model, key){ controller == 'StubController' and model == test_instance and key == 'test1.key' ? 1 : 0 }
           expect(ActivityNotification.resolve_value(test_instance, test_proc, 'test1.key')).to eq(1)
@@ -118,6 +129,17 @@ shared_examples_for :common do
           expect(test_instance.resolve_value(:custom_method, 'test1.key')).to eq(1)
           expect(test_instance.resolve_value(:custom_method, 'test2.key')).to eq(0)
         end
+
+        it "returns specified symbol with additional arguments including hash as last argument" do
+          module AdditionalMethods
+            def custom_method(key, options:)
+              key == 'test1.key' ? 1 : 0
+            end
+          end
+          test_instance.extend(AdditionalMethods)
+          expect(test_instance.resolve_value(:custom_method, 'test1.key', options: 1)).to eq(1)
+          expect(test_instance.resolve_value(:custom_method, 'test2.key', options: 1)).to eq(0)
+        end
       end
 
       context "with Proc" do
@@ -188,4 +210,4 @@ shared_examples_for :common do
     end
   end
 
-end
+end