activity_notification 0.0.9 → 0.0.10

data/spec/concerns/common_spec.rb

@@ -3,7 +3,7 @@ shared_examples_for :common do
   let(:test_instance) { create(test_class_name) }
 
   describe "as public ActivityNotification methods with described class" do
-    describe "#resolve_value" do
+    describe ".resolve_value" do
       before do
         allow(ActivityNotification).to receive(:get_controller).and_return('StubController')
       end

data/spec/concerns/models/notifiable_spec.rb

@@ -6,13 +6,13 @@ shared_examples_for :notifiable do
   include Rails.application.routes.url_helpers
 
   describe "as public class methods" do
-    describe "#available_as_notifiable?" do
+    describe ".available_as_notifiable?" do
       it "returns true" do
         expect(described_class.available_as_notifiable?).to be_truthy
       end
     end
 
-    describe "#set_notifiable_class_defaults" do
+    describe ".set_notifiable_class_defaults" do
       it "set parameter fields as default" do
         described_class.set_notifiable_class_defaults
         expect(described_class._notification_targets).to       eq({})

data/spec/concerns/models/notifier_spec.rb

@@ -13,7 +13,7 @@ shared_examples_for :notifier do
   end    
 
   describe "as public class methods" do
-    describe "#available_as_notifier?" do
+    describe ".available_as_notifier?" do
       it "returns true" do
         expect(described_class.available_as_notifier?).to be_truthy
       end

data/spec/concerns/models/target_spec.rb

@@ -10,17 +10,18 @@ shared_examples_for :target do
       expect(test_instance.notifications.count).to    eq(2)
       expect(test_instance.notifications.earliest).to eq(notification_1)
       expect(test_instance.notifications.latest).to   eq(notification_2)
+      expect(test_instance.notifications).to          eq (ActivityNotification::Notification.filtered_by_target(test_instance))
     end
   end    
 
   describe "as public class methods" do
-    describe "#available_as_target?" do
+    describe ".available_as_target?" do
       it "returns true" do
         expect(described_class.available_as_target?).to be_truthy
       end
     end
 
-    describe "#set_target_class_defaults" do
+    describe ".set_target_class_defaults" do
       it "set parameter fields as default" do
         described_class.set_target_class_defaults
         expect(described_class._notification_email).to         eq(nil)
@@ -125,20 +126,20 @@ shared_examples_for :target do
 
     describe "#authenticated_with_devise?" do
       context "without any configuration" do
-        context "when the current device resource and called target are defferent class instance" do
+        context "when the current devise resource and called target are defferent class instance" do
           it "raises TypeError" do
             expect { test_instance.authenticated_with_devise?(test_notifiable) }
               .to raise_error(TypeError, /Defferent type of .+ has been passed to .+ You have to override .+ /)
           end
         end
   
-        context "when the current device resource equals called target" do
+        context "when the current devise resource equals called target" do
           it "returns true" do
             expect(test_instance.authenticated_with_devise?(test_instance)).to be_truthy
           end
         end
   
-        context "when the current device resource does not equal called target" do
+        context "when the current devise resource does not equal called target" do
           it "returns false" do
             expect(test_instance.authenticated_with_devise?(create(test_class_name))).to be_falsey
           end
@@ -146,7 +147,7 @@ shared_examples_for :target do
       end
 
       context "configured with a field" do
-        context "when the current device resource and called target are defferent class instance" do
+        context "when the current devise resource and called target are defferent class instance" do
           it "raises TypeError" do
             described_class._notification_devise_resource = test_notifiable
             expect { test_instance.authenticated_with_devise?(test_instance) }
@@ -154,14 +155,14 @@ shared_examples_for :target do
           end
         end
   
-        context "when the current device resource equals called target" do
+        context "when the current devise resource equals called target" do
           it "returns true" do
             described_class._notification_devise_resource = test_notifiable
             expect(test_instance.authenticated_with_devise?(test_notifiable)).to be_truthy
           end
         end
   
-        context "when the current device resource does not equal called target" do
+        context "when the current devise resource does not equal called target" do
           it "returns false" do
             described_class._notification_devise_resource = test_instance
             expect(test_instance.authenticated_with_devise?(create(test_class_name))).to be_falsey

