activity_notification 1.1.0 → 1.2.0

data/spec/concerns/common_spec.rb

@@ -48,12 +48,17 @@ shared_examples_for :common do
       end
 
       context "with Proc" do
-        it "returns specified lambda with context(model)  arguments" do
+        it "returns specified lambda without argument" do
+          test_proc = ->{ 1 }
+          expect(ActivityNotification.resolve_value(test_instance, test_proc)).to eq(1)
+        end
+
+        it "returns specified lambda with context(model) arguments" do
           test_proc = ->(model){ model == test_instance ? 1 : 0 }
           expect(ActivityNotification.resolve_value(test_instance, test_proc)).to eq(1)
         end
 
-        it "returns specified lambda with controller and context(model)  arguments" do
+        it "returns specified lambda with controller and context(model) arguments" 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

data/spec/concerns/models/notifiable_spec.rb

@@ -493,13 +493,99 @@ shared_examples_for :notifiable do
           expect(test_instance.printable_notifiable_name(test_target, 'dummy_key')).to eq('test_printable_name')
         end
 
-        it "returns specified lambda with single target argument" do
-          described_class._printable_notifiable_name[:users] = ->(target){ 'test_printable_name' }
+        it "returns specified lambda with notifiable, target and key argument" do
+          described_class._printable_notifiable_name[:users] = ->(notifiable, target, key){ 'test_printable_name' }
           expect(test_instance.printable_notifiable_name(test_target, 'dummy_key')).to eq('test_printable_name')
         end
       end
     end
 
+    describe "#optional_targets" do
+      require 'custom_optional_targets/console_output'
+
+      context "without any configuration" do
+        it "returns blank array" do
+          expect(test_instance.optional_targets(test_target, 'dummy_key')).to eq([])
+        end
+      end
+
+      context "configured with a field" do
+        before do
+          @optional_target_instance = CustomOptionalTarget::ConsoleOutput.new
+        end
+
+        it "returns specified value" do
+          described_class._optional_targets[:users] = [@optional_target_instance]
+          expect(test_instance.optional_targets(User, 'dummy_key')).to eq([@optional_target_instance])
+        end
+
+        it "returns specified symbol of method" do
+          module AdditionalMethods
+            def custom_optional_targets
+              [ActivityNotification::OptionalTarget::Base.new]
+            end
+          end
+          test_instance.extend(AdditionalMethods)
+          described_class._optional_targets[:users] = :custom_optional_targets
+          expect(test_instance.optional_targets(User, 'dummy_key').size).to  eq(1)
+          expect(test_instance.optional_targets(User, 'dummy_key').first).to be_a(ActivityNotification::OptionalTarget::Base)
+        end
+
+        it "returns specified lambda with no arguments" do
+          described_class._optional_targets[:users] = ->{ [ActivityNotification::OptionalTarget::Base.new] }
+          expect(test_instance.optional_targets(User, 'dummy_key').first).to be_a(ActivityNotification::OptionalTarget::Base)
+        end
+
+        it "returns specified lambda with notifiable and key argument" do
+          described_class._optional_targets[:users] = ->(notifiable, key){ key == 'dummy_key' ? [ActivityNotification::OptionalTarget::Base.new] : [] }
+          expect(test_instance.optional_targets(User)).to eq([])
+          expect(test_instance.optional_targets(User, 'dummy_key').first).to be_a(ActivityNotification::OptionalTarget::Base)
+        end
+      end
+    end
+
+    describe "#optional_target_names" do
+      require 'custom_optional_targets/console_output'
+
+      context "without any configuration" do
+        it "returns blank array" do
+          expect(test_instance.optional_target_names(test_target, 'dummy_key')).to eq([])
+        end
+      end
+
+      context "configured with a field" do
+        before do
+          @optional_target_instance = CustomOptionalTarget::ConsoleOutput.new
+        end
+
+        it "returns specified value" do
+          described_class._optional_targets[:users] = [@optional_target_instance]
+          expect(test_instance.optional_target_names(User, 'dummy_key')).to eq([:console_output])
+        end
+
+        it "returns specified symbol of method" do
+          module AdditionalMethods
+            def custom_optional_targets
+              [ActivityNotification::OptionalTarget::Base.new]
+            end
+          end
+          test_instance.extend(AdditionalMethods)
+          described_class._optional_targets[:users] = :custom_optional_targets
+          expect(test_instance.optional_target_names(User, 'dummy_key')).to eq([:base])
+        end
+
+        it "returns specified lambda with no arguments" do
+          described_class._optional_targets[:users] = ->{ [@optional_target_instance] }
+          expect(test_instance.optional_target_names(User, 'dummy_key')).to eq([:console_output])
+        end
+
+        it "returns specified lambda with notifiable and key argument" do
+          described_class._optional_targets[:users] = ->(notifiable, key){ key == 'dummy_key' ? [@optional_target_instance] : [] }
+          expect(test_instance.optional_target_names(User, 'dummy_key')).to eq([:console_output])
+        end
+      end
+    end
+
     describe "#notify" do
       it "is an alias of ActivityNotification::Notification.notify" do
         expect(ActivityNotification::Notification).to receive(:notify)

