aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-08-10 08:57:44 -0400
committerYehuda Katz <wycats@gmail.com>2009-08-11 15:03:53 -0700
commit9e62d6d1c0c53e8b03c9659500e2b5549a1fd2ec (patch)
tree6a66da1a90a714eff5fb1be3e9227e75eee1976e /actionpack/test/fixtures
parent945a7df9f8ad2986ba2351b331a9f7225dfaf61c (diff)
downloadrails-9e62d6d1c0c53e8b03c9659500e2b5549a1fd2ec.tar.gz
rails-9e62d6d1c0c53e8b03c9659500e2b5549a1fd2ec.tar.bz2
rails-9e62d6d1c0c53e8b03c9659500e2b5549a1fd2ec.zip
Tentatively accept the ":as or :object, but not both" solution
Diffstat (limited to 'actionpack/test/fixtures')
-rw-r--r--actionpack/test/fixtures/test/_customer_with_var.erb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/fixtures/test/_customer_with_var.erb b/actionpack/test/fixtures/test/_customer_with_var.erb
index 3379246b7e..c28824936b 100644
--- a/actionpack/test/fixtures/test/_customer_with_var.erb
+++ b/actionpack/test/fixtures/test/_customer_with_var.erb
@@ -1 +1 @@
-<%= customer.name %> <%= object.name %> <%= customer_with_var.name %> \ No newline at end of file
+<%= customer.name %> <%= customer.name %> <%= customer_with_var.name %> \ No newline at end of file