activity_notification 1.4.4 → 2.2.4

data/spec/controllers/notifications_controller_shared_examples.rb

@@ -1,4 +1,8 @@
-shared_examples_for :notification_controller do
+require_relative 'controller_spec_utility'
+
+shared_examples_for :notifications_controller do
+  include ActivityNotification::ControllerSpec::RequestUtility
+
   let(:target_params) { { target_type: target_type }.merge(extra_params || {}) }
 
   describe "GET #index" do
@@ -69,27 +73,6 @@ shared_examples_for :notification_controller do
       end
     end
 
-    context "with json as format parameter" do
-      before do
-        @notification = create(:notification, target: test_target)
-        get_with_compatibility :index, target_params.merge({ typed_target_param => test_target, format: :json }), valid_session
-      end
-
-      it "returns 200 as http status code" do
-        expect(response.status).to eq(200)
-      end
-
-      it "returns json format" do
-        if ActivityNotification.config.orm == :active_record
-          expect(JSON.parse(response.body).first)
-          .to include("target_id" => test_target.id, "target_type" => test_target.to_class_name)
-        else
-          expect(JSON.parse(response.body).first)
-          .to include("target_id" => test_target.id.to_s, "target_type" => test_target.to_class_name)
-        end
-      end
-    end
-
     context "with filter parameter" do
       context "with unopened as filter" do
         before do
@@ -166,12 +149,10 @@ shared_examples_for :notification_controller do
         @notifiable    = create(:article)
         @group         = create(:article)
         @key           = 'test.key.1'
-        notification   = create(:notification, target: test_target, notifiable: @notifiable)
-        create(:notification, target: test_target, notifiable: create(:comment), group: @group, created_at: notification.created_at + 10.second)
-        create(:notification, target: test_target, notifiable: create(:article), key: @key, created_at: notification.created_at + 20.second).open!
-        @notification1 = test_target.notification_index[0]
-        @notification2 = test_target.notification_index[1]
-        @notification3 = test_target.notification_index[2]
+        @notification2 = create(:notification, target: test_target, notifiable: @notifiable)
+        @notification1 = create(:notification, target: test_target, notifiable: create(:comment), group: @group, created_at: @notification2.created_at + 10.second)
+        @notification3 = create(:notification, target: test_target, notifiable: create(:article), key: @key, created_at: @notification2.created_at + 20.second)
+        @notification3.open!
       end
 
       context "as default" do
@@ -207,8 +188,8 @@ shared_examples_for :notification_controller do
         @group         = create(:article)
         @key           = 'test.key.1'
         @notification2 = create(:notification, target: test_target, notifiable: @notifiable)
-        @notification1 = create(:notification, target: test_target, notifiable: create(:comment), group: @group)
-        @notification3 = create(:notification, target: test_target, notifiable: create(:article), key: @key)
+        @notification1 = create(:notification, target: test_target, notifiable: create(:comment), group: @group, created_at: @notification2.created_at + 10.second)
+        @notification3 = create(:notification, target: test_target, notifiable: create(:article), key: @key, created_at: @notification2.created_at + 20.second)
         @notification3.open!
       end
 
@@ -221,7 +202,7 @@ shared_examples_for :notification_controller do
         end
       end
 
-      context 'with filtered_by_group_type and :filtered_by_group_id parameters' do
+      context 'with filtered_by_group_type and filtered_by_group_id parameters' do
         it "returns filtered notifications only" do
           get_with_compatibility :index, target_params.merge({ typed_target_param => test_target, filtered_by_group_type: 'Article', filtered_by_group_id: @group.id.to_s }), valid_session
           expect(assigns(:notifications)[0]).to eq(@notification1)
@@ -236,6 +217,22 @@ shared_examples_for :notification_controller do
           expect(assigns(:notifications).size).to eq(1)
         end
       end
+
+      context 'with later_than parameter' do
+        it "returns filtered notifications only" do
+          get_with_compatibility :index, target_params.merge({ typed_target_param => test_target, later_than: (@notification1.created_at.in_time_zone + 0.001).iso8601(3) }), valid_session
+          expect(assigns(:notifications)[0]).to eq(@notification3)
+          expect(assigns(:notifications).size).to eq(1)
+        end
+      end
+
+      context 'with earlier_than parameter' do
+        it "returns filtered notifications only" do
+          get_with_compatibility :index, target_params.merge({ typed_target_param => test_target, earlier_than: @notification1.created_at.iso8601(3) }), valid_session
+          expect(assigns(:notifications)[0]).to eq(@notification2)
+          expect(assigns(:notifications).size).to eq(1)
+        end
+      end
     end
   end
 
@@ -310,7 +307,7 @@ shared_examples_for :notification_controller do
         @target_1, @notifiable_1, @group_1, @key_1 = create(:confirmed_user), create(:article), nil,           "key.1"
         @target_2, @notifiable_2, @group_2, @key_2 = create(:confirmed_user), create(:comment), @notifiable_1, "key.2"
         @notification_1 = create(:notification, target: test_target, notifiable: @notifiable_1, group: @group_1, key: @key_1)
-        @notification_2 = create(:notification, target: test_target, notifiable: @notifiable_2, group: @group_2, key: @key_2)
+        @notification_2 = create(:notification, target: test_target, notifiable: @notifiable_2, group: @group_2, key: @key_2, created_at: @notification_1.created_at + 10.second)
         expect(@notification_1.opened?).to be_falsey
         expect(@notification_2.opened?).to be_falsey
       end
