diff options
| author | Gonçalo Silva <goncalossilva@gmail.com> | 2011-04-03 02:02:35 +0100 |
|---|---|---|
| committer | Gonçalo Silva <goncalossilva@gmail.com> | 2011-04-03 02:02:35 +0100 |
| commit | 5b2b513742ad909ede8956d6021c0bc521c08ddf (patch) | |
| tree | 31c1367a433772f9630d034148d005fac95d3051 /actionpack/test/fixtures | |
| parent | 677ce63d92b7725b0a11facddc1ba95f50f865df (diff) | |
| parent | 99da42c29944beed0cb9e892ae90bfeb2590c57e (diff) | |
| download | rails-5b2b513742ad909ede8956d6021c0bc521c08ddf.tar.gz rails-5b2b513742ad909ede8956d6021c0bc521c08ddf.tar.bz2 rails-5b2b513742ad909ede8956d6021c0bc521c08ddf.zip | |
Merge branch 'master' of https://github.com/rails/rails into performance_test
Diffstat (limited to 'actionpack/test/fixtures')
| -rw-r--r-- | actionpack/test/fixtures/respond_with/using_invalid_resource_with_template.xml.erb | 1 | ||||
| -rw-r--r-- | actionpack/test/fixtures/respond_with/using_options_with_template.xml.erb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/respond_with/using_invalid_resource_with_template.xml.erb b/actionpack/test/fixtures/respond_with/using_invalid_resource_with_template.xml.erb new file mode 100644 index 0000000000..bf5869ed22 --- /dev/null +++ b/actionpack/test/fixtures/respond_with/using_invalid_resource_with_template.xml.erb @@ -0,0 +1 @@ +<content>I should not be displayed</content>
\ No newline at end of file diff --git a/actionpack/test/fixtures/respond_with/using_options_with_template.xml.erb b/actionpack/test/fixtures/respond_with/using_options_with_template.xml.erb new file mode 100644 index 0000000000..b313017913 --- /dev/null +++ b/actionpack/test/fixtures/respond_with/using_options_with_template.xml.erb @@ -0,0 +1 @@ +<customer-name><%= @customer.name %></customer-name>
\ No newline at end of file |