activity_notification 2.4.1 → 2.5.0

data/spec/jobs/notification_resilience_job_spec.rb

@@ -1,167 +0,0 @@
-describe "Notification resilience in background jobs" do
-  include ActiveJob::TestHelper
-  
-  let(:user) { create(:user) }
-  let(:article) { create(:article, user: user) }
-  let(:comment) { create(:comment, article: article, user: create(:user)) }
-
-  before do
-    ActivityNotification::Mailer.deliveries.clear
-    clear_enqueued_jobs
-    clear_performed_jobs
-    @original_email_enabled = ActivityNotification.config.email_enabled
-    ActivityNotification.config.email_enabled = true
-  end
-
-  after do
-    ActivityNotification.config.email_enabled = @original_email_enabled
-  end
-
-  describe "Job resilience" do
-    it "handles missing notifications gracefully in background jobs" do
-      # Create a notification and destroy it to simulate race condition
-      notification = ActivityNotification::Notification.create!(
-        target: user,
-        notifiable: comment,
-        key: 'comment.create'
-      )
-      
-      notification_id = notification.id
-      notification.destroy
-      
-      # Expect warning to be logged
-      expect(Rails.logger).to receive(:warn).with(/ActivityNotification: Notification.*not found for email delivery/)
-      
-      # Execute job - should not raise error
-      expect {
-        perform_enqueued_jobs do
-          # Simulate job trying to send email for destroyed notification
-          begin
-            destroyed_notification = ActivityNotification::Notification.find(notification_id)
-            destroyed_notification.send_notification_email
-          rescue => e
-            # Handle any ORM-specific "record not found" exception
-            if ActivityNotification::NotificationResilience.record_not_found_exception?(e)
-              Rails.logger.warn("ActivityNotification: Notification with id #{notification_id} not found for email delivery (#{ActivityNotification.config.orm}/#{e.class.name}), likely destroyed before job execution")
-            else
-              raise e
-            end
-          end
-        end
-      }.not_to raise_error
-      
-      expect(ActivityNotification::Mailer.deliveries.size).to eq(0)
-    end
-  end
-
-  describe "Mailer job resilience" do
-    context "when notification is destroyed before mailer job executes" do
-      it "handles the scenario gracefully" do
-        # Create a notification
-        notification = ActivityNotification::Notification.create!(
-          target: user,
-          notifiable: comment,
-          key: 'comment.create'
-        )
-        
-        notification_id = notification.id
-        
-        # Expect warning to be logged when notification is not found
-        expect(Rails.logger).to receive(:warn).with(/ActivityNotification: Notification.*not found for email delivery/)
-        
-        # Destroy the notification
-        notification.destroy
-        
-        # Try to send email using the mailer directly - this should use our resilient implementation
-        expect {
-          perform_enqueued_jobs do
-            # Create a mock notification that will raise RecordNotFound when accessed
-            mock_notification = double("notification")
-            allow(mock_notification).to receive(:id).and_return(notification_id)
-            allow(mock_notification).to receive(:target).and_raise(ActiveRecord::RecordNotFound)
-            
-            ActivityNotification::Mailer.send_notification_email(mock_notification).deliver_now
-          end
-        }.not_to raise_error
-        
-        # No email should be sent
-        expect(ActivityNotification::Mailer.deliveries.size).to eq(0)
-      end
-    end
-
-    context "when notification exists during mailer job execution" do
-      it "sends email normally" do
-        # Enable email for this test
-        allow_any_instance_of(User).to receive(:notification_email_allowed?).and_return(true)
-        allow_any_instance_of(Comment).to receive(:notification_email_allowed?).and_return(true)
-        allow_any_instance_of(ActivityNotification::Notification).to receive(:email_subscribed?).and_return(true)
-        
-        # Create a notification
-        notification = ActivityNotification::Notification.create!(
-          target: user,
-          notifiable: comment,
-          key: 'comment.create'
-        )
-        
-        # Don't expect any warnings
-        expect(Rails.logger).not_to receive(:warn)
-        
-        # Send email - this should work normally
-        expect {
-          perform_enqueued_jobs do
-            ActivityNotification::Mailer.send_notification_email(notification).deliver_now
-          end
-        }.not_to raise_error
-        
-        # Email should be sent
-        expect(ActivityNotification::Mailer.deliveries.size).to eq(1)
-      end
-    end
-  end
-
-  describe "Multiple job resilience" do
-    it "continues processing other jobs even when some notifications are missing" do
-      # Enable email for this test
-      allow_any_instance_of(User).to receive(:notification_email_allowed?).and_return(true)
-      allow_any_instance_of(Comment).to receive(:notification_email_allowed?).and_return(true)
-      allow_any_instance_of(ActivityNotification::Notification).to receive(:email_subscribed?).and_return(true)
-      
-      # Create two notifications
-      notification1 = ActivityNotification::Notification.create!(
-        target: user,
-        notifiable: comment,
-        key: 'comment.create'
-      )
-      
-      notification2 = ActivityNotification::Notification.create!(
-        target: user,
-        notifiable: create(:comment, article: article, user: create(:user)),
-        key: 'comment.create'
-      )
-      
-      # Destroy the first notification
-      notification1_id = notification1.id
-      notification1.destroy
-      
-      # Expect one warning for the destroyed notification
-      expect(Rails.logger).to receive(:warn).with(/ActivityNotification: Notification.*not found for email delivery/).once
-      
-      # Process both jobs
-      expect {
-        perform_enqueued_jobs do
-          # First job - should handle missing notification gracefully
-          mock_notification1 = double("notification")
-          allow(mock_notification1).to receive(:id).and_return(notification1_id)
-          allow(mock_notification1).to receive(:target).and_raise(ActiveRecord::RecordNotFound)
-          ActivityNotification::Mailer.send_notification_email(mock_notification1).deliver_now
-          
-          # Second job - should work normally
-          ActivityNotification::Mailer.send_notification_email(notification2).deliver_now
-        end
-      }.not_to raise_error
-      
-      # Only one email should be sent (for notification2)
-      expect(ActivityNotification::Mailer.deliveries.size).to eq(1)
-    end
-  end
-end

