aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures/content_type
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-09-19 12:50:14 -0500
committerJoshua Peek <josh@joshpeek.com>2009-09-19 12:50:14 -0500
commit12b3799448119a2cd5732670ad7e3cc9ce5707d0 (patch)
treebeef7879935a3a597cb818d890ea83f491c0e318 /actionpack/test/fixtures/content_type
parentf05b1e5eb1829be47bf9581ca6666229e01d597c (diff)
downloadrails-12b3799448119a2cd5732670ad7e3cc9ce5707d0.tar.gz
rails-12b3799448119a2cd5732670ad7e3cc9ce5707d0.tar.bz2
rails-12b3799448119a2cd5732670ad7e3cc9ce5707d0.zip
Avoid conflicts with another ContentTypeController used in testing
Diffstat (limited to 'actionpack/test/fixtures/content_type')
-rw-r--r--actionpack/test/fixtures/content_type/render_default_content_types_for_respond_to.xml.erb1
-rw-r--r--actionpack/test/fixtures/content_type/render_default_for_rhtml.rhtml1
-rw-r--r--actionpack/test/fixtures/content_type/render_default_for_rjs.rjs1
-rw-r--r--actionpack/test/fixtures/content_type/render_default_for_rxml.rxml1
4 files changed, 0 insertions, 4 deletions
diff --git a/actionpack/test/fixtures/content_type/render_default_content_types_for_respond_to.xml.erb b/actionpack/test/fixtures/content_type/render_default_content_types_for_respond_to.xml.erb
deleted file mode 100644
index 25dc746886..0000000000
--- a/actionpack/test/fixtures/content_type/render_default_content_types_for_respond_to.xml.erb
+++ /dev/null
@@ -1 +0,0 @@
-<hello>world</hello> \ No newline at end of file
diff --git a/actionpack/test/fixtures/content_type/render_default_for_rhtml.rhtml b/actionpack/test/fixtures/content_type/render_default_for_rhtml.rhtml
deleted file mode 100644
index c7926d48bb..0000000000
--- a/actionpack/test/fixtures/content_type/render_default_for_rhtml.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-<%= 'hello world!' %> \ No newline at end of file
diff --git a/actionpack/test/fixtures/content_type/render_default_for_rjs.rjs b/actionpack/test/fixtures/content_type/render_default_for_rjs.rjs
deleted file mode 100644
index 8d614d04ad..0000000000
--- a/actionpack/test/fixtures/content_type/render_default_for_rjs.rjs
+++ /dev/null
@@ -1 +0,0 @@
-page.alert 'hello world!' \ No newline at end of file
diff --git a/actionpack/test/fixtures/content_type/render_default_for_rxml.rxml b/actionpack/test/fixtures/content_type/render_default_for_rxml.rxml
deleted file mode 100644
index 598d62e2fc..0000000000
--- a/actionpack/test/fixtures/content_type/render_default_for_rxml.rxml
+++ /dev/null
@@ -1 +0,0 @@
-xml.p "Hello world!" \ No newline at end of file