activity_notification 1.4.4 → 2.2.4

data/spec/concerns/models/subscriber_spec.rb

@@ -15,7 +15,7 @@ shared_examples_for :subscriber do
       expect(test_instance.subscriptions.count).to                eq(2)
       expect(test_instance.subscriptions.earliest_order.first).to eq(subscription_1)
       expect(test_instance.subscriptions.latest_order.first).to   eq(subscription_2)
-      expect(test_instance.subscriptions.latest_order).to         eq(ActivityNotification::Subscription.filtered_by_target(test_instance).latest_order)
+      expect(test_instance.subscriptions.latest_order.to_a).to    eq(ActivityNotification::Subscription.filtered_by_target(test_instance).latest_order.to_a)
     end
   end    
 
@@ -30,13 +30,13 @@ shared_examples_for :subscriber do
   describe "as public instance methods" do
     describe "#find_subscription" do
       before do
-        expect(test_instance.subscriptions).to be_empty
+        expect(test_instance.subscriptions.to_a).to be_empty
       end
 
       context "when the cofigured subscription exists" do
         it "returns subscription record" do
           subscription = test_instance.create_subscription(key: 'test_key')
-          expect(test_instance.subscriptions.reload).not_to be_empty
+          expect(test_instance.subscriptions.reload.to_a).not_to be_empty
           expect(test_instance.find_subscription('test_key')).to eq(subscription)
         end
       end
@@ -50,13 +50,13 @@ shared_examples_for :subscriber do
 
     describe "#find_or_create_subscription" do
       before do
-        expect(test_instance.subscriptions).to be_empty
+        expect(test_instance.subscriptions.to_a).to be_empty
       end
 
       context "when the cofigured subscription exists" do
         it "returns subscription record" do
           subscription = test_instance.create_subscription(key: 'test_key')
-          expect(test_instance.subscriptions.reload).not_to be_empty
+          expect(test_instance.subscriptions.reload.to_a).not_to be_empty
           expect(test_instance.find_or_create_subscription('test_key')).to eq(subscription)
         end
       end
@@ -70,14 +70,13 @@ shared_examples_for :subscriber do
 
     describe "#create_subscription" do
       before do
-        expect(test_instance.subscriptions).to be_empty
+        expect(test_instance.subscriptions.to_a).to be_empty
       end
 
       context "without params" do
-        it "does not create a new subscription since it is invalid" do
-          new_subscription = test_instance.create_subscription
-          expect(new_subscription).to                        be_nil
-          expect(test_instance.subscriptions.reload).to      be_empty
+        it "raises ActivityNotification::RecordInvalidError it is invalid" do
+          expect { test_instance.create_subscription }
+          .to raise_error(ActivityNotification::RecordInvalidError)
         end
       end
 
@@ -85,28 +84,113 @@ shared_examples_for :subscriber do
         it "creates a new subscription" do
           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(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
         it "creates a new subscription" do
           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(new_subscription.subscribing?).to           be_falsey
+          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
         it "creates a new subscription" do
           params = { key: 'key_1', subscribing_to_email: false }
           new_subscription = test_instance.create_subscription(params)
-          expect(new_subscription.subscribing?).to            be_truthy
-          expect(new_subscription.subscribing_to_email?).to   be_falsey
+          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)
         end
       end
@@ -115,23 +199,21 @@ shared_examples_for :subscriber do
         it "creates a new subscription" do
           params = { key: 'key_1', subscribing: true, subscribing_to_email: false }
           new_subscription = test_instance.create_subscription(params)
-          expect(new_subscription.subscribing?).to            be_truthy
-          expect(new_subscription.subscribing_to_email?).to   be_falsey
+          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)
         end
       end
 
       context "with false as subscribing and true as subscribing_to_email params" do
-        it "does not create a new subscription since it is invalid" do
-          params = { key: 'key_1', subscribing: false, subscribing_to_email: true }
-          new_subscription = test_instance.create_subscription(params)
-          expect(new_subscription).to                        be_nil
-          expect(test_instance.subscriptions.reload).to      be_empty
+        it "raises ActivityNotification::RecordInvalidError it is invalid" do
+          expect {
+            params = { key: 'key_1', subscribing: false, subscribing_to_email: true }
+            test_instance.create_subscription(params)
+          }.to raise_error(ActivityNotification::RecordInvalidError)
         end
       end
 
-
-
       context "with true as optional_targets params" do
         it "creates a new subscription" do
           params = { key: 'key_1', optional_targets: { subscribing_to_console_output: true } }
@@ -163,11 +245,11 @@ shared_examples_for :subscriber do
       end
 
       context "with false as subscribing and true as optional_targets params" do
