diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-07-16 17:45:28 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-07-16 17:45:28 -0500 |
| commit | 73ade4fe100ae7f48c5f95dcdf7067f6a0cd51fa (patch) | |
| tree | 2f1601292978a844226e16f3cef428ed760b9eb5 /actionpack/test/controller/layout_test.rb | |
| parent | 8fe01de2e8753d045408ecde3178ab4e9192bf9a (diff) | |
| parent | 90c930f45c5c6766306929241462ffff8f67b86e (diff) | |
| download | rails-73ade4fe100ae7f48c5f95dcdf7067f6a0cd51fa.tar.gz rails-73ade4fe100ae7f48c5f95dcdf7067f6a0cd51fa.tar.bz2 rails-73ade4fe100ae7f48c5f95dcdf7067f6a0cd51fa.zip | |
Resolved conflict
Diffstat (limited to 'actionpack/test/controller/layout_test.rb')
| -rw-r--r-- | actionpack/test/controller/layout_test.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb index 3dc311b78a..92b6aa4f2f 100644 --- a/actionpack/test/controller/layout_test.rb +++ b/actionpack/test/controller/layout_test.rb @@ -34,8 +34,8 @@ end class MabView < ActionView::TemplateHandler def initialize(view) end - - def render(template) + + def render(template, local_assigns) template.source end end @@ -63,6 +63,7 @@ class LayoutAutoDiscoveryTest < Test::Unit::TestCase end def test_third_party_template_library_auto_discovers_layout + ThirdPartyTemplateLibraryController.view_paths.reload! @controller = ThirdPartyTemplateLibraryController.new get :hello assert_equal 'layouts/third_party_template_library', @controller.active_layout |