data/spec/controllers/notifications_controller_shared_examples.rb

@@ -5,7 +5,7 @@ shared_examples_for :notification_controller do
     context "with target_type and target_id parameters" do
       before do
         @notification = create(:notification, target: test_target)
-        get :index, target_params.merge({ target_id: test_target, typed_target_param => 'dummy' }), valid_session
+        get_with_compatibility :index, target_params.merge({ target_id: test_target, typed_target_param => 'dummy' }), valid_session
       end
 
       it "returns 200 as http status code" do
@@ -24,7 +24,7 @@ shared_examples_for :notification_controller do
     context "with target_type and (typed_target)_id parameters" do
       before do
         @notification = create(:notification, target: test_target)
-        get :index, target_params.merge({ typed_target_param => test_target }), valid_session
+        get_with_compatibility :index, target_params.merge({ typed_target_param => test_target }), valid_session
       end
   
       it "returns 200 as http status code" do
@@ -43,7 +43,7 @@ shared_examples_for :notification_controller do
     context "without target_type parameters" do
       before do
         @notification = create(:notification, target: test_target)
-        get :index, { typed_target_param => test_target }, valid_session
+        get_with_compatibility :index, { typed_target_param => test_target }, valid_session
       end
 
       it "returns 400 as http status code" do
@@ -58,7 +58,7 @@ shared_examples_for :notification_controller do
 
       it "raises ActiveRecord::RecordNotFound" do
         expect {
-          get :index, target_params.merge({ typed_target_param => 0 }), valid_session
+          get_with_compatibility :index, target_params.merge({ typed_target_param => 0 }), valid_session
         }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
@@ -66,7 +66,7 @@ shared_examples_for :notification_controller do
     context "with json as format parameter" do
       before do
         @notification = create(:notification, target: test_target)
-        get :index, target_params.merge({ typed_target_param => test_target, format: :json }), valid_session
+        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
@@ -83,7 +83,7 @@ shared_examples_for :notification_controller do
       context "with unopened as filter" do
         before do
           @notification = create(:notification, target: test_target)
-          get :index, target_params.merge({ typed_target_param => test_target, filter: 'unopened' }), valid_session
+          get_with_compatibility :index, target_params.merge({ typed_target_param => test_target, filter: 'unopened' }), valid_session
         end
 
         it "assigns unopened notification index as @notifications" do
@@ -94,7 +94,7 @@ shared_examples_for :notification_controller do
       context "with opened as filter" do
         before do
           @notification = create(:notification, target: test_target)
-          get :index, target_params.merge({ typed_target_param => test_target, filter: 'opened' }), valid_session
+          get_with_compatibility :index, target_params.merge({ typed_target_param => test_target, filter: 'opened' }), valid_session
         end
 
         it "assigns unopened notification index as @notifications" do
@@ -110,7 +110,7 @@ shared_examples_for :notification_controller do
       end
       context "with 2 as limit" do
         before do
-          get :index, target_params.merge({ typed_target_param => test_target, limit: 2 }), valid_session
+          get_with_compatibility :index, target_params.merge({ typed_target_param => test_target, limit: 2 }), valid_session
         end
 
         it "assigns notification index of size 2 as @notifications" do
@@ -120,7 +120,7 @@ shared_examples_for :notification_controller do
 
       context "with 1 as limit" do
         before do
-          get :index, target_params.merge({ typed_target_param => test_target, limit: 1 }), valid_session
+          get_with_compatibility :index, target_params.merge({ typed_target_param => test_target, limit: 1 }), valid_session
         end
 
         it "assigns notification index of size 1 as @notifications" do
@@ -133,7 +133,7 @@ shared_examples_for :notification_controller do
       context "with false as reload" do
         before do
           @notification = create(:notification, target: test_target)
-          get :index, target_params.merge({ typed_target_param => test_target, reload: false }), valid_session
+          get_with_compatibility :index, target_params.merge({ typed_target_param => test_target, reload: false }), valid_session
         end
     
         it "returns 200 as http status code" do
@@ -156,7 +156,7 @@ shared_examples_for :notification_controller do
       before do
         @notification = create(:notification, target: test_target)
         expect(@notification.opened?).to be_falsey
