Fixing pending tests and fixed some formats / partial rendering semantics

5 files changed, 52 insertions, 45 deletions

diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index c3d7b0778d..feb2f81cc1 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -165,26 +165,10 @@ class LayoutSetInResponseTest < ActionController::TestCase
     assert_nil @controller.template.layout
   end
 
-  for_tag(:old_base) do
-    # exempt_from_layout is deprecated
-    def test_exempt_from_layout_honored_by_render_template
-      ActionController::Base.exempt_from_layout :erb
-      @controller = RenderWithTemplateOptionController.new
-
-      get :hello
-      assert_equal "alt/hello.rhtml", @response.body.strip
-
-    ensure
-      ActionController::Base.exempt_from_layout.delete(ERB)
-    end
-  end
-
   def test_layout_is_picked_from_the_controller_instances_view_path
-    pending do
-      @controller = PrependsViewPathController.new
-      get :hello
-      assert_equal 'layouts/alt', @controller.template.layout
-    end
+    @controller = PrependsViewPathController.new
+    get :hello
+    assert @controller.template.layout =~ /layouts\/alt\.\w+/
   end
 
   def test_absolute_pathed_layout
diff --git a/actionpack/test/dispatch/mime_type_test.rb b/actionpack/test/dispatch/mime_type_test.rb
index 27bdd10ee5..4ea0fedb8f 100644
--- a/actionpack/test/dispatch/mime_type_test.rb
+++ b/actionpack/test/dispatch/mime_type_test.rb
@@ -56,7 +56,7 @@ class MimeTypeTest < ActiveSupport::TestCase
 
   test "type convenience methods" do
     # Don't test Mime::ALL, since it Mime::ALL#html? == true
-    types = Mime::SET.to_a.map{|m| m.to_sym }.uniq - [:all]
+    types = Mime::SET.symbols.uniq - [:all]
 
     # Remove custom Mime::Type instances set in other tests, like Mime::GIF and Mime::IPHONE
     types.delete_if { |type| !Mime.const_defined?(type.to_s.upcase) }
@@ -76,7 +76,7 @@ class MimeTypeTest < ActiveSupport::TestCase
   end
 
   test "verifiable mime types" do
-    all_types = Mime::SET.to_a.map{|m| m.to_sym}
+    all_types = Mime::SET.symbols
     all_types.uniq!
     # Remove custom Mime::Type instances set in other tests, like Mime::GIF and Mime::IPHONE
     all_types.delete_if { |type| !Mime.const_defined?(type.to_s.upcase) }
diff --git a/actionpack/test/lib/fixture_template.rb b/actionpack/test/lib/fixture_template.rb
index 59fb6819ed..4ea451879c 100644
--- a/actionpack/test/lib/fixture_template.rb
+++ b/actionpack/test/lib/fixture_template.rb
@@ -22,7 +22,7 @@ class Template
   
     def formats_regexp
       @formats_regexp ||= begin
-        formats = Mime::SET.map { |m| m.symbol }
+        formats = Mime::SET.symbols
         '(?:' + formats.map { |l| "\\.#{Regexp.escape(l.to_s)}" }.join('|') + ')?'
       end
     end
diff --git a/actionpack/test/new_base/render_rjs_test.rb b/actionpack/test/new_base/render_rjs_test.rb
new file mode 100644
index 0000000000..fdf3556e8e
--- /dev/null
+++ b/actionpack/test/new_base/render_rjs_test.rb
@@ -0,0 +1,46 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+
+module RenderRjs
+
+  class BasicController < ActionController::Base
+
+    self.view_paths = [ActionView::Template::FixturePath.new(
+      "render_rjs/basic/index.js.rjs"          => "page[:customer].replace_html render(:partial => 'customer')",
+      "render_rjs/basic/index_html.js.rjs"     => "page[:customer].replace_html :partial => 'customer'",
+      "render_rjs/basic/_customer.js.erb"      => "JS Partial",
+      "render_rjs/basic/_customer.html.erb"    => "HTML Partial",
+      "render_rjs/basic/index_locale.js.rjs"   => "page[:customer].replace_html :partial => 'customer'",
+      "render_rjs/basic/_customer.da.html.erb" => "Danish HTML Partial",
+      "render_rjs/basic/_customer.da.js.erb"   => "Danish JS Partial"
+    )]
+
+    def index
+      render
+    end
+
+    def index_locale
+      old_locale, I18n.locale = I18n.locale, :da
+    end
+
+  end
+
+  class TestBasic < SimpleRouteCase
+    testing BasicController
+
+    test "rendering a partial in an RJS template should pick the JS template over the HTML one" do
+      get :index
+      assert_response("$(\"customer\").update(\"JS Partial\");")
+    end
+
+    test "replacing an element with a partial in an RJS template should pick the HTML template over the JS one" do
+      get :index_html
+      assert_response("$(\"customer\").update(\"HTML Partial\");")
+    end
+
+    test "replacing an element with a partial in an RJS template with a locale should pick the localed HTML template" do
+      get :index_locale, :format => :js
+      assert_response("$(\"customer\").update(\"Danish HTML Partial\");")
+    end
+
+  end
+end
\ No newline at end of file
diff --git a/actionpack/test/template/render_test.rb b/actionpack/test/template/render_test.rb
index 2ed11aa3c0..45e3dc6f15 100644
--- a/actionpack/test/template/render_test.rb
+++ b/actionpack/test/template/render_test.rb
@@ -46,29 +46,6 @@ module RenderTestCases
     I18n.locale = old_locale
   end
 
-  def test_render_implicit_html_template_from_xhr_request
-    old_format = @view.formats
-    pending do
-      @view.formats = [:js]
-      assert_equal "Hello HTML!", @view.render(:file => "test/render_implicit_html_template_from_xhr_request")
-    end
-  ensure
-    @view.formats = old_format
-  end
-
-  def test_render_implicit_html_template_from_xhr_request_with_localization
-    old_locale = I18n.locale
-    old_format = @view.formats
-    pending do
-      I18n.locale = :da
-      @view.formats = [:js]
-      assert_equal "Hey HTML!\n", @view.render(:file => "test/render_implicit_html_template_from_xhr_request")
-    end
-  ensure
-    I18n.locale = old_locale
-    @view.formats = old_format
-  end
-
   def test_render_file_at_top_level
     assert_equal 'Elastica', @view.render(:file => '/shared')
   end