aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-07-27 12:06:19 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-07-27 12:06:19 +0000
commitd9033bbb28f4acce74dcd2a1c1c5536b7a1917da (patch)
treed85bd213dba175cf180b3c284e615359787e8096
parenteec7cc004bebd7f7d70fa5e7106e46980d945e5f (diff)
downloadrails-d9033bbb28f4acce74dcd2a1c1c5536b7a1917da.tar.gz
rails-d9033bbb28f4acce74dcd2a1c1c5536b7a1917da.tar.bz2
rails-d9033bbb28f4acce74dcd2a1c1c5536b7a1917da.zip
Demonstrate breakage better
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1941 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--actionpack/test/controller/new_render_test.rb4
-rw-r--r--actionpack/test/fixtures/test/_customer.rhtml2
-rw-r--r--actionpack/test/fixtures/test/_customer_greeting.rhtml1
3 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/test/controller/new_render_test.rb b/actionpack/test/controller/new_render_test.rb
index 6d2aa2cd2d..da8b2b2a46 100644
--- a/actionpack/test/controller/new_render_test.rb
+++ b/actionpack/test/controller/new_render_test.rb
@@ -91,7 +91,7 @@ class NewRenderTestController < ActionController::Base
end
def partial_collection_with_locals
- render :partial => "customer", :collection => [ Customer.new("david"), Customer.new("mary") ], :locals => { :extra => ", fun!" }
+ render :partial => "customer_greeting", :collection => [ Customer.new("david"), Customer.new("mary") ], :locals => { :greeting => "Bonjour" }
end
def hello_in_a_string
@@ -340,6 +340,6 @@ class NewRenderTest < Test::Unit::TestCase
def test_partial_collection_with_locals
get :partial_collection_with_locals
- assert_equal "Hello: david, fun!Hello: mary, fun!", @response.body
+ assert_equal "Bonjour: davidBonjour: mary", @response.body
end
end \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_customer.rhtml b/actionpack/test/fixtures/test/_customer.rhtml
index fc2d3f26b2..872d8c44e6 100644
--- a/actionpack/test/fixtures/test/_customer.rhtml
+++ b/actionpack/test/fixtures/test/_customer.rhtml
@@ -1 +1 @@
-Hello: <%= customer.name %><%= extra %> \ No newline at end of file
+Hello: <%= customer.name %> \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_customer_greeting.rhtml b/actionpack/test/fixtures/test/_customer_greeting.rhtml
new file mode 100644
index 0000000000..6acbcb20c4
--- /dev/null
+++ b/actionpack/test/fixtures/test/_customer_greeting.rhtml
@@ -0,0 +1 @@
+<%= greeting %>: <%= customer_greeting.name %> \ No newline at end of file