data/spec/jobs/notify_all_job_spec.rb

@@ -1,23 +0,0 @@
-describe ActivityNotification::NotifyAllJob, type: :job do
-  before do
-    ActiveJob::Base.queue_adapter = :test
-    ActiveJob::Base.queue_adapter.enqueued_jobs.clear
-    @author_user = create(:confirmed_user)
-    @user        = create(:confirmed_user)
-    @article     = create(:article, user: @author_user)
-    @comment     = create(:comment, article: @article, user: @user)
-  end
-
-  describe "#perform_later" do
-    it "generates notifications" do
-      expect {
-        ActivityNotification::NotifyAllJob.perform_later([@author_user, @user], @comment)
-      }.to have_enqueued_job
-    end
-
-    it "generates notifications once" do
-      ActivityNotification::NotifyAllJob.perform_later([@author_user, @user], @comment)
-      expect(ActivityNotification::NotifyAllJob).to have_been_enqueued.exactly(:once)
-    end
-  end
-end

data/spec/jobs/notify_job_spec.rb

@@ -1,23 +0,0 @@
-describe ActivityNotification::NotifyJob, type: :job do
-  before do
-    ActiveJob::Base.queue_adapter = :test
-    ActiveJob::Base.queue_adapter.enqueued_jobs.clear
-    @author_user = create(:confirmed_user)
-    @user        = create(:confirmed_user)
-    @article     = create(:article, user: @author_user)
-    @comment     = create(:comment, article: @article, user: @user)
-  end
-
-  describe "#perform_later" do
-    it "generates notifications" do
-      expect {
-        ActivityNotification::NotifyJob.perform_later('users', @comment)
-      }.to have_enqueued_job
-    end
-
-    it "generates notifications once" do
-      ActivityNotification::NotifyJob.perform_later('users', @comment)
-      expect(ActivityNotification::NotifyJob).to have_been_enqueued.exactly(:once)
-    end
-  end
-end

