From 7efad8ceb66609e2d76dae0009c0e7d6229b531a Mon Sep 17 00:00:00 2001 From: Will Prater Date: Sat, 5 Jul 2008 16:22:48 -0700 Subject: [PATCH] Added view for throw_content spec --- .../abstract_controller/controllers/render.rb | 7 +++++++ .../abstract/render_two_throw_contents/index.erb | 1 + spec/public/abstract_controller/render_spec.rb | 4 ++++ 3 files changed, 12 insertions(+), 0 deletions(-) create mode 100644 spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_two_throw_contents/index.erb diff --git a/spec/public/abstract_controller/controllers/render.rb b/spec/public/abstract_controller/controllers/render.rb index 519debe..ce2436a 100644 --- a/spec/public/abstract_controller/controllers/render.rb +++ b/spec/public/abstract_controller/controllers/render.rb @@ -8,6 +8,13 @@ module Merb::Test::Fixtures self._template_root = File.dirname(__FILE__) / "views" end + class RenderTwoThrowContents < Testing + + def index + render + end + end + class RenderString < Testing def index diff --git a/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_two_throw_contents/index.erb b/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_two_throw_contents/index.erb new file mode 100644 index 0000000..d1fac93 --- /dev/null +++ b/spec/public/abstract_controller/controllers/views/merb/test/fixtures/abstract/render_two_throw_contents/index.erb @@ -0,0 +1 @@ +<% throw_content(:foo, "Foo") %><% throw_content(:foo, "Bar") %><%= catch_content(:foo) %> \ No newline at end of file diff --git a/spec/public/abstract_controller/render_spec.rb b/spec/public/abstract_controller/render_spec.rb index fbeb163..e41a5c0 100644 --- a/spec/public/abstract_controller/render_spec.rb +++ b/spec/public/abstract_controller/render_spec.rb @@ -6,6 +6,10 @@ describe Merb::AbstractController, " rendering plain strings" do Merb.push_path(:layout, File.dirname(__FILE__) / "controllers" / "views" / "layouts") end + it "should render two thrown_contents into same object" do + dispatch_should_make_body("RenderTwoThrowContents", "FooBar") + end + it "should support rendering plain strings with no layout" do dispatch_should_make_body("RenderString", "the index") end -- 1.5.5.1