aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/base_test.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2009-12-27 14:44:21 -0800
committerDavid Heinemeier Hansson <david@loudthinking.com>2009-12-27 14:44:21 -0800
commit5012a1558dd1483df525f1fac1e649e089be886a (patch)
tree983136a50ee7bb135768038e33c9c226a3a167ed /actionpack/test/controller/base_test.rb
parent1cd949006a419807d5ae3400442942b752780ca2 (diff)
parent12e43494a748e0144195be12dc19161cc3e4d39f (diff)
downloadrails-5012a1558dd1483df525f1fac1e649e089be886a.tar.gz
rails-5012a1558dd1483df525f1fac1e649e089be886a.tar.bz2
rails-5012a1558dd1483df525f1fac1e649e089be886a.zip
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/test/controller/base_test.rb')
-rw-r--r--actionpack/test/controller/base_test.rb7
1 files changed, 0 insertions, 7 deletions
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index 8f8ada8d8c..65118f9bc9 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -158,13 +158,6 @@ class PerformActionTest < ActionController::TestCase
assert_raise(ActionController::UnknownAction) { get :hidden_action }
assert_raise(ActionController::UnknownAction) { get :another_hidden_action }
end
-
- def test_namespaced_action_should_log_module_name
- use_controller Submodule::ContainedNonEmptyController
- @controller.logger = MockLogger.new
- get :public_action
- assert_match /Processing\sSubmodule::ContainedNonEmptyController#public_action/, @controller.logger.logged[1]
- end
end
class DefaultUrlOptionsTest < ActionController::TestCase