data/spec/jobs/notify_to_job_spec.rb

@@ -1,23 +0,0 @@
-describe ActivityNotification::NotifyToJob, type: :job do
-  before do
-    ActiveJob::Base.queue_adapter = :test
-    ActiveJob::Base.queue_adapter.enqueued_jobs.clear
-    @author_user = create(:confirmed_user)
-    @user        = create(:confirmed_user)
-    @article     = create(:article, user: @author_user)
-    @comment     = create(:comment, article: @article, user: @user)
-  end
-
-  describe "#perform_later" do
-    it "generates notification" do
-      expect {
-        ActivityNotification::NotifyToJob.perform_later(@user, @comment)
-      }.to have_enqueued_job
-    end
-
-    it "generates notification once" do
-      ActivityNotification::NotifyToJob.perform_later(@user, @comment)
-      expect(ActivityNotification::NotifyToJob).to have_been_enqueued.exactly(:once)
-    end
-  end
-end

data/spec/mailers/mailer_spec.rb

@@ -1,214 +0,0 @@
-describe ActivityNotification::Mailer do
-  include ActiveJob::TestHelper
-  let(:notification) { create(:notification) }
-  let(:test_target) { notification.target }
-  let(:notifications) { [create(:notification, target: test_target), create(:notification, target: test_target)] }
-  let(:batch_key) { 'test_batch_key' }
-
-  before do
-    ActivityNotification::Mailer.deliveries.clear
-    expect(ActivityNotification::Mailer.deliveries.size).to eq(0)
-  end
-
-  describe ".send_notification_email" do
-    context "with deliver_now" do
-      context "as default" do
-        before do
-          ActivityNotification::Mailer.send_notification_email(notification).deliver_now
-        end
-  
-        it "sends notification email now" do
-          expect(ActivityNotification::Mailer.deliveries.size).to eq(1)
-        end
-  
-        it "sends to target email" do
-          expect(ActivityNotification::Mailer.deliveries.last.to[0]).to eq(notification.target.email)
-        end
-  
-        it "sends from configured email in initializer" do
-          expect(ActivityNotification::Mailer.deliveries.last.from[0])
-            .to eq("please-change-me-at-config-initializers-activity_notification@example.com")
-        end
-
-        it "sends with default notification subject" do
-          expect(ActivityNotification::Mailer.deliveries.last.subject)
-            .to eq("Notification of article")
-        end
-      end
-
-      context "with default from parameter in mailer" do
-        it "sends from configured email as default parameter" do
-          class CustomMailer < ActivityNotification::Mailer
-            default from: "test01@example.com"
-          end
-          CustomMailer.send_notification_email(notification).deliver_now
-          expect(CustomMailer.deliveries.last.from[0])
-            .to eq("test01@example.com")
-        end
-      end
-
-      context "with email value as ActivityNotification.config.mailer_sender" do
-        it "sends from configured email as ActivityNotification.config.mailer_sender" do
-          ActivityNotification.config.mailer_sender = "test02@example.com"
-          ActivityNotification::Mailer.send_notification_email(notification).deliver_now
-          expect(ActivityNotification::Mailer.deliveries.last.from[0])
-            .to eq("test02@example.com")
-        end
-      end
-
-      context "with email proc as ActivityNotification.config.mailer_sender" do
-        it "sends from configured email as ActivityNotification.config.mailer_sender" do
-          ActivityNotification.config.mailer_sender =
-            ->(key){ key == notification.key ? "test03@example.com" : "test04@example.com" }
-          ActivityNotification::Mailer.send_notification_email(notification).deliver_now
-          expect(ActivityNotification::Mailer.deliveries.last.from[0])
-            .to eq("test03@example.com")
-        end
-
-        it "sends from configured email as ActivityNotification.config.mailer_sender" do
-          ActivityNotification.config.mailer_sender =
-            ->(key){ key == 'hogehoge' ? "test03@example.com" : "test04@example.com" }
-          ActivityNotification::Mailer.send_notification_email(notification).deliver_now
-          expect(ActivityNotification::Mailer.deliveries.last.from[0])
-            .to eq("test04@example.com")
-        end
-      end
-
-      context "with defined overriding_notification_email_key in notifiable model" do
-        it "sends with configured notification subject in locale file as updated key" do
-          module AdditionalMethods
-            def overriding_notification_email_key(target, key)
-              'comment.reply'
-            end
-          end
-          notification.notifiable.extend(AdditionalMethods)
-          ActivityNotification::Mailer.send_notification_email(notification).deliver_now
-          expect(ActivityNotification::Mailer.deliveries.last.subject)
-            .to eq("New comment on your article")
-        end
-      end
-
-      context "with defined overriding_notification_email_subject in notifiable model" do
-        it "sends with updated subject" do
-          module AdditionalMethods
-            def overriding_notification_email_subject(target, key)
-              'Hi, You have got comment'
-            end
-          end
-          notification.notifiable.extend(AdditionalMethods)
-          ActivityNotification::Mailer.send_notification_email(notification).deliver_now
-          expect(ActivityNotification::Mailer.deliveries.last.subject)
-            .to eq("Hi, You have got comment")
-        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 }
-            .to raise_error(ActionView::MissingTemplate)
-        end
-      end
-    end
-
-    context "with deliver_later" do
-      it "sends notification email later" do
-        expect {
-          perform_enqueued_jobs do
-            ActivityNotification::Mailer.send_notification_email(notification).deliver_later
-          end
-        }.to change { ActivityNotification::Mailer.deliveries.size }.by(1)
-        expect(ActivityNotification::Mailer.deliveries.size).to eq(1)
-      end
-
-      it "sends notification email with active job queue" do
-        expect {
-            ActivityNotification::Mailer.send_notification_email(notification).deliver_later
-        }.to change(ActiveJob::Base.queue_adapter.enqueued_jobs, :size).by(1)
-      end
-    end
-  end
-
-  describe ".send_batch_notification_email" do
-    context "with deliver_now" do
-      context "as default" do
-        before do
-          ActivityNotification::Mailer.send_batch_notification_email(test_target, notifications, batch_key).deliver_now
-        end
-  
-        it "sends batch notification email now" do
-          expect(ActivityNotification::Mailer.deliveries.size).to eq(1)
-        end
-  
-        it "sends to target email" do
-          expect(ActivityNotification::Mailer.deliveries.last.to[0]).to eq(test_target.email)
-        end
-  
-      end
-
-      context "when fallback option is :none and the template is missing" do
-        it "raise ActionView::MissingTemplate" do
-          expect { ActivityNotification::Mailer.send_batch_notification_email(test_target, notifications, batch_key, fallback: :none).deliver_now }
-            .to raise_error(ActionView::MissingTemplate)
-        end
-      end
-    end
-
-    context "with deliver_later" do
-      it "sends notification email later" do
-        expect {
-          perform_enqueued_jobs do
-            ActivityNotification::Mailer.send_batch_notification_email(test_target, notifications, batch_key).deliver_later
-          end
-        }.to change { ActivityNotification::Mailer.deliveries.size }.by(1)
-        expect(ActivityNotification::Mailer.deliveries.size).to eq(1)
-      end
-
-      it "sends notification email with active job queue" do
-        expect {
-            ActivityNotification::Mailer.send_batch_notification_email(test_target, notifications, batch_key).deliver_later
-        }.to change(ActiveJob::Base.queue_adapter.enqueued_jobs, :size).by(1)
-      end
-    end
-  end
-end