-        it "does not create a new subscription since it is invalid" do
-          params = { key: 'key_1', subscribing: false, optional_targets: { subscribing_to_console_output: true } }
-          new_subscription = test_instance.create_subscription(params)
-          expect(new_subscription).to                        be_nil
-          expect(test_instance.subscriptions.reload).to      be_empty
+        it "raises ActivityNotification::RecordInvalidError it is invalid" do
+          expect {
+            params = { key: 'key_1', subscribing: false, optional_targets: { subscribing_to_console_output: true } }
+            test_instance.create_subscription(params)
+          }.to raise_error(ActivityNotification::RecordInvalidError)
         end
       end
     end
@@ -187,8 +269,8 @@ shared_examples_for :subscriber do
 
         context "without any options" do
           it "returns the array of subscriptions" do
-            expect(test_instance.subscription_index[0]).to eq(@subscription1)
-            expect(test_instance.subscription_index[1]).to eq(@subscription2)
+            expect(test_instance.subscription_index[0]).to   eq(@subscription1)
+            expect(test_instance.subscription_index[1]).to   eq(@subscription2)
             expect(test_instance.subscription_index.size).to eq(2)
           end
         end
@@ -196,7 +278,7 @@ shared_examples_for :subscriber do
         context "with limit" do
           it "returns the same as subscriptions with limit" do
             options = { limit: 1 }
-            expect(test_instance.subscription_index(options)[0]).to eq(@subscription1)
+            expect(test_instance.subscription_index(options)[0]).to   eq(@subscription1)
             expect(test_instance.subscription_index(options).size).to eq(1)
           end
         end
@@ -204,8 +286,8 @@ shared_examples_for :subscriber do
         context "with reverse" do
           it "returns the earliest order" do
             options = { reverse: true }
-            expect(test_instance.subscription_index(options)[0]).to eq(@subscription2)
-            expect(test_instance.subscription_index(options)[1]).to eq(@subscription1)
+            expect(test_instance.subscription_index(options)[0]).to   eq(@subscription2)
+            expect(test_instance.subscription_index(options)[1]).to   eq(@subscription1)
             expect(test_instance.subscription_index(options).size).to eq(2)
           end
         end
@@ -213,37 +295,36 @@ shared_examples_for :subscriber do
         context 'with filtered_by_key options' do
           it "returns filtered notifications only" do
             options = { filtered_by_key: 'subscription_key_2' }
-            expect(test_instance.subscription_index(options)[0]).to eq(@subscription2)
+            expect(test_instance.subscription_index(options)[0]).to   eq(@subscription2)
             expect(test_instance.subscription_index(options).size).to eq(1)
           end
         end
 
         context 'with custom_filter options' do
-          it "returns filtered notifications only" do
-            if ActivityNotification.config.orm == :active_record
-              options = { custom_filter: ["subscriptions.key = ?", 'subscription_key_2'] }
-              expect(test_instance.subscription_index(options)[0]).to eq(@subscription2)
-              expect(test_instance.subscription_index(options).size).to eq(1)
-            end
-
+          it "returns filtered subscriptions only" do
             options = { custom_filter: { key: 'subscription_key_1' } }
-            expect(test_instance.subscription_index(options)[0]).to eq(@subscription1)
+            expect(test_instance.subscription_index(options)[0]).to   eq(@subscription1)
             expect(test_instance.subscription_index(options).size).to eq(1)
           end
-        end
 
-        #TODO
-        # context 'with with_target options' do
-          # it "calls includes(:target)" do
-            # expect(ActiveRecord::Base).to receive(:includes).with(:target)
-            # test_instance.subscription_index(with_target: true)
-          # end
-        # end
+          it "returns filtered subscriptions only with filter depending on ORM" do
+            options =
+              case ActivityNotification.config.orm
+              when :active_record then { custom_filter: ["subscriptions.key = ?", 'subscription_key_2'] }
+              when :mongoid       then { custom_filter: { key: {'$eq': 'subscription_key_2'} } }
+              when :dynamoid      then { custom_filter: {'key.begins_with': 'subscription_key_2'} }
+              end
+            expect(test_instance.subscription_index(options)[0]).to   eq(@subscription2)
+            expect(test_instance.subscription_index(options).size).to eq(1)
+          end
+        end
 
-        context 'without with_target options' do
-          it "does not call includes(:target)" do
-            expect(ActiveRecord::Base).not_to receive(:includes).with(:target)
-            test_instance.subscription_index
+        if ActivityNotification.config.orm == :active_record
+          context 'with with_target options' do
+            it "calls with_target" do
+              expect(ActivityNotification::Subscription).to receive_message_chain(:with_target)
+              test_instance.subscription_index(with_target: true)
+            end
           end
         end
       end
@@ -322,23 +403,28 @@ shared_examples_for :subscriber do
 
         context 'with custom_filter options' do
           it "returns filtered notifications only" do