-        post :open_all, target_params.merge({ typed_target_param => test_target }), valid_session
+        post_with_compatibility :open_all, target_params.merge({ typed_target_param => test_target }), valid_session
       end
 
       it "returns 302 as http status code" do
@@ -181,7 +181,7 @@ shared_examples_for :notification_controller do
         @notification = create(:notification, target: test_target)
         expect(@notification.opened?).to be_falsey
         request.env["HTTP_REFERER"] = root_path
-        post :open_all, target_params.merge({ typed_target_param => test_target }), valid_session
+        post_with_compatibility :open_all, target_params.merge({ typed_target_param => test_target }), valid_session
       end
 
       it "returns 302 as http status code" do
@@ -201,7 +201,7 @@ shared_examples_for :notification_controller do
       before do
         @notification = create(:notification, target: test_target)
         expect(@notification.opened?).to be_falsey
-        xhr :post, :open_all, target_params.merge({ typed_target_param => test_target }), valid_session
+        xhr_with_compatibility :post, :open_all, target_params.merge({ typed_target_param => test_target }), valid_session
       end
 
       it "returns 200 as http status code" do
@@ -220,13 +220,56 @@ shared_examples_for :notification_controller do
         expect(response).to render_template :open_all, format: :js
       end
     end
+
+    context "with filter request parameters" do
+      before 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)
+        expect(@notification_1.opened?).to be_falsey
+        expect(@notification_2.opened?).to be_falsey
+      end
+
+      context "with filtered_by_type request parameters" do
+        it "opens filtered notifications only" do
+          post_with_compatibility :open_all, target_params.merge({ typed_target_param => test_target, 'filtered_by_type' => @notifiable_2.to_class_name }), valid_session
+          expect(@notification_1.reload.opened?).to be_falsey
+          expect(@notification_2.reload.opened?).to be_truthy
+        end
+      end
+  
+      context 'with filtered_by_group_type and :filtered_by_group_id request parameters' do
+        it "opens filtered notifications only" do
+          post_with_compatibility :open_all, target_params.merge({ typed_target_param => test_target, 'filtered_by_group_type' => 'Article', 'filtered_by_group_id' => @group_2.id.to_s }), valid_session
+          expect(@notification_1.reload.opened?).to be_falsey
+          expect(@notification_2.reload.opened?).to be_truthy
+        end
+      end
+
+      context 'with filtered_by_key request parameters' do
+        it "opens filtered notifications only" do
+          post_with_compatibility :open_all, target_params.merge({ typed_target_param => test_target, 'filtered_by_key' => 'key.2' }), valid_session
+          expect(@notification_1.reload.opened?).to be_falsey
+          expect(@notification_2.reload.opened?).to be_truthy
+        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
+          expect(@notification_1.reload.opened?).to be_truthy
+          expect(@notification_2.reload.opened?).to be_truthy
+        end
+      end
+    end
   end
 
   describe "GET #show" do
     context "with id, target_type and (typed_target)_id parameters" do
       before do
         @notification = create(:notification, target: test_target)
-        get :show, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
+        get_with_compatibility :show, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
       end
 
       it "returns 200 as http status code" do
@@ -245,7 +288,7 @@ shared_examples_for :notification_controller do
     context "with wrong id and (typed_target)_id parameters" do
       before do
         @notification = create(:notification, target: create(:user))
-        get :show, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
+        get_with_compatibility :show, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
       end
 
       it "returns 403 as http status code" do
@@ -258,7 +301,7 @@ shared_examples_for :notification_controller do
     context "http direct DELETE request" do
       before do
         @notification = create(:notification, target: test_target)
-        delete :destroy, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
+        delete_with_compatibility :destroy, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
       end
 
       it "returns 302 as http status code" do
@@ -278,7 +321,7 @@ shared_examples_for :notification_controller do
       before do
         @notification = create(:notification, target: test_target)
         request.env["HTTP_REFERER"] = root_path
-        delete :destroy, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
+        delete_with_compatibility :destroy, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
       end
 
       it "returns 302 as http status code" do
@@ -297,7 +340,7 @@ shared_examples_for :notification_controller do
     context "Ajax DELETE request" do
       before do
         @notification = create(:notification, target: test_target)
