activity_notification 1.4.4 → 2.2.4

data/spec/factories/subscriptions.rb

@@ -1,8 +1,8 @@
 FactoryBot.define do
   factory :subscription, class: ActivityNotification::Subscription do
     association :target, factory: :confirmed_user
-    key "default.default"
-    subscribed_at Time.current
-    subscribed_to_email_at Time.current
+    key { "default.default" }
+    subscribed_at { Time.current }
+    subscribed_to_email_at { Time.current }
   end
 end

data/spec/factories/users.rb

@@ -1,8 +1,8 @@
 FactoryBot.define do
   factory :user do
-    email Array.new(10){[*"A".."Z", *"0".."9"].sample}.join + '@example.com'
-    password "password"
-    password_confirmation "password"
+    email { Array.new(10){[*"A".."Z", *"0".."9"].sample}.join + '@example.com' }
+    password { "password" }
+    password_confirmation { "password" }
   end
 
   factory :confirmed_user, parent: :user do

data/spec/generators/migration/migration_generator_spec.rb

@@ -4,7 +4,17 @@ describe ActivityNotification::Generators::MigrationGenerator, type: :generator
 
   # setup_default_destination
   destination File.expand_path("../../../../tmp", __FILE__)
-  before { prepare_destination }
+
+  before do
+    prepare_destination
+  end
+
+  after do
+    if ActivityNotification.config.orm == :active_record
+      ActivityNotification::Notification.reset_column_information
+      ActivityNotification::Subscription.reset_column_information
+    end
+  end
 
   it 'runs generating migration tasks' do
     gen = generator
@@ -21,7 +31,15 @@ describe ActivityNotification::Generators::MigrationGenerator, type: :generator
       describe 'CreateNotifications migration file' do
         subject { file(Dir["tmp/db/migrate/*_create_activity_notification_tables.rb"].first.gsub!('tmp/', '')) }
         it { is_expected.to exist }
-        it { is_expected.to contain(/class CreateActivityNotificationTables < ActiveRecord::Migration/) }
+        it { is_expected.to contain(/class CreateActivityNotificationTables < ActiveRecord::Migration\[\d\.\d\]/) }
+
+        if ActivityNotification.config.orm == :active_record
+          it 'can be executed to migrate scheme' do
+            require subject
+            CreateActivityNotificationTables.new.migrate(:down)
+            CreateActivityNotificationTables.new.migrate(:up)
+          end
+        end
       end
     end
 
@@ -33,9 +51,16 @@ describe ActivityNotification::Generators::MigrationGenerator, type: :generator
       describe 'CreateCustomNotifications migration file' do
         subject { file(Dir["tmp/db/migrate/*_create_custom_notifications.rb"].first.gsub!('tmp/', '')) }
         it { is_expected.to exist }
-        it { is_expected.to contain(/class CreateCustomNotifications < ActiveRecord::Migration/) }
+        it { is_expected.to contain(/class CreateCustomNotifications < ActiveRecord::Migration\[\d\.\d\]/) }
+
+        if ActivityNotification.config.orm == :active_record
+          it 'can be executed to migrate scheme' do
+            require subject
+            CreateActivityNotificationTables.new.migrate(:down)
+            CreateActivityNotificationTables.new.migrate(:up)
+          end
+        end
       end
     end
-
   end
 end

data/spec/helpers/view_helpers_spec.rb

@@ -1,5 +1,5 @@
 describe ActivityNotification::ViewHelpers, type: :helper do
-  let(:view_context)         { ActionView::Base.new }
+  let(:view_context)         { ActionView::Base.new(ActionView::LookupContext.new(ActionController::Base.view_paths), [], nil) }
   let(:notification)         {
     create(:notification, target: create(:confirmed_user))
   }
@@ -42,16 +42,18 @@ describe ActivityNotification::ViewHelpers, type: :helper do
         expect(render_notification notification, fallback: :default)
           .to eq(
             render partial: 'activity_notification/notifications/default/default',
-                   locals: { notification: notification }
+                   locals: { notification: notification, parameters: {} }
           )
       end
 