-            if ActivityNotification.config.orm == :active_record
-              options = { custom_filter: ["notifications.key = ?", 'notification_key_2'] }
-              expect(test_instance.notification_keys(options)[0]).to eq('notification_key_2')
-              expect(test_instance.notification_keys(options).size).to eq(1)
-            end
-
             options = { custom_filter: { key: 'notification_key_1' } }
             expect(test_instance.notification_keys(options)[0]).to eq('notification_key_1')
             expect(test_instance.notification_keys(options).size).to eq(1)
           end
+
+          it "returns filtered notifications only with filter depending on ORM" do
+            options =
+              case ActivityNotification.config.orm
+              when :active_record then { custom_filter: ["notifications.key = ?", 'notification_key_2'] }
+              when :mongoid       then { custom_filter: { key: {'$eq': 'notification_key_2'} } }
+              when :dynamoid      then { custom_filter: {'key.begins_with': 'notification_key_2'} }
+              end
+            expect(test_instance.notification_keys(options)[0]).to eq('notification_key_2')
+            expect(test_instance.notification_keys(options).size).to eq(1)
+          end
         end
       end
     end
 
     # Function test for subscriptions
 
-    describe "#notify_to" do
+    describe "#receive_notification_of" do
       before do
         @test_key = 'test_key'
         Comment.acts_as_notifiable described_class.to_s.underscore.pluralize.to_sym, targets: [], email_allowed: true
@@ -353,13 +439,13 @@ shared_examples_for :subscriber do
         end
 
         it "returns created notification" do
-          notification = test_instance.notify_to(@notifiable, key: @test_key)
+          notification = test_instance.receive_notification_of(@notifiable, key: @test_key)
           expect(notification).not_to be_nil
           expect(notification.target).to eq(test_instance)
         end
   
         it "creates notification records" do
-          test_instance.notify_to(@notifiable, key: @test_key)
+          test_instance.receive_notification_of(@notifiable, key: @test_key)
           expect(test_instance.notifications.unopened_only.count).to eq(1)
         end
       end
@@ -374,7 +460,7 @@ shared_examples_for :subscriber do
           it "sends notification email later" do
             expect {
               perform_enqueued_jobs do
-                test_instance.notify_to(@notifiable, key: @test_key)
+                test_instance.receive_notification_of(@notifiable, key: @test_key)
               end
             }.to change { ActivityNotification::Mailer.deliveries.size }.by(1)
             expect(ActivityNotification::Mailer.deliveries.size).to eq(1)
@@ -382,14 +468,14 @@ shared_examples_for :subscriber do
   
           it "sends notification email with active job queue" do
             expect {
-              test_instance.notify_to(@notifiable, key: @test_key)
+              test_instance.receive_notification_of(@notifiable, key: @test_key)
             }.to change(ActiveJob::Base.queue_adapter.enqueued_jobs, :size).by(1)
           end
         end
 
         context "with send_later false" do
           it "sends notification email now" do
-            test_instance.notify_to(@notifiable, key: @test_key, send_later: false)
+            test_instance.receive_notification_of(@notifiable, key: @test_key, send_later: false)
             expect(ActivityNotification::Mailer.deliveries.size).to eq(1)
           end
         end
@@ -402,12 +488,12 @@ shared_examples_for :subscriber do
         end
 
         it "returns nil" do
-          notification = test_instance.notify_to(@notifiable, key: @test_key)
+          notification = test_instance.receive_notification_of(@notifiable, key: @test_key)
           expect(notification).to be_nil
         end
   
         it "does not create notification records" do
-          test_instance.notify_to(@notifiable, key: @test_key)
+          test_instance.receive_notification_of(@notifiable, key: @test_key)
           expect(test_instance.notifications.unopened_only.count).to eq(0)
         end
       end
@@ -422,7 +508,7 @@ shared_examples_for :subscriber do
           it "does not send notification email later" do
             expect {
               perform_enqueued_jobs do
-                test_instance.notify_to(@notifiable, key: @test_key)
+                test_instance.receive_notification_of(@notifiable, key: @test_key)
               end
             }.to change { ActivityNotification::Mailer.deliveries.size }.by(0)
             expect(ActivityNotification::Mailer.deliveries.size).to eq(0)
@@ -430,14 +516,14 @@ shared_examples_for :subscriber do
   
           it "does not send notification email with active job queue" do
             expect {
-              test_instance.notify_to(@notifiable, key: @test_key)
+              test_instance.receive_notification_of(@notifiable, key: @test_key)
             }.to change(ActiveJob::Base.queue_adapter.enqueued_jobs, :size).by(0)
           end
         end
 
         context "with send_later false" do
           it "does not send notification email now" do
-            test_instance.notify_to(@notifiable, key: @test_key, send_later: false)
+            test_instance.receive_notification_of(@notifiable, key: @test_key, send_later: false)
             expect(ActivityNotification::Mailer.deliveries.size).to eq(0)
           end
         end
@@ -461,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
@@ -483,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)
@@ -520,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
@@ -529,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
@@ -538,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)
@@ -580,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
@@ -589,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
@@ -598,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 })