activity_notification 2.1.4 → 2.2.0

data/spec/channels/notification_channel_spec.rb

@@ -1,50 +1,48 @@
-if Rails::VERSION::MAJOR >= 5
-  require 'channels/notification_channel_shared_examples'
-
-  # @See https://github.com/palkan/action-cable-testing
-  describe ActivityNotification::NotificationChannel, type: :channel do
-    let(:test_target)        { create(:user) }
-    let(:target_type)        { "User" }
-    let(:typed_target_param) { "user_id" }
-    let(:extra_params)       { {} }
-
-    context "when target.notification_action_cable_with_devise? returns true" do
-      before do
-        @user_notification_action_cable_with_devise = User._notification_action_cable_with_devise
-        User._notification_action_cable_with_devise = true
-      end
-
-      after do
-        User._notification_action_cable_with_devise = @user_notification_action_cable_with_devise
-      end
-
-      it "rejects subscription even if target_type and target_id parameters are passed" do
-        subscribe({ target_type: target_type, target_id: test_target.id })
-        expect(subscription).to be_rejected
-        expect {
-          expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
-        }.to raise_error(/Must be subscribed!/)
-      end
+require 'channels/notification_channel_shared_examples'
+
+# @See https://github.com/palkan/action-cable-testing
+describe ActivityNotification::NotificationChannel, type: :channel do
+  let(:test_target)        { create(:user) }
+  let(:target_type)        { "User" }
+  let(:typed_target_param) { "user_id" }
+  let(:extra_params)       { {} }
+
+  context "when target.notification_action_cable_with_devise? returns true" do
+    before do
+      @user_notification_action_cable_with_devise = User._notification_action_cable_with_devise
+      User._notification_action_cable_with_devise = true
     end
 
-    context "when target.notification_action_cable_with_devise? returns false" do
-      before do
-        @user_notification_action_cable_with_devise = User._notification_action_cable_with_devise
-        User._notification_action_cable_with_devise = false
-      end
-
-      after do
-        User._notification_action_cable_with_devise = @user_notification_action_cable_with_devise
-      end
+    after do
+      User._notification_action_cable_with_devise = @user_notification_action_cable_with_devise
+    end
 
-      it "successfully subscribes with target_type and target_id parameters" do
-        subscribe({ target_type: target_type, target_id: test_target.id })
-        expect(subscription).to be_confirmed
+    it "rejects subscription even if target_type and target_id parameters are passed" do
+      subscribe({ target_type: target_type, target_id: test_target.id })
+      expect(subscription).to be_rejected
+      expect {
         expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
-        expect(subscription).to have_stream_from("activity_notification_channel_User##{test_target.id}")
-      end
+      }.to raise_error(/Must be subscribed!/)
+    end
+  end
 
-      it_behaves_like :notification_channel
+  context "when target.notification_action_cable_with_devise? returns false" do
+    before do
+      @user_notification_action_cable_with_devise = User._notification_action_cable_with_devise
+      User._notification_action_cable_with_devise = false
     end
+
+    after do
+      User._notification_action_cable_with_devise = @user_notification_action_cable_with_devise
+    end
+
+    it "successfully subscribes with target_type and target_id parameters" do
+      subscribe({ target_type: target_type, target_id: test_target.id })
+      expect(subscription).to be_confirmed
+      expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
+      expect(subscription).to have_stream_from("activity_notification_channel_User##{test_target.id}")
+    end
+
+    it_behaves_like :notification_channel
   end
-end
+end

data/spec/channels/notification_with_devise_channel_spec.rb

@@ -1,99 +1,97 @@
-if Rails::VERSION::MAJOR >= 5
-  require 'channels/notification_channel_shared_examples'
+require 'channels/notification_channel_shared_examples'
 
