aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2005-07-05 18:21:26 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2005-07-05 18:21:26 +0000
commit8a2fec8d31c142caad04d66d774c49c23b12f8b5 (patch)
tree87e8b7a48b1d339381660c869ee52864ca14a7fb
parent607ce7f0a05af639d061e6ba2e5fd038e408bbd4 (diff)
downloadrails-8a2fec8d31c142caad04d66d774c49c23b12f8b5.tar.gz
rails-8a2fec8d31c142caad04d66d774c49c23b12f8b5.tar.bz2
rails-8a2fec8d31c142caad04d66d774c49c23b12f8b5.zip
r2874@asus: jeremy | 2005-07-05 16:13:39 -0700
Unit test for Ticket #1614. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1717 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionpack/test/controller/new_render_test.rb5
-rw-r--r--actionpack/test/controller/render_test.rb4
-rw-r--r--actionpack/test/fixtures/test/list.rhtml2
3 files changed, 6 insertions, 5 deletions
diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb
index 461da8dbc0..2035af3168 100644
--- a/actionpack/test/controller/new_render_test.rb
+++ b/actionpack/test/controller/new_render_test.rb
@@ -69,6 +69,7 @@ class NewRenderTestController < ActionController::Base
end
def partials_list
+ @test_unchanged = 'hello'
@customers = [ Customer.new("david"), Customer.new("mary") ]
render :action => "list"
end
@@ -222,7 +223,7 @@ class NewRenderTest < Test::Unit::TestCase
def test_partials_list
get :partials_list
- assert_equal "Hello: davidHello: mary", @response.body
+ assert_equal "goodbyeHello: davidHello: marygoodbye\n", @response.body
end
def test_partial_only
@@ -237,7 +238,7 @@ class NewRenderTest < Test::Unit::TestCase
def test_render_to_string
get :hello_in_a_string
- assert_equal "How's there? Hello: davidHello: mary", @response.body
+ assert_equal "How's there? goodbyeHello: davidHello: marygoodbye\n", @response.body
end
def test_nested_rendering
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 2dab50c9df..136a6990e6 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -174,7 +174,7 @@ class RenderTest < Test::Unit::TestCase
def test_partials_list
@request.action = "partials_list"
- assert_equal "Hello: davidHello: mary", process_request.body
+ assert_equal "goodbyeHello: davidHello: marygoodbye\n", process_request.body
end
def test_partial_only
@@ -184,7 +184,7 @@ class RenderTest < Test::Unit::TestCase
def test_render_to_string
@request.action = "hello_in_a_string"
- assert_equal "How's there? Hello: davidHello: mary", process_request.body
+ assert_equal "How's there? goodbyeHello: davidHello: marygoodbye\n", process_request.body
end
def test_nested_rendering
diff --git a/actionpack/test/fixtures/test/list.rhtml b/actionpack/test/fixtures/test/list.rhtml
index 39e2cad966..cd0ab45d26 100644
--- a/actionpack/test/fixtures/test/list.rhtml
+++ b/actionpack/test/fixtures/test/list.rhtml
@@ -1 +1 @@
-<%= render_collection_of_partials "customer", @customers %> \ No newline at end of file
+<%= @test_unchanged = 'goodbye' %><%= render_collection_of_partials "customer", @customers %><%= @test_unchanged %>