data/spec/concerns/models/subscriber_spec.rb

@@ -89,8 +89,8 @@ 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(test_instance.subscriptions.reload.size).to eq(1)
         end
       end
@@ -99,8 +99,8 @@ shared_examples_for :subscriber 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
       end
@@ -109,8 +109,8 @@ shared_examples_for :subscriber 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
@@ -119,8 +119,8 @@ 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
@@ -133,6 +133,47 @@ shared_examples_for :subscriber do
           expect(test_instance.subscriptions.reload).to      be_empty
         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 } }
+          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)
+        end
+      end
+
+      context "with false as optional_targets params" do
+        it "creates a new subscription" do
+          params = { key: 'key_1', optional_targets: { subscribing_to_console_output: false } }
+          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)
+        end
+      end
+
+      context "with true as subscribing and false as optional_targets params" do
+        it "creates a new subscription" do
+          params = { key: 'key_1', subscribing: true, optional_targets: { subscribing_to_console_output: false } }
+          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)
+        end
+      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
+        end
+      end
     end
 
     describe "#subscription_index" do
@@ -446,7 +487,7 @@ shared_examples_for :subscriber do
           context "subscribing to notification" do
             it "returns true" do
               subscription = test_instance.create_subscription(key: @test_key)
-              expect(subscription.subscribing).to be_truthy
+              expect(subscription.subscribing?).to be_truthy
               expect(test_instance.subscribes_to_notification?(@test_key)).to be_truthy
             end
           end
@@ -454,7 +495,7 @@ shared_examples_for :subscriber do
           context "unsubscribed to notification" do
             it "returns false" do
               subscription = test_instance.create_subscription(key: @test_key, subscribing: false)
-              expect(subscription.subscribing).to be_falsey
+              expect(subscription.subscribing?).to be_falsey
               expect(test_instance.subscribes_to_notification?(@test_key)).to be_falsey
             end
           end
@@ -505,15 +546,15 @@ shared_examples_for :subscriber do
           context "subscribing to notification email" do
             it "returns true" do
               subscription = test_instance.create_subscription(key: @test_key)
-              expect(subscription.subscribing_to_email).to be_truthy
+              expect(subscription.subscribing_to_email?).to be_truthy
               expect(test_instance.subscribes_to_notification_email?(@test_key)).to be_truthy
             end
           end
 
-          context "unsubscribed to notification" do
+          context "unsubscribed to notification email" do
             it "returns false" do
               subscription = test_instance.create_subscription(key: @test_key, subscribing: true, subscribing_to_email: false)
-              expect(subscription.subscribing_to_email).to be_falsey
+              expect(subscription.subscribing_to_email?).to be_falsey
               expect(test_instance.subscribes_to_notification_email?(@test_key)).to be_falsey
             end
           end
@@ -521,5 +562,65 @@ shared_examples_for :subscriber do
       end
     end
 