@@ -339,6 +336,22 @@ shared_examples_for :notification_controller do
         end
       end
 
+      context 'with later_than parameter' do
+        it "opens filtered notifications only" do
+          post_with_compatibility :open_all, target_params.merge({ typed_target_param => test_target, later_than: (@notification_1.created_at.in_time_zone + 0.001).iso8601(3) }), valid_session
+          expect(@notification_1.reload.opened?).to be_falsey
+          expect(@notification_2.reload.opened?).to be_truthy
+        end
+      end
+
+      context 'with earlier_than parameter' do
+        it "opens filtered notifications only" do
+          post_with_compatibility :open_all, target_params.merge({ typed_target_param => test_target, earlier_than: @notification_2.created_at.iso8601(3) }), valid_session
+          expect(@notification_1.reload.opened?).to be_truthy
+          expect(@notification_2.reload.opened?).to be_falsey
+        end
+      end
+
       context "with no filter request parameters" do
         it "opens all notifications of the target" do
           post_with_compatibility :open_all, target_params.merge({ typed_target_param => test_target}), valid_session
@@ -393,7 +406,7 @@ shared_examples_for :notification_controller do
       end
 
       it "deletes the notification" do
-        expect(assigns(test_target.notifications.where(id: @notification.id).exists?)).to be_falsey
+        expect(test_target.notifications.where(id: @notification.id).exists?).to be_falsey
       end
 
       it "redirects to :index" do
@@ -445,13 +458,13 @@ shared_examples_for :notification_controller do
     end
   end
 
-  describe "POST #open" do
+  describe "PUT #open" do
     context "without move parameter" do
-      context "http direct POST request" do
+      context "http direct PUT request" do
         before do
           @notification = create(:notification, target: test_target)
           expect(@notification.opened?).to be_falsey
-          post_with_compatibility :open, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
+          put_with_compatibility :open, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
         end
 
         it "returns 302 as http status code" do
@@ -467,12 +480,12 @@ shared_examples_for :notification_controller do
         end
       end
 
-      context "http POST request from root_path" do
+      context "http PUT request from root_path" do
         before do
           @notification = create(:notification, target: test_target)
           expect(@notification.opened?).to be_falsey
           request.env["HTTP_REFERER"] = root_path
-          post_with_compatibility :open, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
+          put_with_compatibility :open, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
         end
 
         it "returns 302 as http status code" do
@@ -488,12 +501,12 @@ shared_examples_for :notification_controller do
         end
       end
 
-      context "Ajax POST request" do
+      context "Ajax PUT request" do
         before do
           @notification = create(:notification, target: test_target)
           expect(@notification.opened?).to be_falsey
           request.env["HTTP_REFERER"] = root_path
-          xhr_with_compatibility :post, :open, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
+          xhr_with_compatibility :put, :open, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
         end
     
         it "returns 200 as http status code" do
@@ -515,11 +528,11 @@ shared_examples_for :notification_controller do
     end
 
     context "with true as move parameter" do
-      context "http direct POST request" do
+      context "http direct PUT request" do
         before do
           @notification = create(:notification, target: test_target)
           expect(@notification.opened?).to be_falsey
-          post_with_compatibility :open, target_params.merge({ id: @notification, typed_target_param => test_target, move: true }), valid_session
+          put_with_compatibility :open, target_params.merge({ id: @notification, typed_target_param => test_target, move: true }), valid_session
         end
 
         it "returns 302 as http status code" do
@@ -577,38 +590,4 @@ shared_examples_for :notification_controller do
       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
-
-    def post_with_compatibility action, params, session
-      if Rails::VERSION::MAJOR <= 4
-        post action, params, session
-      else
-        post action, params: params, session: session
-      end
-    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
-    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
-    end
 end

data/spec/controllers/notifications_controller_spec.rb

@@ -7,6 +7,5 @@ describe ActivityNotification::NotificationsController, type: :controller do
   let(:extra_params)       { {} }
   let(:valid_session)      {}
 
-  it_behaves_like :notification_controller
-
+  it_behaves_like :notifications_controller
 end

data/spec/controllers/notifications_with_devise_controller_spec.rb

@@ -1,6 +1,8 @@
 require 'controllers/notifications_controller_shared_examples'
 
 describe ActivityNotification::NotificationsWithDeviseController, 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::NotificationsWithDeviseController, type: :control
       sign_in test_user
     end
   
-    it_behaves_like :notification_controller
+    it_behaves_like :notifications_controller
   end
 
   context "signed in with devise as unauthenticated user" do
@@ -78,14 +80,18 @@ describe ActivityNotification::NotificationsWithDeviseController, type: :control
     end
   end
 
-  private
+  context "without target_id and (typed_target)_id parameters for devise integrated controller with devise_type option" do
+    let(:target_params) { { target_type: target_type, devise_type: :users } }
+
+    describe "GET #index" do
+      before do
+        sign_in test_target.user
+        get_with_compatibility :index, target_params, valid_session
+      end
 
-    def get_with_compatibility action, params, session
-      if Rails::VERSION::MAJOR <= 4
-        get action, params, session
-      else
-        get action, params: params, session: session
+      it "returns 200 as http status code" do
+        expect(response.status).to eq(200)
       end
     end
-
+  end
 end