-  #TODO Make it more smart test method
-  module ActivityNotification
-    module Test
-      class NotificationWithDeviseChannel < ::ActivityNotification::NotificationWithDeviseChannel
-        @@custom_current_target = nil
-
-        def set_custom_current_target(custom_current_target)
-          @@custom_current_target = custom_current_target
-        end
-
-        def find_current_target(devise_type = nil)
-          super(devise_type)
-        rescue NoMethodError
-          devise_type = (devise_type || @target.notification_devise_resource.class.name).to_s
-          @@custom_current_target.is_a?(devise_type.to_model_class) ? @@custom_current_target : nil
-        end
+#TODO Make it more smart test method
+module ActivityNotification
+  module Test
+    class NotificationWithDeviseChannel < ::ActivityNotification::NotificationWithDeviseChannel
+      @@custom_current_target = nil
+
+      def set_custom_current_target(custom_current_target)
+        @@custom_current_target = custom_current_target
+      end
+
+      def find_current_target(devise_type = nil)
+        super(devise_type)
+      rescue NoMethodError
+        devise_type = (devise_type || @target.notification_devise_resource.class.name).to_s
+        @@custom_current_target.is_a?(devise_type.to_model_class) ? @@custom_current_target : nil
       end
     end
   end
+end
 
-  # @See https://github.com/palkan/action-cable-testing
-  describe ActivityNotification::Test::NotificationWithDeviseChannel, type: :channel do
-    let(:test_user)            { create(:confirmed_user) }
-    let(:unauthenticated_user) { create(:confirmed_user) }
-    let(:test_target)          { create(:admin, user: test_user) }
-    let(:target_type)          { "Admin" }
-    let(:typed_target_param)   { "admin_id" }
-    let(:extra_params)         { { devise_type: :users } }
-    let(:valid_session)        {}
-
-    #TODO Make it more smart test method
-    #include Devise::Test::IntegrationHelpers
-    def sign_in(current_target)
-      described_class.new(ActionCable::Channel::ConnectionStub.new, {}).set_custom_current_target(current_target)
-    end
+# @See https://github.com/palkan/action-cable-testing
+describe ActivityNotification::Test::NotificationWithDeviseChannel, type: :channel do
+  let(:test_user)            { create(:confirmed_user) }
+  let(:unauthenticated_user) { create(:confirmed_user) }
+  let(:test_target)          { create(:admin, user: test_user) }
+  let(:target_type)          { "Admin" }
+  let(:typed_target_param)   { "admin_id" }
+  let(:extra_params)         { { devise_type: :users } }
+  let(:valid_session)        {}
 
-    before do
-      @user_notification_action_cable_with_devise = User._notification_action_cable_with_devise
-      User._notification_action_cable_with_devise = true
-    end
+  #TODO Make it more smart test method
+  #include Devise::Test::IntegrationHelpers
+  def sign_in(current_target)
+    described_class.new(ActionCable::Channel::ConnectionStub.new, {}).set_custom_current_target(current_target)
+  end
 
-    after do
-      User._notification_action_cable_with_devise = @user_notification_action_cable_with_devise
-    end
+  before do
+    @user_notification_action_cable_with_devise = User._notification_action_cable_with_devise
+    User._notification_action_cable_with_devise = true
+  end
 
-    context "signed in with devise as authenticated user" do
-      before do
-        sign_in test_user
-      end
-    
-      it_behaves_like :notification_channel
+  after do
+    User._notification_action_cable_with_devise = @user_notification_action_cable_with_devise
+  end
+
+  context "signed in with devise as authenticated user" do
+    before do
+      sign_in test_user
     end
+  
+    it_behaves_like :notification_channel
+  end
 
-    context "signed in with devise as unauthenticated user" do
-      let(:target_params) { { target_type: target_type, devise_type: :users } }
+  context "signed in with devise as unauthenticated user" do
+    let(:target_params) { { target_type: target_type, devise_type: :users } }
 
-      before do
-        sign_in unauthenticated_user
-      end
+    before do
+      sign_in unauthenticated_user
+    end
 
-      it "rejects subscription" do
-        subscribe(target_params.merge({ typed_target_param => test_target }))
-        expect(subscription).to be_rejected
-        expect {
-          expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
-        }.to raise_error(/Must be subscribed!/)
-      end
+    it "rejects subscription" do
+      subscribe(target_params.merge({ typed_target_param => test_target }))
+      expect(subscription).to be_rejected
+      expect {
+        expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
+      }.to raise_error(/Must be subscribed!/)
     end
+  end
 
