From 12b3799448119a2cd5732670ad7e3cc9ce5707d0 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Sat, 19 Sep 2009 12:50:14 -0500
Subject: [PATCH] Avoid conflicts with another ContentTypeController used in
 testing

---
 actionpack/test/controller/content_type_test.rb   | 15 +++++++--------
 ...r_default_content_types_for_respond_to.xml.erb |  0
 .../render_default_for_rhtml.rhtml                |  0
 .../render_default_for_rjs.rjs                    |  0
 .../render_default_for_rxml.rxml                  |  0
 5 files changed, 7 insertions(+), 8 deletions(-)
 rename actionpack/test/fixtures/{content_type => old_content_type}/render_default_content_types_for_respond_to.xml.erb (100%)
 rename actionpack/test/fixtures/{content_type => old_content_type}/render_default_for_rhtml.rhtml (100%)
 rename actionpack/test/fixtures/{content_type => old_content_type}/render_default_for_rjs.rjs (100%)
 rename actionpack/test/fixtures/{content_type => old_content_type}/render_default_for_rxml.rxml (100%)

diff --git a/actionpack/test/controller/content_type_test.rb b/actionpack/test/controller/content_type_test.rb
index c249788c67f0b..e5ffe20ecc24a 100644
--- a/actionpack/test/controller/content_type_test.rb
+++ b/actionpack/test/controller/content_type_test.rb
@@ -1,6 +1,6 @@
 require 'abstract_unit'
 
-class ContentTypeController < ActionController::Base
+class OldContentTypeController < ActionController::Base
   # :ported:
   def render_content_type_from_body
     response.content_type = Mime::RSS
@@ -56,7 +56,7 @@ def rescue_action(e) raise end
 end
 
 class ContentTypeTest < ActionController::TestCase
-  tests ContentTypeController
+  tests OldContentTypeController
 
   def setup
     super
@@ -73,11 +73,11 @@ def test_render_defaults
   end
 
   def test_render_changed_charset_default
-    ContentTypeController.default_charset = "utf-16"
+    OldContentTypeController.default_charset = "utf-16"
     get :render_defaults
     assert_equal "utf-16", @response.charset
     assert_equal Mime::HTML, @response.content_type
-    ContentTypeController.default_charset = "utf-8"
+    OldContentTypeController.default_charset = "utf-8"
   end
 
   # :ported:
@@ -109,12 +109,12 @@ def test_nil_charset_from_body
   end
 
   def test_nil_default_for_rhtml
-    ContentTypeController.default_charset = nil
+    OldContentTypeController.default_charset = nil
     get :render_default_for_rhtml
     assert_equal Mime::HTML, @response.content_type
     assert_nil @response.charset, @response.headers.inspect
   ensure
-    ContentTypeController.default_charset = "utf-8"
+    OldContentTypeController.default_charset = "utf-8"
   end
 
   def test_default_for_rhtml
@@ -143,8 +143,7 @@ def test_change_for_rxml
 end
 
 class AcceptBasedContentTypeTest < ActionController::TestCase
-
-  tests ContentTypeController
+  tests OldContentTypeController
 
   def setup
     super
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
similarity index 100%
rename from actionpack/test/fixtures/content_type/render_default_content_types_for_respond_to.xml.erb
rename to 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
similarity index 100%
rename from actionpack/test/fixtures/content_type/render_default_for_rhtml.rhtml
rename to 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
similarity index 100%
rename from actionpack/test/fixtures/content_type/render_default_for_rjs.rjs
rename to 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
similarity index 100%
rename from actionpack/test/fixtures/content_type/render_default_for_rxml.rxml
rename to actionpack/test/fixtures/old_content_type/render_default_for_rxml.rxml