aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-08-07 03:18:45 -0300
committerYehuda Katz <wycats@gmail.com>2009-08-07 03:18:45 -0300
commit0612fd0f09977dece11a0325a0d7ee07c5cab35c (patch)
treed225dd3b608eca95a388f61bda4225de75654a79 /actionpack/test
parentb3e199f6981b2fbf062fe668ff93b7dc56e98a38 (diff)
downloadrails-0612fd0f09977dece11a0325a0d7ee07c5cab35c.tar.gz
rails-0612fd0f09977dece11a0325a0d7ee07c5cab35c.tar.bz2
rails-0612fd0f09977dece11a0325a0d7ee07c5cab35c.zip
Replace _render_template_with_layout with _render_template since the layout is optional
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/logging_test.rb3
-rw-r--r--actionpack/test/controller/render_test.rb3
2 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/test/controller/logging_test.rb b/actionpack/test/controller/logging_test.rb
index a7ed1b8665..98ffbc3813 100644
--- a/actionpack/test/controller/logging_test.rb
+++ b/actionpack/test/controller/logging_test.rb
@@ -17,9 +17,10 @@ class LoggingTest < ActionController::TestCase
@level = Logger::DEBUG
end
- def method_missing(method, *args)
+ def method_missing(method, *args, &blk)
@logged ||= []
@logged << args.first
+ @logged << blk.call if block_given?
end
end
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index d0fa67c945..947ffa9ea6 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -17,8 +17,9 @@ class MockLogger
@logged = []
end
- def method_missing(method, *args)
+ def method_missing(method, *args, &blk)
@logged << args.first
+ @logged << blk.call if block_given?
end
end