-      if ActivityNotification.config.orm == :active_record
-        it 'handles multiple notifications of active_record' do
-          expect(notifications.to_a.first).to receive(:render).with(self, { fallback: :default })
-          expect(notifications.to_a.last).to  receive(:render).with(self, { fallback: :default })
-          render_notification notifications, fallback: :default
-        end
+      it 'handles multiple notifications of records' do
+        rendered_template = render_notification notifications, fallback: :default
+        expect(rendered_template).to start_with(
+          render partial: 'activity_notification/notifications/default/default',
+                 locals: { notification: notifications.to_a.first, parameters: {} })
+        expect(rendered_template).to end_with(
+          render partial: 'activity_notification/notifications/default/default',
+                 locals: { notification: notifications.to_a.last , parameters: {} })
       end
 
       it 'handles multiple notifications of array' do
@@ -67,6 +69,21 @@ describe ActivityNotification::ViewHelpers, type: :helper do
         expect(render_notification notification, fallback: :text)
           .to eq(simple_text_original)
       end
+
+      it "interpolates from parameters" do
+        notification.parameters = { "article_title" => "custom title" }
+        notification.key = 'article.destroy'
+        expect(render_notification notification, fallback: :text)
+          .to eq('The author removed an article "custom title"')
+      end
+    end
+
+    context "with i18n param set" do
+      it "uses i18n text from key" do
+        notification.key = simple_text_key
+        expect(render_notification notification, i18n: true)
+          .to eq(simple_text_original)
+      end
     end
 
     context "with custom view" do
@@ -96,23 +113,24 @@ 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'
       end
 
       context "with defined overriding_notification_template_key in notifiable model" do
-        it "renders overriden custom notification view" do
+        it "renders overridden custom notification view" do
           notification.key = 'custom.test'
           module AdditionalMethods
             def overriding_notification_template_key(target, key)
-              'overriden.custom.test'
+              'overridden.custom.test'
             end
           end
           notification.notifiable.extend(AdditionalMethods)
-          # render activity_notification/notifications/users/overriden/custom/test
+          # render activity_notification/notifications/users/overridden/custom/test
           expect(render_notification notification, target: :users)
-            .to eq("Overriden custom template root for user target: #{notification.id}")
+            .to eq("Overridden custom template root for user target: #{notification.id}")
         end
       end
     end
@@ -153,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/jobs/notify_all_job_spec.rb

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,23 @@
+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

@@ -84,7 +84,7 @@ describe ActivityNotification::Mailer do
           notification.notifiable.extend(AdditionalMethods)
           ActivityNotification::Mailer.send_notification_email(notification).deliver_now
           expect(ActivityNotification::Mailer.deliveries.last.subject)
-            .to eq("New comment to your article")
+            .to eq("New comment on your article")
         end
       end
 
@@ -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/dummy/dummy_group_spec.rb

@@ -1,3 +1,7 @@
+# To run as single test for debugging
+# require Rails.root.join('../../spec/concerns/models/group_spec.rb').to_s
+# require Rails.root.join('../../spec/concerns/common_spec.rb').to_s
+
 describe Dummy::DummyGroup, type: :model do
 
   it_behaves_like :group

data/spec/models/dummy/dummy_notifiable_spec.rb

@@ -1,3 +1,7 @@
+# To run as single test for debugging
+# require Rails.root.join('../../spec/concerns/models/notifiable_spec.rb').to_s
+# require Rails.root.join('../../spec/concerns/common_spec.rb').to_s
+
 describe Dummy::DummyNotifiable, type: :model do
 
   it_behaves_like :notifiable

data/spec/models/dummy/dummy_notifier_spec.rb

@@ -1,3 +1,7 @@
+# To run as single test for debugging
+# require Rails.root.join('../../spec/concerns/models/notifier_spec.rb').to_s
+# require Rails.root.join('../../spec/concerns/common_spec.rb').to_s
+
 describe Dummy::DummyNotifier, type: :model do
 
   it_behaves_like :notifier

data/spec/models/dummy/dummy_subscriber_spec.rb

@@ -1,3 +1,6 @@
+# To run as single test for debugging
+# require Rails.root.join('../../spec/concerns/models/subscriber_spec.rb').to_s
+
 describe Dummy::DummySubscriber, type: :model do
 
   it_behaves_like :subscriber

data/spec/models/dummy/dummy_target_spec.rb

@@ -1,3 +1,7 @@
+# To run as single test for debugging
+# require Rails.root.join('../../spec/concerns/models/target_spec.rb').to_s
+# require Rails.root.join('../../spec/concerns/common_spec.rb').to_s
+
 describe Dummy::DummyTarget, type: :model do
 
   it_behaves_like :target