activity_notification 2.1.2 → 2.2.2

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)

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

data/spec/concerns/models/notifiable_spec.rb

@@ -21,7 +21,7 @@ shared_examples_for :notifiable do
         expect(described_class._notifier).to                        eq({})
         expect(described_class._notification_parameters).to         eq({})
         expect(described_class._notification_email_allowed).to      eq({})
-        expect(described_class._notification_action_cable_allowed).to      eq({})
+        expect(described_class._notifiable_action_cable_allowed).to eq({})
         expect(described_class._notifiable_path).to                 eq({})
         expect(described_class._printable_notifiable_name).to       eq({})
       end
@@ -410,130 +410,130 @@ shared_examples_for :notifiable do
       end
     end
 
-    describe "#notification_action_cable_allowed?" do
+    describe "#notifiable_action_cable_allowed?" do
       context "without any configuration" do
         it "returns ActivityNotification.config.action_cable_enabled" do
-          expect(test_instance.notification_action_cable_allowed?(test_target, 'dummy_key'))
+          expect(test_instance.notifiable_action_cable_allowed?(test_target, 'dummy_key'))
             .to eq(ActivityNotification.config.action_cable_enabled)
         end
 
         it "returns false as default" do
-          expect(test_instance.notification_action_cable_allowed?(test_target, 'dummy_key')).to be_falsey
+          expect(test_instance.notifiable_action_cable_allowed?(test_target, 'dummy_key')).to be_falsey
         end
       end
 
       context "configured with overridden method" do
         it "returns specified value" do
           module AdditionalMethods
-            def notification_action_cable_allowed_for_users?(target, key)
+            def notifiable_action_cable_allowed_for_users?(target, key)
               true
             end
           end
           test_instance.extend(AdditionalMethods)
-          expect(test_instance.notification_action_cable_allowed?(test_target, 'dummy_key')).to eq(true)
+          expect(test_instance.notifiable_action_cable_allowed?(test_target, 'dummy_key')).to eq(true)
         end
       end
 
       context "configured with a field" do
         it "returns specified value" do
-          described_class._notification_action_cable_allowed[:users] = true
-          expect(test_instance.notification_action_cable_allowed?(test_target, 'dummy_key')).to eq(true)
+          described_class._notifiable_action_cable_allowed[:users] = true
+          expect(test_instance.notifiable_action_cable_allowed?(test_target, 'dummy_key')).to eq(true)
         end
 
         it "returns specified symbol without arguments" do
           module AdditionalMethods
-            def custom_notification_action_cable_allowed?
+            def custom_notifiable_action_cable_allowed?
               true
             end
           end
           test_instance.extend(AdditionalMethods)
-          described_class._notification_action_cable_allowed[:users] = :custom_notification_action_cable_allowed?
-          expect(test_instance.notification_action_cable_allowed?(test_target, 'dummy_key')).to eq(true)
+          described_class._notifiable_action_cable_allowed[:users] = :custom_notifiable_action_cable_allowed?
+          expect(test_instance.notifiable_action_cable_allowed?(test_target, 'dummy_key')).to eq(true)
         end
 
         it "returns specified symbol with target and key arguments" do
           module AdditionalMethods
-            def custom_notification_action_cable_allowed?(target, key)
+            def custom_notifiable_action_cable_allowed?(target, key)
               true
             end
           end
           test_instance.extend(AdditionalMethods)
-          described_class._notification_action_cable_allowed[:users] = :custom_notification_action_cable_allowed?
-          expect(test_instance.notification_action_cable_allowed?(test_target, 'dummy_key')).to eq(true)
+          described_class._notifiable_action_cable_allowed[:users] = :custom_notifiable_action_cable_allowed?
+          expect(test_instance.notifiable_action_cable_allowed?(test_target, 'dummy_key')).to eq(true)
         end
 
         it "returns specified lambda with single notifiable argument" do
-          described_class._notification_action_cable_allowed[:users] = ->(notifiable){ true }
-          expect(test_instance.notification_action_cable_allowed?(test_target, 'dummy_key')).to eq(true)
+          described_class._notifiable_action_cable_allowed[:users] = ->(notifiable){ true }
+          expect(test_instance.notifiable_action_cable_allowed?(test_target, 'dummy_key')).to eq(true)
         end
 
         it "returns specified lambda with notifiable, target and key arguments" do