+    describe "#subscribes_to_optional_target?" do
+      before do
+        @test_key             = 'test_key'
+        @optional_target_name = :console_output
+      end
+
+      context "when the subscription is not enabled for the target" do
+        it "returns true" do
+          described_class._notification_subscription_allowed = false
+          expect(test_instance.subscribes_to_optional_target?(@test_key, @optional_target_name)).to be_truthy
+        end
+      end
+
+      context "when the subscription is enabled for the target" do
+        before do
+          described_class._notification_subscription_allowed = true
+        end
+
+        context "without configured subscpriotion" do
+          context "without subscribe_as_default argument" do
+            context "with true as ActivityNotification.config.subscribe_as_default" do
+              it "returns true" do
+                subscribe_as_default = ActivityNotification.config.subscribe_as_default
+                ActivityNotification.config.subscribe_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
+              end
+            end
+
+            context "with false as ActivityNotification.config.subscribe_as_default" do
+              it "returns false" do
+                subscribe_as_default = ActivityNotification.config.subscribe_as_default
+                ActivityNotification.config.subscribe_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
+              end
+            end
+          end
+        end
+
+        context "with configured subscpriotion" 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 })
+              expect(subscription.subscribing_to_optional_target?(@optional_target_name)).to be_truthy
+              expect(test_instance.subscribes_to_optional_target?(@test_key, @optional_target_name)).to be_truthy
+            end
+          end
+
+          context "unsubscribed to the specified optional target" do
+            it "returns false" do
+              subscription = test_instance.create_subscription(key: @test_key, subscribing: true, optional_targets: { ActivityNotification::Subscription.to_optional_target_key(@optional_target_name) => false })
+              expect(subscription.subscribing_to_optional_target?(@optional_target_name)).to be_falsey
+              expect(test_instance.subscribes_to_optional_target?(@test_key, @optional_target_name)).to be_falsey
+            end
+          end
+        end
+      end
+    end
+
   end
 end

data/spec/concerns/models/target_spec.rb

@@ -1113,6 +1113,23 @@ shared_examples_for :target do
         end
       end
     end
+
+    describe "#subscribes_to_optional_target?" do
+      context "when the subscription is not enabled for the target" do
+        it "returns true" do
+          described_class._notification_subscription_allowed = false
+          expect(test_instance.subscribes_to_optional_target?('test_key', :slack)).to be_truthy
+        end
+      end
+
+      context "when the subscription is enabled for the target" do
+        it "calls Subscriber#_subscribes_to_optional_target?" do
+          described_class._notification_subscription_allowed = true
+          expect(test_instance).to receive(:_subscribes_to_optional_target?)
+          test_instance.subscribes_to_optional_target?('test_key', :slack)
+        end
+      end
+    end
   end
 
 end

data/spec/controllers/subscriptions_controller_shared_examples.rb

@@ -220,7 +220,7 @@ shared_examples_for :subscription_controller do
       expect(test_target.subscriptions.size).to      eq(0)
     end
 
