activity_notification 2.0.0 → 2.1.4

data/spec/controllers/subscriptions_controller_spec.rb

@@ -7,6 +7,5 @@ describe ActivityNotification::SubscriptionsController, type: :controller do
   let(:extra_params)       { {} }
   let(:valid_session)      {}
 
-  it_behaves_like :subscription_controller
-
+  it_behaves_like :subscriptions_controller
 end

data/spec/controllers/subscriptions_with_devise_controller_spec.rb

@@ -1,6 +1,8 @@
 require 'controllers/subscriptions_controller_shared_examples'
 
 describe ActivityNotification::SubscriptionsWithDeviseController, type: :controller do
+  include ActivityNotification::ControllerSpec::RequestUtility
+
   let(:test_user)            { create(:confirmed_user) }
   let(:unauthenticated_user) { create(:confirmed_user) }
   let(:test_target)          { create(:admin, user: test_user) }
@@ -14,7 +16,7 @@ describe ActivityNotification::SubscriptionsWithDeviseController, type: :control
       sign_in test_user
     end
   
-    it_behaves_like :subscription_controller
+    it_behaves_like :subscriptions_controller
   end
 
   context "signed in with devise as unauthenticated user" do
@@ -92,15 +94,4 @@ describe ActivityNotification::SubscriptionsWithDeviseController, type: :control
       end
     end
   end
-
-  private
-
-    def get_with_compatibility action, params, session
-      if Rails::VERSION::MAJOR <= 4
-        get action, params, session
-      else
-        get action, params: params, session: session
-      end
-    end
-
 end

data/spec/helpers/view_helpers_spec.rb

@@ -72,9 +72,9 @@ describe ActivityNotification::ViewHelpers, type: :helper do
 
       it "interpolates from parameters" do
         notification.parameters = { "article_title" => "custom title" }
-        notification.key = 'article.update'
+        notification.key = 'article.destroy'
         expect(render_notification notification, fallback: :text)
-          .to eq("Article custom title has been updated")
+          .to eq('The author removed an article "custom title"')
       end
     end
 
@@ -113,6 +113,7 @@ describe ActivityNotification::ViewHelpers, type: :helper do
         expect(self).to receive(:render).with({
           layout:  'layouts/test',
           partial: 'activity_notification/notifications/default/custom/test',
+          assigns: {},
           locals:  notification.prepare_locals({ layout: 'test' })
         })
         render_notification notification, layout: 'test'
@@ -170,16 +171,8 @@ describe ActivityNotification::ViewHelpers, type: :helper do
         @target = target_user
       end
 
-      #TODO make better test using content_for
       it "renders custom notification view for specified target" do
-        # notification_1 = target_user.notifications.first
-        # notification_2 = target_user.notifications.last
-        # notification_1.update(key: 'custom.test')
-        # notification_2.update(key: 'custom.test')
-        expect(render_notification_of target_user, partial: 'custom_index', fallback: :default)
-          .to eq("Custom index: ")
-          # .to eq("Custom index: Custom template root for user target: #{notification_1.id}"\
-                               # "Custom template root for user target: #{notification_2.id}")
+        expect(render_notification_of target_user, partial: 'custom_index', fallback: :default).to eq("Custom index: ")
       end
 
       it "uses layout of layout parameter" do

data/spec/mailers/mailer_spec.rb

@@ -102,6 +102,47 @@ describe ActivityNotification::Mailer do
         end
       end
 
