From 3146b339b2741c080d50df145eef7456163dff0f Mon Sep 17 00:00:00 2001 From: Nathan Weizenbaum Date: Sat, 4 Jul 2009 19:07:41 -0700 Subject: [PATCH] [Haml] Don't test for the now-deprecated @content_for_layout var. --- test/haml/results/content_for_layout.xhtml | 3 --- test/haml/template_test.rb | 2 +- test/haml/templates/content_for_layout.haml | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/test/haml/results/content_for_layout.xhtml b/test/haml/results/content_for_layout.xhtml index 45d4d58a..63bbd229 100644 --- a/test/haml/results/content_for_layout.xhtml +++ b/test/haml/results/content_for_layout.xhtml @@ -2,9 +2,6 @@ -
- Lorem ipsum dolor sit amet -
Lorem ipsum dolor sit amet
diff --git a/test/haml/template_test.rb b/test/haml/template_test.rb index 637f5b66..03012be8 100644 --- a/test/haml/template_test.rb +++ b/test/haml/template_test.rb @@ -140,7 +140,7 @@ class TemplateTest < Test::Unit::TestCase end def test_action_view_templates_render_correctly - @base.instance_variable_set("@content_for_layout", 'Lorem ipsum dolor sit amet') + @base.content_for(:layout) {'Lorem ipsum dolor sit amet'} assert_renders_correctly 'content_for_layout' end diff --git a/test/haml/templates/content_for_layout.haml b/test/haml/templates/content_for_layout.haml index fda84a57..e9d7e6d6 100644 --- a/test/haml/templates/content_for_layout.haml +++ b/test/haml/templates/content_for_layout.haml @@ -2,8 +2,6 @@ %html %head %body - #content - = @content_for_layout #yieldy = yield :layout #nosym