diff options
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/abstract_controller/abstract_controller_test.rb | 4 | ||||
-rw-r--r-- | actionpack/test/abstract_controller/layouts_test.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/test/abstract_controller/abstract_controller_test.rb b/actionpack/test/abstract_controller/abstract_controller_test.rb index 6d33888821..8763ded57e 100644 --- a/actionpack/test/abstract_controller/abstract_controller_test.rb +++ b/actionpack/test/abstract_controller/abstract_controller_test.rb @@ -134,7 +134,7 @@ module AbstractController self.class.layout(formats) end - def render_to_string(options = {}) + def render_to_body(options = {}) options[:_layout] = options[:layout] || _layout super end @@ -223,4 +223,4 @@ module AbstractController end end -end
\ No newline at end of file +end diff --git a/actionpack/test/abstract_controller/layouts_test.rb b/actionpack/test/abstract_controller/layouts_test.rb index 5dd68ec28e..3d4570bfef 100644 --- a/actionpack/test/abstract_controller/layouts_test.rb +++ b/actionpack/test/abstract_controller/layouts_test.rb @@ -23,7 +23,7 @@ module AbstractControllerTests def controller_path() self.class.controller_path end - def render_to_string(options) + def render_to_body(options) options[:_layout] = _default_layout super end @@ -229,4 +229,4 @@ module AbstractControllerTests end end end -end
\ No newline at end of file +end |