+      context "with defined overriding_notification_email_from in notifiable model" do
+        it "sends with updated from" do
+          module AdditionalMethods
+            def overriding_notification_email_from(target, key)
+              'test05@example.com'
+            end
+          end
+          notification.notifiable.extend(AdditionalMethods)
+          ActivityNotification::Mailer.send_notification_email(notification).deliver_now
+          expect(ActivityNotification::Mailer.deliveries.last.from.first)
+            .to eq('test05@example.com')
+        end
+      end
+
+      context "with defined overriding_notification_email_reply_to in notifiable model" do
+        it "sends with updated reply_to" do
+          module AdditionalMethods
+            def overriding_notification_email_reply_to(target, key)
+              'test06@example.com'
+            end
+          end
+          notification.notifiable.extend(AdditionalMethods)
+          ActivityNotification::Mailer.send_notification_email(notification).deliver_now
+          expect(ActivityNotification::Mailer.deliveries.last.reply_to.first)
+            .to eq('test06@example.com')
+        end
+      end
+
+      context "with defined overriding_notification_email_message_id in notifiable model" do
+        it "sends with specific message id" do
+          module AdditionalMethods
+            def overriding_notification_email_message_id(target, key)
+              "https://www.example.com/test@example.com/"
+            end
+          end
+          notification.notifiable.extend(AdditionalMethods)
+          ActivityNotification::Mailer.send_notification_email(notification).deliver_now
+          expect(ActivityNotification::Mailer.deliveries.last.message_id)
+            .to eq("https://www.example.com/test@example.com/")
+        end
+      end
       context "when fallback option is :none and the template is missing" do
         it "raise ActionView::MissingTemplate" do
           expect { ActivityNotification::Mailer.send_notification_email(notification, fallback: :none).deliver_now }

data/spec/models/notification_spec.rb

@@ -56,6 +56,23 @@ describe ActivityNotification::Notification, type: :model do
       notification = create(:notification, notifier: notifier)
       expect(notification.reload.notifier).to eq(notifier)
     end
+
+    context "returns as_json including associated models" do
+      it "returns as_json with include option as Symbol" do
+        notification = create(:notification)
+        expect(notification.as_json(include: :target)["target"]["id"].to_s).to eq(notification.target.id.to_s)
+      end
+
+      it "returns as_json with include option as Array" do
+        notification = create(:notification)
+        expect(notification.as_json(include: [:target])["target"]["id"].to_s).to eq(notification.target.id.to_s)
+      end
+
+      it "returns as_json with include option as Hash" do
+        notification = create(:notification)
+        expect(notification.as_json(include: { target: { methods: [:printable_target_name] } })["target"]["id"].to_s).to eq(notification.target.id.to_s)
+      end
+    end
   end
 
   describe "with serializable column" do

data/spec/models/subscription_spec.rb

@@ -11,6 +11,14 @@ describe ActivityNotification::Subscription, type: :model do
       subscription = create(:subscription, target: target)
       expect(subscription.reload.target).to eq(target)
     end
+
+    it "several targets can subscribe to the same key" do
+      target = create(:confirmed_user)
+      target2 = create(:confirmed_user)
+      subscription_1 = create(:subscription, target: target, key: 'key.1')
+      subscription_2 = create(:subscription, target: target2, key: 'key.1')
+      expect(subscription_2).to be_valid
+    end
   end
 
   describe "with validation" do
@@ -32,19 +40,6 @@ describe ActivityNotification::Subscription, type: :model do
       expect(@subscription.errors[:key].size).to eq(1)
     end
 
-    #TODO
-    # it "is invalid with non boolean value of subscribing" do
-      # @subscription.subscribing = 'hoge'
-      # expect(@subscription).to be_invalid
-      # expect(@subscription.errors[:subscribing].size).to eq(1)
-    # end
-# 
-    # it "is invalid with non boolean value of subscribing_to_email" do
-      # @subscription.subscribing_to_email = 'hoge'
-      # expect(@subscription).to be_invalid
-      # expect(@subscription.errors[:subscribing_to_email].size).to eq(1)
-    # end
-
     it "is invalid with true as subscribing_to_email and false as subscribing" do
       @subscription.subscribing = false
       @subscription.subscribing_to_email = true

data/spec/optional_targets/action_cable_api_channel_spec.rb

