stephancom
diff --git a/‎lib/active_admin/application.rb
Lines changed: 2 additions & 1 deletion b/‎lib/active_admin/application.rb
Lines changed: 2 additions & 1 deletion
diff --git a/‎spec/unit/controller_filters_spec.rb
Lines changed: 25 additions & 28 deletions b/‎spec/unit/controller_filters_spec.rb
Lines changed: 25 additions & 28 deletions
@@ -216,7 +216,8 @@ def routes(rails_router)
     # Example usage:
     #   ActiveAdmin.before_filter :authenticate_admin!
-    %w(before_filter skip_before_filter after_filter skip_after_filter around_filter skip_filter).each do |name|
+    AbstractController::Callbacks::ClassMethods.public_instance_methods.
+      select { |m| m.match(/(filter|action)/) }.each do |name|
       define_method name do |*args, &block|
         controllers_for_filters.each do |controller|
           controller.public_send name, *args, &block
 
@@ -12,33 +12,30 @@
     ]
   end
 
-  it 'before_filter' do
-    controllers.each{ |c| expect(c).to receive(:before_filter).and_return(true) }
-    application.before_filter :my_filter, only: :show
-  end
-
-  it 'skip_before_filter' do
-    controllers.each{ |c| expect(c).to receive(:skip_before_filter).and_return(true) }
-    application.skip_before_filter :my_filter, only: :show
-  end
-
-  it 'after_filter' do
-    controllers.each{ |c| expect(c).to receive(:after_filter).and_return(true) }
-    application.after_filter :my_filter, only: :show
-  end
-
-  it 'skip after_filter' do
-    controllers.each{ |c| expect(c).to receive(:skip_after_filter).and_return(true) }
-    application.skip_after_filter :my_filter, only: :show
-  end
-
-  it 'around_filter' do
-    controllers.each{ |c| expect(c).to receive(:around_filter).and_return(true) }
-    application.around_filter :my_filter, only: :show
-  end
-
-  it 'skip_filter' do
-    controllers.each{ |c| expect(c).to receive(:skip_filter).and_return(true) }
-    application.skip_filter :my_filter, only: :show
+  expected_actions = (
+    prefixes = %w(skip append prepend) << nil
+    positions = %w(before around after)
+    suffixes = %w(filter)
+    base = %w(skip_filter)
+    if Rails::VERSION::MAJOR >= 4
+      suffixes += %w(action)
+      base += %w(skip_action_callback)
+    end
+
+    prefixes.each_with_object(base) do |prefix, stack|
+      positions.each do |position|
+        suffixes.each do |suffix|
+          stack << [prefix, position, suffix].compact.join("_").to_sym
+        end
+      end
+    end
+  )
+
+  expected_actions.each do |action|
+    it action do
+      args = [:my_filter, { only: :show }]
+      controllers.each { |c| expect(c).to receive(action).with(args) }
+      application.public_send action, args
+    end
   end
 end