diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-20 18:14:41 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-20 18:14:41 -0300 |
| commit | 066907d1cb3e7e390287dff9c324a4091d76a97b (patch) | |
| tree | b691a6eddddc4b6af23754165a5329bc7c70bd40 /actionpack | |
| parent | f73c52c3bc6b67c68726b789131259bb44dbf958 (diff) | |
| parent | 0dfa6cb97c77775164f8009d6be82e697bd25add (diff) | |
| download | rails-066907d1cb3e7e390287dff9c324a4091d76a97b.tar.gz rails-066907d1cb3e7e390287dff9c324a4091d76a97b.tar.bz2 rails-066907d1cb3e7e390287dff9c324a4091d76a97b.zip | |
Merge pull request #9802 from newsline/fix-broken-action-missing
Fix missing action_missing
Conflicts:
actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/metal/hide_actions.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/base_test.rb | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/hide_actions.rb b/actionpack/lib/action_controller/metal/hide_actions.rb index 2aa6b7adaf..af36ffa240 100644 --- a/actionpack/lib/action_controller/metal/hide_actions.rb +++ b/actionpack/lib/action_controller/metal/hide_actions.rb @@ -27,7 +27,7 @@ module ActionController 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 diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb index 9b42e7631f..d4f18d55a6 100644 --- a/actionpack/test/controller/base_test.rb +++ b/actionpack/test/controller/base_test.rb @@ -68,6 +68,12 @@ class RecordIdentifierWithoutDeprecationController < ActionController::Base include ActionView::RecordIdentifier end +class ActionMissingController < ActionController::Base + def action_missing(action) + render :text => "Response for #{action}" + end +end + class ControllerClassTests < ActiveSupport::TestCase def test_controller_path @@ -186,6 +192,12 @@ class PerformActionTest < ActionController::TestCase 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 |