@@ -0,0 +1,37 @@
+if Rails::VERSION::MAJOR >= 5
+  require 'activity_notification/optional_targets/action_cable_api_channel'
+  describe ActivityNotification::OptionalTarget::ActionCableApiChannel do
+    let(:test_instance) { ActivityNotification::OptionalTarget::ActionCableApiChannel.new(skip_initializing_target: true) }
+
+    describe "as public instance methods" do
+      describe "#to_optional_target_name" do
+        it "is return demodulized symbol class name" do
+          expect(test_instance.to_optional_target_name).to eq(:action_cable_api_channel)
+        end
+      end
+
+      describe "#initialize_target" do
+        it "does not raise NotImplementedError" do
+          test_instance.initialize_target
+        end
+      end
+
+      describe "#notify" do
+        it "does not raise NotImplementedError" do
+          test_instance.notify(create(:notification))
+        end
+      end
+    end
+
+    describe "as protected instance methods" do
+      describe "#render_notification_message" do
+        context "as default" do
+          it "renders notification message as formatted JSON" do
+            expect(test_instance.send(:render_notification_message, create(:notification)).with_indifferent_access[:notification].has_key?(:id)).to be_truthy
+          end
+        end
+      end
+    end
+
+  end
+end

data/spec/optional_targets/action_cable_channel_spec.rb

@@ -0,0 +1,44 @@
+if Rails::VERSION::MAJOR >= 5
+  require 'activity_notification/optional_targets/action_cable_channel'
+  describe ActivityNotification::OptionalTarget::ActionCableChannel do
+    let(:test_instance) { ActivityNotification::OptionalTarget::ActionCableChannel.new(skip_initializing_target: true) }
+
+    describe "as public instance methods" do
+      describe "#to_optional_target_name" do
+        it "is return demodulized symbol class name" do
+          expect(test_instance.to_optional_target_name).to eq(:action_cable_channel)
+        end
+      end
+
+      describe "#initialize_target" do
+        it "does not raise NotImplementedError" do
+          test_instance.initialize_target
+        end
+      end
+
+      describe "#notify" do
+        it "does not raise NotImplementedError" do
+          test_instance.notify(create(:notification))
+        end
+      end
+    end
+
+    describe "as protected instance methods" do
+      describe "#render_notification_message" do
+        context "as default" do
+          it "renders notification message with default template" do
+            expect(test_instance.send(:render_notification_message, create(:notification))).to be_include("<div class='notification_list") 
+          end
+        end
+
+        context "with unexisting template as fallback option" do
+          it "raise ActionView::MissingTemplate" do
+            expect { expect(test_instance.send(:render_notification_message, create(:notification), fallback: :hoge)) }
+              .to raise_error(ActionView::MissingTemplate)
+          end
+        end
+      end
+    end
+
+  end
+end

data/spec/optional_targets/amazon_sns_spec.rb

@@ -10,7 +10,6 @@ describe ActivityNotification::OptionalTarget::AmazonSNS do
     end
 
     describe "#initialize_target" do
-      #TODO
       it "does not raise NotImplementedError" do
         begin
           test_instance.initialize_target
@@ -21,7 +20,6 @@ describe ActivityNotification::OptionalTarget::AmazonSNS do
     end
 
     describe "#notify" do
-      #TODO
       it "does not raise NotImplementedError but NoMethodError" do
         expect { test_instance.notify(create(:notification)) }
           .to raise_error(NoMethodError)

data/spec/optional_targets/slack_spec.rb

@@ -10,7 +10,6 @@ describe ActivityNotification::OptionalTarget::Slack do
     end
 
     describe "#initialize_target" do
-      #TODO
       it "does not raise NotImplementedError but URI::InvalidURIError" do
         expect { test_instance.initialize_target }
           .to raise_error(URI::InvalidURIError)
@@ -18,7 +17,6 @@ describe ActivityNotification::OptionalTarget::Slack do
     end
 
     describe "#notify" do
-      #TODO
       it "does not raise NotImplementedError but NoMethodError" do
         expect { test_instance.notify(create(:notification)) }
           .to raise_error(NoMethodError)

data/spec/rails_app/Rakefile

@@ -3,4 +3,13 @@
 
 require File.expand_path('../config/application', __FILE__)
 