-    context "unsigned in with devise" do
-      let(:target_params) { { target_type: target_type, devise_type: :users } }
+  context "unsigned in with devise" do
+    let(:target_params) { { target_type: target_type, devise_type: :users } }
 
-      it "rejects subscription" do
-        subscribe(target_params.merge({ typed_target_param => test_target }))
-        expect(subscription).to be_rejected
-        expect {
-          expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
-        }.to raise_error(/Must be subscribed!/)
-      end
+    it "rejects subscription" do
+      subscribe(target_params.merge({ typed_target_param => test_target }))
+      expect(subscription).to be_rejected
+      expect {
+        expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
+      }.to raise_error(/Must be subscribed!/)
     end
+  end
 
-    context "without target_id and (typed_target)_id parameters for devise integrated channel with devise_type option" do
-      let(:target_params) { { target_type: target_type, devise_type: :users } }
+  context "without target_id and (typed_target)_id parameters for devise integrated channel with devise_type option" do
+    let(:target_params) { { target_type: target_type, devise_type: :users } }
 
-      before do
-        sign_in test_target.user
-      end
+    before do
+      sign_in test_target.user
+    end
 
-      it "successfully subscribes" do
-        subscribe(target_params)
-        expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
-        expect(subscription).to have_stream_from("activity_notification_channel_Admin##{test_target.id}")
-      end
+    it "successfully subscribes" do
+      subscribe(target_params)
+      expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
+      expect(subscription).to have_stream_from("activity_notification_channel_Admin##{test_target.id}")
     end
   end
 end

data/spec/concerns/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/target_spec.rb

@@ -490,20 +490,18 @@ shared_examples_for :target do
       end
     end
 
-    if Rails::VERSION::MAJOR >= 5
-      describe "#notification_action_cable_channel_class_name" do
-        context "when custom_notification_action_cable_with_devise? returns true" do
-          it "returns ActivityNotification::NotificationWithDeviseChannel" do
-            described_class._notification_action_cable_with_devise = true
-            expect(test_instance.notification_action_cable_channel_class_name).to eq(ActivityNotification::NotificationWithDeviseChannel.name)
-          end
+    describe "#notification_action_cable_channel_class_name" do
+      context "when custom_notification_action_cable_with_devise? returns true" do
+        it "returns ActivityNotification::NotificationWithDeviseChannel" do
+          described_class._notification_action_cable_with_devise = true
+          expect(test_instance.notification_action_cable_channel_class_name).to eq(ActivityNotification::NotificationWithDeviseChannel.name)
         end
+      end
 
-        context "when custom_notification_action_cable_with_devise? returns false" do
-          it "returns ActivityNotification::NotificationChannel" do
-            described_class._notification_action_cable_with_devise = false
-            expect(test_instance.notification_action_cable_channel_class_name).to eq(ActivityNotification::NotificationChannel.name)
-          end
+      context "when custom_notification_action_cable_with_devise? returns false" do
+        it "returns ActivityNotification::NotificationChannel" do
+          described_class._notification_action_cable_with_devise = false
+          expect(test_instance.notification_action_cable_channel_class_name).to eq(ActivityNotification::NotificationChannel.name)
         end
       end
     end

data/spec/concerns/renderable_spec.rb

@@ -32,7 +32,7 @@ shared_examples_for :renderable do
       expect(I18n.t("notification.#{target_type_key}.#{params_text_key}.text"))
         .to eq(params_text_original)
       expect(I18n.t("notification.#{target_type_key}.#{params_text_key}.text",
-        {article_title: article_title}))
+        article_title: article_title))
         .to eq(params_text_embedded)
     end
 
@@ -40,7 +40,7 @@ shared_examples_for :renderable do
       expect(I18n.t("notification.#{target_type_key}.#{group_text_key}.text"))
         .to eq(group_text_original)
       expect(I18n.t("notification.#{target_type_key}.#{group_text_key}.text",
-        {notifier_name: notifier_name, group_member_count: group_member_count, group_notification_count: group_notification_count}))
+        **{ notifier_name: notifier_name, group_member_count: group_member_count, group_notification_count: group_notification_count }))
         .to eq(group_text_embedded)
     end
 