-          described_class._notification_action_cable_allowed[:users] = ->(notifiable, target, key){ true }
-          expect(test_instance.notification_action_cable_allowed?(test_target, 'dummy_key')).to eq(true)
+          described_class._notifiable_action_cable_allowed[:users] = ->(notifiable, target, key){ true }
+          expect(test_instance.notifiable_action_cable_allowed?(test_target, 'dummy_key')).to eq(true)
         end
       end
     end
 
-    describe "#notification_action_cable_api_allowed?" do
+    describe "#notifiable_action_cable_api_allowed?" do
       context "without any configuration" do
         it "returns ActivityNotification.config.action_cable_api_enabled" do
-          expect(test_instance.notification_action_cable_api_allowed?(test_target, 'dummy_key'))
+          expect(test_instance.notifiable_action_cable_api_allowed?(test_target, 'dummy_key'))
             .to eq(ActivityNotification.config.action_cable_api_enabled)
         end
 
         it "returns false as default" do
-          expect(test_instance.notification_action_cable_api_allowed?(test_target, 'dummy_key')).to be_falsey
+          expect(test_instance.notifiable_action_cable_api_allowed?(test_target, 'dummy_key')).to be_falsey
         end
       end
 
       context "configured with overridden method" do
         it "returns specified value" do
           module AdditionalMethods
-            def notification_action_cable_api_allowed_for_users?(target, key)
+            def notifiable_action_cable_api_allowed_for_users?(target, key)
               true
             end
           end
           test_instance.extend(AdditionalMethods)
-          expect(test_instance.notification_action_cable_api_allowed?(test_target, 'dummy_key')).to eq(true)
+          expect(test_instance.notifiable_action_cable_api_allowed?(test_target, 'dummy_key')).to eq(true)
         end
       end
 
       context "configured with a field" do
         it "returns specified value" do
-          described_class._notification_action_cable_api_allowed[:users] = true
-          expect(test_instance.notification_action_cable_api_allowed?(test_target, 'dummy_key')).to eq(true)
+          described_class._notifiable_action_cable_api_allowed[:users] = true
+          expect(test_instance.notifiable_action_cable_api_allowed?(test_target, 'dummy_key')).to eq(true)
         end
 
         it "returns specified symbol without arguments" do
           module AdditionalMethods
-            def custom_notification_action_cable_api_allowed?
+            def custom_notifiable_action_cable_api_allowed?
               true
             end
           end
           test_instance.extend(AdditionalMethods)
-          described_class._notification_action_cable_api_allowed[:users] = :custom_notification_action_cable_api_allowed?
-          expect(test_instance.notification_action_cable_api_allowed?(test_target, 'dummy_key')).to eq(true)
+          described_class._notifiable_action_cable_api_allowed[:users] = :custom_notifiable_action_cable_api_allowed?
+          expect(test_instance.notifiable_action_cable_api_allowed?(test_target, 'dummy_key')).to eq(true)
         end
 
         it "returns specified symbol with target and key arguments" do
           module AdditionalMethods
-            def custom_notification_action_cable_api_allowed?(target, key)
+            def custom_notifiable_action_cable_api_allowed?(target, key)
               true
             end
           end
           test_instance.extend(AdditionalMethods)
-          described_class._notification_action_cable_api_allowed[:users] = :custom_notification_action_cable_api_allowed?
-          expect(test_instance.notification_action_cable_api_allowed?(test_target, 'dummy_key')).to eq(true)
+          described_class._notifiable_action_cable_api_allowed[:users] = :custom_notifiable_action_cable_api_allowed?
+          expect(test_instance.notifiable_action_cable_api_allowed?(test_target, 'dummy_key')).to eq(true)
         end
 
         it "returns specified lambda with single notifiable argument" do
-          described_class._notification_action_cable_api_allowed[:users] = ->(notifiable){ true }
-          expect(test_instance.notification_action_cable_api_allowed?(test_target, 'dummy_key')).to eq(true)
+          described_class._notifiable_action_cable_api_allowed[:users] = ->(notifiable){ true }
+          expect(test_instance.notifiable_action_cable_api_allowed?(test_target, 'dummy_key')).to eq(true)
         end
 
         it "returns specified lambda with notifiable, target and key arguments" do
-          described_class._notification_action_cable_api_allowed[:users] = ->(notifiable, target, key){ true }
-          expect(test_instance.notification_action_cable_api_allowed?(test_target, 'dummy_key')).to eq(true)
+          described_class._notifiable_action_cable_api_allowed[:users] = ->(notifiable, target, key){ true }
+          expect(test_instance.notifiable_action_cable_api_allowed?(test_target, 'dummy_key')).to eq(true)
         end
       end
     end

