diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-09-19 12:50:14 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-09-19 12:50:14 -0500 |
commit | 12b3799448119a2cd5732670ad7e3cc9ce5707d0 (patch) | |
tree | beef7879935a3a597cb818d890ea83f491c0e318 /actionpack/test/fixtures | |
parent | f05b1e5eb1829be47bf9581ca6666229e01d597c (diff) | |
download | rails-12b3799448119a2cd5732670ad7e3cc9ce5707d0.tar.gz rails-12b3799448119a2cd5732670ad7e3cc9ce5707d0.tar.bz2 rails-12b3799448119a2cd5732670ad7e3cc9ce5707d0.zip |
Avoid conflicts with another ContentTypeController used in testing
Diffstat (limited to 'actionpack/test/fixtures')
-rw-r--r-- | actionpack/test/fixtures/old_content_type/render_default_content_types_for_respond_to.xml.erb (renamed from actionpack/test/fixtures/content_type/render_default_content_types_for_respond_to.xml.erb) | 0 | ||||
-rw-r--r-- | actionpack/test/fixtures/old_content_type/render_default_for_rhtml.rhtml (renamed from actionpack/test/fixtures/content_type/render_default_for_rhtml.rhtml) | 0 | ||||
-rw-r--r-- | actionpack/test/fixtures/old_content_type/render_default_for_rjs.rjs (renamed from actionpack/test/fixtures/content_type/render_default_for_rjs.rjs) | 0 | ||||
-rw-r--r-- | actionpack/test/fixtures/old_content_type/render_default_for_rxml.rxml (renamed from actionpack/test/fixtures/content_type/render_default_for_rxml.rxml) | 0 |
4 files changed, 0 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/content_type/render_default_content_types_for_respond_to.xml.erb b/actionpack/test/fixtures/old_content_type/render_default_content_types_for_respond_to.xml.erb index 25dc746886..25dc746886 100644 --- a/actionpack/test/fixtures/content_type/render_default_content_types_for_respond_to.xml.erb +++ b/actionpack/test/fixtures/old_content_type/render_default_content_types_for_respond_to.xml.erb diff --git a/actionpack/test/fixtures/content_type/render_default_for_rhtml.rhtml b/actionpack/test/fixtures/old_content_type/render_default_for_rhtml.rhtml index c7926d48bb..c7926d48bb 100644 --- a/actionpack/test/fixtures/content_type/render_default_for_rhtml.rhtml +++ b/actionpack/test/fixtures/old_content_type/render_default_for_rhtml.rhtml diff --git a/actionpack/test/fixtures/content_type/render_default_for_rjs.rjs b/actionpack/test/fixtures/old_content_type/render_default_for_rjs.rjs index 8d614d04ad..8d614d04ad 100644 --- a/actionpack/test/fixtures/content_type/render_default_for_rjs.rjs +++ b/actionpack/test/fixtures/old_content_type/render_default_for_rjs.rjs diff --git a/actionpack/test/fixtures/content_type/render_default_for_rxml.rxml b/actionpack/test/fixtures/old_content_type/render_default_for_rxml.rxml index 598d62e2fc..598d62e2fc 100644 --- a/actionpack/test/fixtures/content_type/render_default_for_rxml.rxml +++ b/actionpack/test/fixtures/old_content_type/render_default_for_rxml.rxml |