@@ -50,10 +50,10 @@ shared_examples_for :renderable do
       expect(I18n.t("notification.#{target_type_key}.#{plural_text_key}.text")[:other])
         .to eq(plural_text_original_other)
       expect(I18n.t("notification.#{target_type_key}.#{plural_text_key}.text",
-        {article_title: article_title, notifier_name: notifier_name, count: 1}))
+        **{ article_title: article_title, notifier_name: notifier_name, count: 1 }))
         .to eq(plural_text_embedded_one)
       expect(I18n.t("notification.#{target_type_key}.#{plural_text_key}.text",
-        {article_title: article_title, notifier_name: notifier_name, count: group_notification_count}))
+        **{ article_title: article_title, notifier_name: notifier_name, count: group_notification_count }))
         .to eq(plural_text_embedded_other)
     end
   end
@@ -126,4 +126,4 @@ shared_examples_for :renderable do
     # #layout_path
 
   end
-end
+end

data/spec/controllers/controller_spec_utility.rb

@@ -2,43 +2,23 @@ module ActivityNotification
   module ControllerSpec
     module RequestUtility
       def get_with_compatibility action, params, session
-        if Rails::VERSION::MAJOR <= 4
-          get action, params, session
-        else
-          get action, params: params, session: session
-        end
+        get action, params: params, session: session
       end
 
       def post_with_compatibility action, params, session
-        if Rails::VERSION::MAJOR <= 4
-          post action, params, session
-        else
-          post action, params: params, session: session
-        end
+        post action, params: params, session: session
       end
 
       def put_with_compatibility action, params, session
-        if Rails::VERSION::MAJOR <= 4
-          put action, params, session
-        else
-          put action, params: params, session: session
-        end
+        put action, params: params, session: session
       end
 
       def delete_with_compatibility action, params, session
-        if Rails::VERSION::MAJOR <= 4
-          delete action, params, session
-        else
-          delete action, params: params, session: session
-        end
+        delete action, params: params, session: session
       end
 
       def xhr_with_compatibility method, action, params, session
-        if Rails::VERSION::MAJOR <= 4
-          xhr method, action, params, session
-        else
-          send method.to_s, action, xhr: true, params: params, session: session
-        end
+        send method.to_s, action, xhr: true, params: params, session: session
       end
     end
 
@@ -76,53 +56,37 @@ module ActivityNotification
         def api_path
           "/#{root_path}/#{target_type}/#{test_target.id}"
         end
-  
+
         def schema_path
-          Rails.root.join('..', 'openapi.json') 
+          Rails.root.join('..', 'openapi.json')
         end
-  
+
         def write_schema_file(schema_json)
           File.open(schema_path, "w") { |file| file.write(schema_json) }
         end
-  
+
         def read_schema_file
           JSON.parse(File.read(schema_path))
         end
 
         def committee_options
-          @committee_options ||= { schema: Committee::Drivers::load_from_file(schema_path), prefix: root_path, validate_success_only: true }
+          @committee_options ||= { schema: Committee::Drivers::load_from_file(schema_path), prefix: root_path, validate_success_only: true, parse_response_by_content_type: false }
         end
 
         def get_with_compatibility path, options = {}
-          if Rails::VERSION::MAJOR <= 4
-            get path, options[:params], options[:headers]
-          else
-            get path, options
-          end
+          get path, **options
         end
 
         def post_with_compatibility path, options = {}
-          if Rails::VERSION::MAJOR <= 4
-            post path, options[:params], options[:headers]
-          else
-            post path, options
-          end
+          post path, **options
         end
 
         def put_with_compatibility path, options = {}
-          if Rails::VERSION::MAJOR <= 4
-            put path, options[:params], options[:headers]
-          else
-            put path, options
-          end
+          put path, **options
         end
 
         def delete_with_compatibility path, options = {}
-          if Rails::VERSION::MAJOR <= 4
-            delete path, options[:params], options[:headers]
-          else
-            delete path, options
-          end
+          delete path, **options
         end
 
         def assert_all_schema_confirm(response, status)
@@ -133,4 +97,4 @@ module ActivityNotification
       end
     end
   end
-end
+end