data/spec/concerns/models/subscriber_spec.rb

@@ -86,8 +86,65 @@ shared_examples_for :subscriber do
           new_subscription = test_instance.create_subscription(params)
           expect(new_subscription.subscribing?).to           be_truthy
           expect(new_subscription.subscribing_to_email?).to  be_truthy
+          expect(new_subscription.subscribing_to_optional_target?(:console_output)).to be_truthy
           expect(test_instance.subscriptions.reload.size).to eq(1)
         end
+
+        context "with true as ActivityNotification.config.subscribe_to_email_as_default" do
+          it "creates a new subscription" do
+            ActivityNotification.config.subscribe_to_email_as_default = true
+
+            params = { key: 'key_1' }
+            new_subscription = test_instance.create_subscription(params)
+            expect(new_subscription.subscribing?).to           be_truthy
+            expect(new_subscription.subscribing_to_email?).to  be_truthy
+            expect(test_instance.subscriptions.reload.size).to eq(1)
+
+            ActivityNotification.config.subscribe_to_email_as_default = nil
+          end
+        end
+
+        context "with false as ActivityNotification.config.subscribe_to_email_as_default" do
+          it "creates a new subscription" do
+            ActivityNotification.config.subscribe_to_email_as_default = false
+
+            params = { key: 'key_1' }
+            new_subscription = test_instance.create_subscription(params)
+            expect(new_subscription.subscribing?).to           be_truthy
+            expect(new_subscription.subscribing_to_email?).to  be_falsey
+            expect(test_instance.subscriptions.reload.size).to eq(1)
+
+            ActivityNotification.config.subscribe_to_email_as_default = nil
+          end
+        end
+
+        context "with true as ActivityNotification.config.subscribe_to_optional_targets_as_default" do
+          it "creates a new subscription" do
+            ActivityNotification.config.subscribe_to_optional_targets_as_default = true
+
+            params = { key: 'key_1' }
+            new_subscription = test_instance.create_subscription(params)
+            expect(new_subscription.subscribing?).to           be_truthy
+            expect(new_subscription.subscribing_to_optional_target?(:console_output)).to be_truthy
+            expect(test_instance.subscriptions.reload.size).to eq(1)
+
+            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 "creates a new subscription" do
+            ActivityNotification.config.subscribe_to_optional_targets_as_default = false
+
+            params = { key: 'key_1' }
+            new_subscription = test_instance.create_subscription(params)
+            expect(new_subscription.subscribing?).to           be_truthy
+            expect(new_subscription.subscribing_to_optional_target?(:console_output)).to be_falsey
+            expect(test_instance.subscriptions.reload.size).to eq(1)
+
+            ActivityNotification.config.subscribe_to_optional_targets_as_default = nil
+          end
+        end
       end
 
       context "with false as subscribing params" do
@@ -98,6 +155,34 @@ shared_examples_for :subscriber do
           expect(new_subscription.subscribing_to_email?).to  be_falsey
           expect(test_instance.subscriptions.reload.size).to eq(1)
         end
+
+        context "with true as ActivityNotification.config.subscribe_to_email_as_default" do
+          it "creates a new subscription" do
+            ActivityNotification.config.subscribe_to_email_as_default = true
+
+            params = { key: 'key_1', subscribing: false }
+            new_subscription = test_instance.create_subscription(params)
+            expect(new_subscription.subscribing?).to           be_falsey
+            expect(new_subscription.subscribing_to_email?).to  be_falsey
+            expect(test_instance.subscriptions.reload.size).to eq(1)
+
+            ActivityNotification.config.subscribe_to_email_as_default = nil
+          end
+        end
+
+        context "with false as ActivityNotification.config.subscribe_to_email_as_default" do
+          it "creates a new subscription" do
+            ActivityNotification.config.subscribe_to_email_as_default = false
+
+            params = { key: 'key_1', subscribing: false }
+            new_subscription = test_instance.create_subscription(params)
+            expect(new_subscription.subscribing?).to           be_falsey
+            expect(new_subscription.subscribing_to_email?).to  be_falsey
+            expect(test_instance.subscriptions.reload.size).to eq(1)
+
+            ActivityNotification.config.subscribe_to_email_as_default = nil
+          end
+        end
       end
 
       context "with false as subscribing_to_email params" do
