[#302] Protect ApplicationController methods so they are not considered actions

app/controllers/application_controller.rb

@@ -19,6 +19,9 @@ require 'uri'
 require 'cgi'
 
 class ApplicationController < ActionController::Base
+
+  protected
+  
   include Redmine::I18n
 
   layout 'base'

test/functional/application_controller_test.rb

@@ -47,55 +47,55 @@ class ApplicationControllerTest < ActionController::TestCase
   context "test_api_offset_and_limit" do
     context "without params" do
       should "return 0, 25" do
-        assert_equal [0, 25], @controller.api_offset_and_limit({})
+        assert_equal [0, 25], @controller.send(:api_offset_and_limit, {})
       end
     end
     
     context "with limit" do
       should "return 0, limit" do
-        assert_equal [0, 30], @controller.api_offset_and_limit({:limit => 30})
+        assert_equal [0, 30], @controller.send(:api_offset_and_limit, {:limit => 30})
       end
       
       should "not exceed 100" do
-        assert_equal [0, 100], @controller.api_offset_and_limit({:limit => 120})
+        assert_equal [0, 100], @controller.send(:api_offset_and_limit, {:limit => 120})
       end
 
       should "not be negative" do
-        assert_equal [0, 25], @controller.api_offset_and_limit({:limit => -10})
+        assert_equal [0, 25], @controller.send(:api_offset_and_limit, {:limit => -10})
       end
     end
     
     context "with offset" do
       should "return offset, 25" do
-        assert_equal [10, 25], @controller.api_offset_and_limit({:offset => 10})
+        assert_equal [10, 25], @controller.send(:api_offset_and_limit, {:offset => 10})
       end
 
       should "not be negative" do
-        assert_equal [0, 25], @controller.api_offset_and_limit({:offset => -10})
+        assert_equal [0, 25], @controller.send(:api_offset_and_limit, {:offset => -10})
       end
       
       context "and limit" do
         should "return offset, limit" do
-          assert_equal [10, 50], @controller.api_offset_and_limit({:offset => 10, :limit => 50})
+          assert_equal [10, 50], @controller.send(:api_offset_and_limit, {:offset => 10, :limit => 50})
         end
       end
     end
     
     context "with page" do
       should "return offset, 25" do
-        assert_equal [0, 25], @controller.api_offset_and_limit({:page => 1})
-        assert_equal [50, 25], @controller.api_offset_and_limit({:page => 3})
+        assert_equal [0, 25], @controller.send(:api_offset_and_limit, {:page => 1})
+        assert_equal [50, 25], @controller.send(:api_offset_and_limit, {:page => 3})
       end
 
       should "not be negative" do
-        assert_equal [0, 25], @controller.api_offset_and_limit({:page => 0})
-        assert_equal [0, 25], @controller.api_offset_and_limit({:page => -2})
+        assert_equal [0, 25], @controller.send(:api_offset_and_limit, {:page => 0})
+        assert_equal [0, 25], @controller.send(:api_offset_and_limit, {:page => -2})
       end
       
       context "and limit" do
         should "return offset, limit" do
-          assert_equal [0, 100], @controller.api_offset_and_limit({:page => 1, :limit => 100})
-          assert_equal [200, 100], @controller.api_offset_and_limit({:page => 3, :limit => 100})
+          assert_equal [0, 100], @controller.send(:api_offset_and_limit, {:page => 1, :limit => 100})
+          assert_equal [200, 100], @controller.send(:api_offset_and_limit, {:page => 3, :limit => 100})
         end
       end
     end