-        xhr :delete, :destroy, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
+        xhr_with_compatibility :delete, :destroy, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
       end
 
       it "returns 200 as http status code" do
@@ -324,7 +367,7 @@ shared_examples_for :notification_controller do
         before do
           @notification = create(:notification, target: test_target)
           expect(@notification.opened?).to be_falsey
-          post :open, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
+          post_with_compatibility :open, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
         end
 
         it "returns 302 as http status code" do
@@ -345,7 +388,7 @@ shared_examples_for :notification_controller do
           @notification = create(:notification, target: test_target)
           expect(@notification.opened?).to be_falsey
           request.env["HTTP_REFERER"] = root_path
-          post :open, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
+          post_with_compatibility :open, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
         end
 
         it "returns 302 as http status code" do
@@ -366,7 +409,7 @@ shared_examples_for :notification_controller do
           @notification = create(:notification, target: test_target)
           expect(@notification.opened?).to be_falsey
           request.env["HTTP_REFERER"] = root_path
-          xhr :post, :open, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
+          xhr_with_compatibility :post, :open, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
         end
     
         it "returns 200 as http status code" do
@@ -392,17 +435,13 @@ shared_examples_for :notification_controller do
         before do
           @notification = create(:notification, target: test_target)
           expect(@notification.opened?).to be_falsey
-          post :open, target_params.merge({ id: @notification, typed_target_param => test_target, move: true }), valid_session
+          post_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
           expect(response.status).to eq(302)
         end
 
-        it "assigns notification index as @notifications" do
-          expect(assigns(:notifications)).to eq([@notification])
-        end
-
         it "opens the notification" do
           expect(@notification.reload.opened?).to be_truthy
         end
@@ -419,7 +458,7 @@ shared_examples_for :notification_controller do
       context "http direct GET request" do
         before do
           @notification = create(:notification, target: test_target)
-          get :move, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
+          get_with_compatibility :move, target_params.merge({ id: @notification, typed_target_param => test_target }), valid_session
         end
 
         it "returns 302 as http status code" do
@@ -437,7 +476,7 @@ shared_examples_for :notification_controller do
         before do
           @notification = create(:notification, target: test_target)
           expect(@notification.opened?).to be_falsey
-          get :move, target_params.merge({ id: @notification, typed_target_param => test_target, open: true }), valid_session
+          get_with_compatibility :move, target_params.merge({ id: @notification, typed_target_param => test_target, open: true }), valid_session
         end
 
         it "returns 302 as http status code" do
@@ -454,4 +493,38 @@ 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_with_devise_controller_spec.rb

@@ -23,7 +23,7 @@ describe ActivityNotification::NotificationsWithDeviseController, type: :control
     describe "GET #index" do
       before do
         sign_in unauthenticated_user
-        get :index, target_params.merge({ typed_target_param => test_target }), valid_session
+        get_with_compatibility :index, target_params.merge({ typed_target_param => test_target }), valid_session
       end
   
       it "returns 403 as http status code" do
@@ -37,7 +37,7 @@ describe ActivityNotification::NotificationsWithDeviseController, type: :control
 
     describe "GET #index" do
       before do
-        get :index, target_params.merge({ typed_target_param => test_target }), valid_session
+        get_with_compatibility :index, target_params.merge({ typed_target_param => test_target }), valid_session
       end
   
       it "returns 302 as http status code" do
@@ -55,7 +55,7 @@ describe ActivityNotification::NotificationsWithDeviseController, type: :control
 
     describe "GET #index" do
       before do
-        get :index, target_params.merge({ typed_target_param => test_target }), valid_session
+        get_with_compatibility :index, target_params.merge({ typed_target_param => test_target }), valid_session
       end
   
       it "returns 400 as http status code" do
@@ -69,7 +69,7 @@ describe ActivityNotification::NotificationsWithDeviseController, type: :control
 
     describe "GET #index" do
       before do
-        get :index, target_params.merge({ typed_target_param => test_target }), valid_session
+        get_with_compatibility :index, target_params.merge({ typed_target_param => test_target }), valid_session
       end
   
       it "returns 403 as http status code" do
@@ -78,4 +78,14 @@ describe ActivityNotification::NotificationsWithDeviseController, type: :control
     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