Permalink
Browse files

Merge pull request #9802 from newsline/fix-broken-action-missing

Fix missing action_missing

Conflicts:
	actionpack/CHANGELOG.md

Conflicts:
	actionpack/test/controller/base_test.rb

Fixes #9799
  • Loading branch information...
1 parent 7e8a74d commit 2c8f34995378e4a18711cf5f947e8465227d3748 @rafaelfranca rafaelfranca committed Mar 20, 2013
View
@@ -1,5 +1,10 @@
## unreleased ##
+* Fixed `ActionController#action_missing` not being called.
+ Fixes #9799.
+
+ *Janko Luin*
+
* `ActiveSupport::NumberHelper#number_to_human` returns the number unaltered when
the units hash does not contain the needed key, e.g. when the number provided is less
than the largest key proivided.
@@ -28,7 +28,7 @@ def hide_action(*args)
end
def visible_action?(action_name)
- action_methods.include?(action_name)
+ not hidden_actions.include?(action_name)
end
# Overrides AbstractController::Base#action_methods to remove any methods
@@ -86,6 +86,12 @@ def url_options
class RecordIdentifierController < ActionController::Base
end
+class ActionMissingController < ActionController::Base
+ def action_missing(action)
+ render :text => "Response for #{action}"
+ end
+end
+
class ControllerClassTests < ActiveSupport::TestCase
def test_controller_path
@@ -196,6 +202,12 @@ def test_get_on_hidden_should_fail
assert_raise(AbstractController::ActionNotFound) { get :hidden_action }
assert_raise(AbstractController::ActionNotFound) { get :another_hidden_action }
end
+
+ def test_action_missing_should_work
+ use_controller ActionMissingController
+ get :arbitrary_action
+ assert_equal "Response for arbitrary_action", @response.body
+ end
end
class UrlOptionsTest < ActionController::TestCase

0 comments on commit 2c8f349

Please sign in to comment.