+# Define dummy module for Webpacker Rake tasks
+require 'devise_token_auth'
+unless defined?(DeviseTokenAuth::Concerns::User)
+  module DeviseTokenAuth::Concerns
+    module User
+    end
+  end
+end
+
 Rails.application.load_tasks

data/spec/rails_app/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

data/spec/rails_app/app/controllers/admins_controller.rb

@@ -0,0 +1,21 @@
+class AdminsController < ApplicationController
+  before_action :set_admin, only: [:show]
+
+  # GET /admins
+  def index
+    render json: {
+      users: Admin.all.as_json(include: :user, methods: [:printable_target_name, :notification_action_cable_allowed?, :notification_action_cable_with_devise?])
+    }
+  end
+
+  # GET /admins/:id
+  def show
+    render json: @admin.as_json(include: :user, methods: [:printable_target_name, :notification_action_cable_allowed?, :notification_action_cable_with_devise?])
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_admin
+      @admin = Admin.find(params[:id])
+    end
+end

data/spec/rails_app/app/controllers/application_controller.rb

@@ -1,5 +1,5 @@
 class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
-  protect_from_forgery with: :exception
+  protect_from_forgery with: :null_session
 end

data/spec/rails_app/app/controllers/articles_controller.rb

@@ -4,8 +4,10 @@ class ArticlesController < ApplicationController
 
   # GET /articles
   def index
-    @exists_user_notification_routes  = respond_to?('user_notification_path')
-    @exists_admin_notification_routes = respond_to?('admin_notification_path')
+    @exists_notifications_routes       = respond_to?('notifications_path')
+    @exists_user_notifications_routes  = respond_to?('user_notifications_path')
+    @exists_admins_notifications_routes = respond_to?('admins_notifications_path')
+    @exists_admin_notifications_routes = respond_to?('admin_notifications_path')
     @articles = Article.all.includes(:user)
   end
 
@@ -29,7 +31,7 @@ class ArticlesController < ApplicationController
     @article.user = current_user
 
     if @article.save
-      @article.notify :users
+      @article.notify :users, key: 'article.create'
       redirect_to @article, notice: 'Article was successfully created.'
     else
       render :new
@@ -39,6 +41,7 @@ class ArticlesController < ApplicationController
   # PATCH/PUT /articles/1
   def update
     if @article.update(article_params)
+      @article.notify :users, key: 'article.update'
       redirect_to @article, notice: 'Article was successfully updated.'
     else
       render :edit

data/spec/rails_app/app/controllers/spa_controller.rb

@@ -0,0 +1,7 @@
+class SpaController < ApplicationController
+  
+  # GET /spa
+  def index
+  end
+
+end

data/spec/rails_app/app/controllers/users/notifications_controller.rb

@@ -1,67 +1,2 @@
 class Users::NotificationsController < ActivityNotification::NotificationsController
-  # GET /:target_type/:target_id/notifications
-  # def index
-  #   super
-  # end
-
-  # POST /:target_type/:target_id/notifications/open_all
-  # def open_all
-  #   super
-  # end
-
-  # GET /:target_type/:target_id/notifications/:id
-  # def show
-  #   super
-  # end
-
-  # DELETE /:target_type/:target_id/notifications/:id
-  # def destroy
-  #   super
-  # end
-
-  # POST /:target_type/:target_id/notifications/:id/open
-  # def open
-  #   super
-  # end
-
-  # GET /:target_type/:target_id/notifications/:id/move
-  # def move
-  #   super
-  # end
-
-  # No action routing
-  # This method needs to be public since it is called from view helper
-  # def target_view_path
-  #   super
-  # end
-
-  # protected
-
-  # def set_target
-  #   super
-  # end
-
-  # def set_notification
-  #   super
-  # end
-
-  # def set_index_options
-  #   super
-  # end
-
-  # def load_notification_index(options = {})
-  #   super(options)
-  # end
-
-  # def controller_path
-  #   super
-  # end
-
-  # def set_view_prefixes
-  #   super
-  # end
-
-  # def return_back_or_ajax
-  #   super
-  # end
 end