Fixing pending tests and fixed some formats / partial rendering semantics

4 files changed, 3 insertions, 5 deletions

diff --git a/actionpack/lib/action_view/template/handlers/rjs.rb b/actionpack/lib/action_view/template/handlers/rjs.rb
index a36744c2b7..b1d15dc209 100644
--- a/actionpack/lib/action_view/template/handlers/rjs.rb
+++ b/actionpack/lib/action_view/template/handlers/rjs.rb
@@ -6,7 +6,6 @@ module ActionView
       self.default_format = Mime::JS
 
       def compile(template)
-        "@formats = [:html];" +
         "controller.response.content_type ||= Mime::JS;" +
           "update_page do |page|;#{template.source}\nend"
       end
diff --git a/actionpack/lib/action_view/template/path.rb b/actionpack/lib/action_view/template/path.rb
index 478bf96c9a..c3837a9f07 100644
--- a/actionpack/lib/action_view/template/path.rb
+++ b/actionpack/lib/action_view/template/path.rb
@@ -47,8 +47,7 @@ module ActionView
       
       def formats_glob
         @formats_glob ||= begin
-          formats = Mime::SET.map { |m| m.symbol }
-          '{' + formats.map { |l| ".#{l}," }.join + '}'
+          '{' + Mime::SET.symbols.map { |l| ".#{l}," }.join + '}'
         end
       end
       
diff --git a/actionpack/lib/action_view/template/template.rb b/actionpack/lib/action_view/template/template.rb
index e7ea42c2eb..53aaa3dded 100644
--- a/actionpack/lib/action_view/template/template.rb
+++ b/actionpack/lib/action_view/template/template.rb
@@ -20,7 +20,7 @@ module ActionView
         handler.respond_to?(:default_format) ? handler.default_format.to_sym.to_s : "html"
       end
       @mime_type = Mime::Type.lookup_by_extension(format.to_s)
-      @details[:formats] = Array.wrap(format && format.to_sym)
+      @details[:formats] = Array.wrap(format.to_sym)
     end
     
     def render(view, locals, &blk)
diff --git a/actionpack/lib/action_view/template/text.rb b/actionpack/lib/action_view/template/text.rb
index fd57b1677e..81944ff546 100644
--- a/actionpack/lib/action_view/template/text.rb
+++ b/actionpack/lib/action_view/template/text.rb
@@ -3,7 +3,7 @@ module ActionView #:nodoc:
 
     def initialize(string, content_type = Mime[:html])
       super(string.to_s)
-      @content_type = Mime[content_type]
+      @content_type = Mime[content_type] || content_type
     end
 
     def details