@@ -462,7 +547,7 @@ shared_examples_for :subscriber do
           described_class._notification_subscription_allowed = true
         end
 
-        context "without configured subscpriotion" do
+        context "without configured subscription" do
           context "without subscribe_as_default argument" do
             context "with true as ActivityNotification.config.subscribe_as_default" do
               it "returns true" do
@@ -484,7 +569,7 @@ shared_examples_for :subscriber do
           end
         end
 
-        context "with configured subscpriotion" do
+        context "with configured subscription" do
           context "subscribing to notification" do
             it "returns true" do
               subscription = test_instance.create_subscription(key: @test_key)
@@ -521,7 +606,7 @@ shared_examples_for :subscriber do
           described_class._notification_subscription_allowed = true
         end
 
-        context "without configured subscpriotion" do
+        context "without configured subscription" do
           context "without subscribe_as_default argument" do
             context "with true as ActivityNotification.config.subscribe_as_default" do
               it "returns true" do
@@ -530,6 +615,28 @@ shared_examples_for :subscriber do
                 expect(test_instance.subscribes_to_notification_email?(@test_key)).to be_truthy
                 ActivityNotification.config.subscribe_as_default = subscribe_as_default
               end
+
+              context "with true as ActivityNotification.config.subscribe_to_email_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_email_as_default = true
+                  expect(test_instance.subscribes_to_notification_email?(@test_key)).to be_truthy
+                  ActivityNotification.config.subscribe_as_default = subscribe_as_default
+                  ActivityNotification.config.subscribe_to_email_as_default = nil
+                end
+              end
+
+              context "with false as ActivityNotification.config.subscribe_to_email_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_email_as_default = false
+                  expect(test_instance.subscribes_to_notification_email?(@test_key)).to be_falsey
+                  ActivityNotification.config.subscribe_as_default = subscribe_as_default
+                  ActivityNotification.config.subscribe_to_email_as_default = nil
+                end
+              end
             end
 
             context "with false as ActivityNotification.config.subscribe_as_default" do
@@ -539,11 +646,33 @@ shared_examples_for :subscriber do
                 expect(test_instance.subscribes_to_notification_email?(@test_key)).to be_falsey
                 ActivityNotification.config.subscribe_as_default = subscribe_as_default
               end
+
+              context "with true as ActivityNotification.config.subscribe_to_email_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_email_as_default = true
+                  expect(test_instance.subscribes_to_notification_email?(@test_key)).to be_falsey
+                  ActivityNotification.config.subscribe_as_default = subscribe_as_default
+                  ActivityNotification.config.subscribe_to_email_as_default = nil
+                end
+              end
+
+              context "with false as ActivityNotification.config.subscribe_to_email_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_email_as_default = false
+                  expect(test_instance.subscribes_to_notification_email?(@test_key)).to be_falsey
+                  ActivityNotification.config.subscribe_as_default = subscribe_as_default
+                  ActivityNotification.config.subscribe_to_email_as_default = nil
+                end
+              end
             end
           end
         end
 
-        context "with configured subscpriotion" do
+        context "with configured subscription" do
           context "subscribing to notification email" do
             it "returns true" do
               subscription = test_instance.create_subscription(key: @test_key)
@@ -581,7 +710,7 @@ shared_examples_for :subscriber do
           described_class._notification_subscription_allowed = true
         end
 
-        context "without configured subscpriotion" do
+        context "without configured subscription" do
           context "without subscribe_as_default argument" do
             context "with true as ActivityNotification.config.subscribe_as_default" do
               it "returns true" do
@@ -590,6 +719,28 @@ shared_examples_for :subscriber do
                 expect(test_instance.subscribes_to_optional_target?(@test_key, @optional_target_name)).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.subscribes_to_optional_target?(@test_key, @optional_target_name)).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.subscribes_to_optional_target?(@test_key, @optional_target_name)).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
@@ -599,11 +750,33 @@ shared_examples_for :subscriber do
                 expect(test_instance.subscribes_to_optional_target?(@test_key, @optional_target_name)).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.subscribes_to_optional_target?(@test_key, @optional_target_name)).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.subscribes_to_optional_target?(@test_key, @optional_target_name)).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 the specified optional target" do
             it "returns true" do
               subscription = test_instance.create_subscription(key: @test_key, optional_targets: { ActivityNotification::Subscription.to_optional_target_key(@optional_target_name) => true })