-    context "http direct POST request" do
+    context "http direct POST request without optional targets" do
       before do
         post_with_compatibility :create, target_params.merge({
             typed_target_param => test_target,
@@ -245,6 +245,34 @@ shared_examples_for :subscription_controller do
       end
     end
 
+    context "http direct POST request with optional targets" do
+      before do
+        post_with_compatibility :create, target_params.merge({
+            typed_target_param => test_target,
+            "subscription"     => { "key"        => "new_subscription_key",
+                                    "subscribing"=> "true",
+                                    "subscribing_to_email"=>"true",
+                                    "optional_targets" => { "subscribing_to_base1" => "true", "subscribing_to_base2" => "false" }
+                                  }
+          }), valid_session
+      end
+
+      it "returns 302 as http status code" do
+        expect(response.status).to eq(302)
+      end
+
+      it "creates new subscription of the target" do
+        expect(test_target.subscriptions.reload.size).to      eq(1)
+        expect(test_target.subscriptions.reload.first.key).to eq("new_subscription_key")
+        expect(test_target.subscriptions.reload.first.subscribing_to_optional_target?("base1")).to be_truthy
+        expect(test_target.subscriptions.reload.first.subscribing_to_optional_target?("base2")).to be_falsey
+      end
+
+      it "redirects to :index" do
+        expect(response).to redirect_to action: :index
+      end
+    end
+
     context "http POST request from root_path" do
       before do
         request.env["HTTP_REFERER"] = root_path
@@ -403,7 +431,7 @@ shared_examples_for :subscription_controller do
       before do
         @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
         @subscription.unsubscribe
-        expect(@subscription.subscribing).to be_falsey
+        expect(@subscription.subscribing?).to be_falsey
         post_with_compatibility :subscribe, target_params.merge({ id: @subscription, typed_target_param => test_target }), valid_session
       end
 
@@ -412,7 +440,7 @@ shared_examples_for :subscription_controller do
       end
 
       it "updates subscribing to true" do
-        expect(@subscription.reload.subscribing).to be_truthy
+        expect(@subscription.reload.subscribing?).to be_truthy
       end
 
       it "redirects to :index" do
@@ -424,7 +452,7 @@ shared_examples_for :subscription_controller do
       before do
         @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
         @subscription.unsubscribe
-        expect(@subscription.subscribing).to be_falsey
+        expect(@subscription.subscribing?).to be_falsey
         request.env["HTTP_REFERER"] = root_path
         post_with_compatibility :subscribe, target_params.merge({ id: @subscription, typed_target_param => test_target }), valid_session
       end
@@ -434,7 +462,7 @@ shared_examples_for :subscription_controller do
       end
 
       it "updates subscribing to true" do
-        expect(@subscription.reload.subscribing).to be_truthy
+        expect(@subscription.reload.subscribing?).to be_truthy
       end
 
       it "redirects to root_path as request.referer" do
@@ -446,7 +474,7 @@ shared_examples_for :subscription_controller do
       before do
         @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
         @subscription.unsubscribe
-        expect(@subscription.subscribing).to be_falsey
+        expect(@subscription.subscribing?).to be_falsey
         request.env["HTTP_REFERER"] = root_path
         xhr_with_compatibility :post, :subscribe, target_params.merge({ id: @subscription, typed_target_param => test_target }), valid_session
       end
@@ -460,7 +488,7 @@ shared_examples_for :subscription_controller do
       end
 
       it "updates subscribing to true" do
-        expect(@subscription.reload.subscribing).to be_truthy
+        expect(@subscription.reload.subscribing?).to be_truthy
       end
 
       it "renders the :open template as format js" do
@@ -473,7 +501,7 @@ shared_examples_for :subscription_controller do
     context "http direct POST request" do
       before do
         @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
-        expect(@subscription.subscribing).to be_truthy
+        expect(@subscription.subscribing?).to be_truthy
         post_with_compatibility :unsubscribe, target_params.merge({ id: @subscription, typed_target_param => test_target }), valid_session
       end
 
@@ -482,7 +510,7 @@ shared_examples_for :subscription_controller do
       end
 
       it "updates subscribing to false" do
-        expect(@subscription.reload.subscribing).to be_falsey
+        expect(@subscription.reload.subscribing?).to be_falsey
       end
 
       it "redirects to :index" do
@@ -493,7 +521,7 @@ shared_examples_for :subscription_controller do
     context "http POST request from root_path" do
       before do
         @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
-        expect(@subscription.subscribing).to be_truthy
+        expect(@subscription.subscribing?).to be_truthy
         request.env["HTTP_REFERER"] = root_path
         post_with_compatibility :unsubscribe, target_params.merge({ id: @subscription, typed_target_param => test_target }), valid_session
       end
@@ -503,7 +531,7 @@ shared_examples_for :subscription_controller do
       end
 
       it "updates subscribing to false" do
-        expect(@subscription.reload.subscribing).to be_falsey
+        expect(@subscription.reload.subscribing?).to be_falsey
       end
 
       it "redirects to root_path as request.referer" do
@@ -514,7 +542,7 @@ shared_examples_for :subscription_controller do
     context "Ajax POST request" do
       before do
         @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
-        expect(@subscription.subscribing).to be_truthy
+        expect(@subscription.subscribing?).to be_truthy
         request.env["HTTP_REFERER"] = root_path
         xhr_with_compatibility :post, :unsubscribe, target_params.merge({ id: @subscription, typed_target_param => test_target }), valid_session
       end
@@ -528,7 +556,7 @@ shared_examples_for :subscription_controller do
       end
 
       it "updates subscribing to false" do
-        expect(@subscription.reload.subscribing).to be_falsey
+        expect(@subscription.reload.subscribing?).to be_falsey
       end
 
       it "renders the :open template as format js" do
@@ -542,7 +570,7 @@ shared_examples_for :subscription_controller do
       before do
         @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
         @subscription.unsubscribe_to_email
-        expect(@subscription.subscribing_to_email).to be_falsey
+        expect(@subscription.subscribing_to_email?).to be_falsey
         post_with_compatibility :subscribe_to_email, target_params.merge({ id: @subscription, typed_target_param => test_target }), valid_session
       end
 
@@ -551,7 +579,7 @@ shared_examples_for :subscription_controller do
       end
 
       it "updates subscribing_to_email to true" do
-        expect(@subscription.reload.subscribing_to_email).to be_truthy
+        expect(@subscription.reload.subscribing_to_email?).to be_truthy
       end
 
       it "redirects to :index" do
@@ -563,7 +591,7 @@ shared_examples_for :subscription_controller do
       before do
         @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
         @subscription.unsubscribe_to_email
-        expect(@subscription.subscribing_to_email).to be_falsey
+        expect(@subscription.subscribing_to_email?).to be_falsey
         request.env["HTTP_REFERER"] = root_path
         post_with_compatibility :subscribe_to_email, target_params.merge({ id: @subscription, typed_target_param => test_target }), valid_session
       end
@@ -573,7 +601,7 @@ shared_examples_for :subscription_controller do
       end
 
       it "updates subscribing_to_email to true" do
-        expect(@subscription.reload.subscribing_to_email).to be_truthy
+        expect(@subscription.reload.subscribing_to_email?).to be_truthy
       end
 
       it "redirects to root_path as request.referer" do
@@ -585,7 +613,7 @@ shared_examples_for :subscription_controller do
       before do
         @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
         @subscription.unsubscribe_to_email
-        expect(@subscription.subscribing_to_email).to be_falsey
+        expect(@subscription.subscribing_to_email?).to be_falsey
         request.env["HTTP_REFERER"] = root_path
         xhr_with_compatibility :post, :subscribe_to_email, target_params.merge({ id: @subscription, typed_target_param => test_target }), valid_session
       end
@@ -599,7 +627,7 @@ shared_examples_for :subscription_controller do
       end
 
       it "updates subscribing_to_email to true" do
-        expect(@subscription.reload.subscribing_to_email).to be_truthy
+        expect(@subscription.reload.subscribing_to_email?).to be_truthy
       end
 
       it "renders the :open template as format js" do
@@ -611,8 +639,8 @@ shared_examples_for :subscription_controller do
       before do
         @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
         @subscription.unsubscribe
-        expect(@subscription.subscribing).to be_falsey
-        expect(@subscription.subscribing_to_email).to be_falsey
+        expect(@subscription.subscribing?).to be_falsey
+        expect(@subscription.subscribing_to_email?).to be_falsey
         post_with_compatibility :subscribe_to_email, target_params.merge({ id: @subscription, typed_target_param => test_target }), valid_session
       end
 
@@ -621,7 +649,7 @@ shared_examples_for :subscription_controller do
       end
 
       it "cannot update subscribing_to_email to true" do
-        expect(@subscription.reload.subscribing_to_email).to be_falsey
+        expect(@subscription.reload.subscribing_to_email?).to be_falsey
       end
 
       it "redirects to :index" do
@@ -634,7 +662,7 @@ shared_examples_for :subscription_controller do
     context "http direct POST request" do
       before do
         @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
-        expect(@subscription.subscribing_to_email).to be_truthy
+        expect(@subscription.subscribing_to_email?).to be_truthy
         post_with_compatibility :unsubscribe_to_email, target_params.merge({ id: @subscription, typed_target_param => test_target }), valid_session
       end
 
@@ -643,7 +671,7 @@ shared_examples_for :subscription_controller do
       end
 
       it "updates subscribing_to_email to false" do
-        expect(@subscription.reload.subscribing_to_email).to be_falsey
+        expect(@subscription.reload.subscribing_to_email?).to be_falsey
       end
 
       it "redirects to :index" do
@@ -654,7 +682,7 @@ shared_examples_for :subscription_controller do
     context "http POST request from root_path" do
       before do
         @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
-        expect(@subscription.subscribing_to_email).to be_truthy
+        expect(@subscription.subscribing_to_email?).to be_truthy
         request.env["HTTP_REFERER"] = root_path
         post_with_compatibility :unsubscribe_to_email, target_params.merge({ id: @subscription, typed_target_param => test_target }), valid_session
       end
@@ -664,7 +692,7 @@ shared_examples_for :subscription_controller do
       end
 
       it "updates subscribing_to_email to false" do
-        expect(@subscription.reload.subscribing_to_email).to be_falsey
+        expect(@subscription.reload.subscribing_to_email?).to be_falsey
       end
 
       it "redirects to root_path as request.referer" do
@@ -675,7 +703,7 @@ shared_examples_for :subscription_controller do
     context "Ajax POST request" do
       before do
         @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
-        expect(@subscription.subscribing_to_email).to be_truthy
+        expect(@subscription.subscribing_to_email?).to be_truthy
         request.env["HTTP_REFERER"] = root_path
         xhr_with_compatibility :post, :unsubscribe_to_email, target_params.merge({ id: @subscription, typed_target_param => test_target }), valid_session
       end
@@ -689,7 +717,7 @@ shared_examples_for :subscription_controller do
       end
 
       it "updates subscribing_to_email to false" do
-        expect(@subscription.reload.subscribing_to_email).to be_falsey
+        expect(@subscription.reload.subscribing_to_email?).to be_falsey
       end
 
       it "renders the :open template as format js" do
@@ -698,6 +726,201 @@ shared_examples_for :subscription_controller do
     end
   end
 
+  describe "POST #subscribe_to_optional_target" do
+    context "without optional_target_name param" do
+      before do
+        @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
+        @subscription.unsubscribe_to_optional_target(:base)
+        expect(@subscription.subscribing_to_optional_target?(:base)).to be_falsey
+        post_with_compatibility :subscribe_to_optional_target, target_params.merge({ id: @subscription, typed_target_param => test_target }), valid_session
+      end
+
+      it "returns 400 as http status code" do
+        expect(response.status).to eq(400)
+      end
+
+      it "does not update subscribing_to_optional_target?" do
+        expect(@subscription.subscribing_to_optional_target?(:base)).to be_falsey
+      end
+    end
+
+    context "http direct POST request" do
+      before do
+        @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
+        @subscription.unsubscribe_to_optional_target(:base)
+        expect(@subscription.subscribing_to_optional_target?(:base)).to be_falsey
+        post_with_compatibility :subscribe_to_optional_target, target_params.merge({ id: @subscription, optional_target_name: 'base', typed_target_param => test_target }), valid_session
+      end
+
+      it "returns 302 as http status code" do
+        expect(response.status).to eq(302)
+      end
+
+      it "updates subscribing_to_optional_target to true" do
+        expect(@subscription.reload.subscribing_to_optional_target?(:base)).to be_truthy
+      end
+
+      it "redirects to :index" do
+        expect(response).to redirect_to action: :index
+      end
+    end
+
+    context "http POST request from root_path" do
+      before do
+        @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
+        @subscription.unsubscribe_to_optional_target(:base)
+        expect(@subscription.subscribing_to_optional_target?(:base)).to be_falsey
+        request.env["HTTP_REFERER"] = root_path
+        post_with_compatibility :subscribe_to_optional_target, target_params.merge({ id: @subscription, optional_target_name: 'base', typed_target_param => test_target }), valid_session
+      end
+
+      it "returns 302 as http status code" do
+        expect(response.status).to eq(302)
+      end
+
+      it "updates subscribing_to_optional_target to true" do
+        expect(@subscription.reload.subscribing_to_optional_target?(:base)).to be_truthy
+      end
+
+      it "redirects to root_path as request.referer" do
+        expect(response).to redirect_to root_path
+      end
+    end
+
+    context "Ajax POST request" do
+      before do
+        @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
+        @subscription.unsubscribe_to_optional_target(:base)
+        expect(@subscription.subscribing_to_optional_target?(:base)).to be_falsey
+        request.env["HTTP_REFERER"] = root_path
+        xhr_with_compatibility :post, :subscribe_to_optional_target, target_params.merge({ id: @subscription, optional_target_name: 'base', typed_target_param => test_target }), valid_session
+      end
+  
+      it "returns 200 as http status code" do
+        expect(response.status).to eq(200)
+      end
+  
+      it "assigns subscription index as @subscriptions" do
+        expect(assigns(:subscriptions)).to eq([@subscription])
+      end
+
+      it "updates subscribing_to_optional_target to true" do
+        expect(@subscription.reload.subscribing_to_optional_target?(:base)).to be_truthy
+      end
+
+      it "renders the :open template as format js" do
+        expect(response).to render_template :subscribe_to_optional_target, format: :js
+      end
+    end
+
+    context "with unsubscribed target" do
+      before do
+        @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
+        @subscription.unsubscribe_to_optional_target(:base)
+        @subscription.unsubscribe
+        expect(@subscription.subscribing?).to be_falsey
+        expect(@subscription.subscribing_to_optional_target?(:base)).to be_falsey
+        post_with_compatibility :subscribe_to_optional_target, target_params.merge({ id: @subscription, optional_target_name: 'base', typed_target_param => test_target }), valid_session
+      end
+
+      it "returns 302 as http status code" do
+        expect(response.status).to eq(302)
+      end
+
+      it "cannot update subscribing_to_optional_target to true" do
+        expect(@subscription.reload.subscribing_to_optional_target?(:base)).to be_falsey
+      end
+
+      it "redirects to :index" do
+        expect(response).to redirect_to action: :index
+      end
+    end
+  end
+
+  describe "POST #unsubscribe_to_email" do
+    context "without optional_target_name param" do
+      before do
+        @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
+        expect(@subscription.subscribing_to_optional_target?(:base)).to be_truthy
+        post_with_compatibility :unsubscribe_to_optional_target, target_params.merge({ id: @subscription, typed_target_param => test_target }), valid_session
+      end
+
+      it "returns 400 as http status code" do
+        expect(response.status).to eq(400)
+      end
+
+      it "does not update subscribing_to_optional_target?" do
+        expect(@subscription.subscribing_to_optional_target?(:base)).to be_truthy
+      end
+    end
+
+    context "http direct POST request" do
+      before do
+        @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
+        expect(@subscription.subscribing_to_optional_target?(:base)).to be_truthy
+        post_with_compatibility :unsubscribe_to_optional_target, target_params.merge({ id: @subscription, optional_target_name: 'base', typed_target_param => test_target }), valid_session
+      end
+
+      it "returns 302 as http status code" do
+        expect(response.status).to eq(302)
+      end
+
+      it "updates subscribing_to_optional_target to false" do
+        expect(@subscription.reload.subscribing_to_optional_target?(:base)).to be_falsey
+      end
+
+      it "redirects to :index" do
+        expect(response).to redirect_to action: :index
+      end
+    end
+
+    context "http POST request from root_path" do
+      before do
+        @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
+        expect(@subscription.subscribing_to_optional_target?(:base)).to be_truthy
+        request.env["HTTP_REFERER"] = root_path
+        post_with_compatibility :unsubscribe_to_optional_target, target_params.merge({ id: @subscription, optional_target_name: 'base', typed_target_param => test_target }), valid_session
+      end
+
+      it "returns 302 as http status code" do
+        expect(response.status).to eq(302)
+      end
+
+      it "updates subscribing_to_optional_target to false" do
+        expect(@subscription.reload.subscribing_to_optional_target?(:base)).to be_falsey
+      end
+
+      it "redirects to root_path as request.referer" do
+        expect(response).to redirect_to root_path
+      end
+    end
+
+    context "Ajax POST request" do
+      before do
+        @subscription = create(:subscription, target: test_target, key: 'test_subscription_key')
+        expect(@subscription.subscribing_to_optional_target?(:base)).to be_truthy
+        request.env["HTTP_REFERER"] = root_path
+        xhr_with_compatibility :post, :unsubscribe_to_optional_target, target_params.merge({ id: @subscription, optional_target_name: 'base', typed_target_param => test_target }), valid_session
+      end
+  
+      it "returns 200 as http status code" do
+        expect(response.status).to eq(200)
+      end
+  
+      it "assigns subscription index as @subscriptions" do
+        expect(assigns(:subscriptions)).to eq([@subscription])
+      end
+
+      it "updates subscribing_to_optional_target to false" do
+        expect(@subscription.reload.subscribing_to_optional_target?(:base)).to be_falsey
+      end
+
+      it "renders the :open template as format js" do
+        expect(response).to render_template :unsubscribe_to_optional_target, format: :js
+      end
+    end
+  end
+
 
   private