From 80074cb4de2e60cd771b76d396d61e5c4bc0aff6 Mon Sep 17 00:00:00 2001
From: Rick Olson <technoweenie@gmail.com>
Date: Tue, 15 May 2007 03:13:32 +0000
Subject: Assume that rendered partials go by the HTML format by default

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6734 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/test/controller/render_test.rb       | 19 +++++++++++++++++++
 actionpack/test/fixtures/test/_partial.erb      |  1 +
 actionpack/test/fixtures/test/_partial.html.erb |  1 +
 actionpack/test/fixtures/test/_partial.rhtml    |  0
 4 files changed, 21 insertions(+)
 create mode 100644 actionpack/test/fixtures/test/_partial.erb
 create mode 100644 actionpack/test/fixtures/test/_partial.html.erb
 create mode 100644 actionpack/test/fixtures/test/_partial.rhtml

(limited to 'actionpack/test')

diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index d51af51454..968559fcc2 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -132,6 +132,16 @@ class TestController < ActionController::Base
     @foo = render_to_string :inline => "this is a test"
   end
 
+  def partial
+    render :partial => 'partial'
+  end
+  
+  def partial_as_rjs
+    render :update do |page|
+      page.replace :foo, :partial => 'partial'
+    end
+  end
+
   def rescue_action(e) raise end
 
   private
@@ -368,6 +378,15 @@ class RenderTest < Test::Unit::TestCase
     assert_equal '<test>passed formatted html erb</test>', @response.body
   end
 
+  def test_should_render_html_formatted_partial
+    get :partial
+    assert_equal 'partial html', @response.body
+  end
+
+  def test_should_render_html_formatted_partial_with_rjs
+    xhr :get, :partial_as_rjs
+    assert_equal %(Element.replace("foo", "partial html");), @response.body
+  end
 
   protected
     def assert_deprecated_render(&block)
diff --git a/actionpack/test/fixtures/test/_partial.erb b/actionpack/test/fixtures/test/_partial.erb
new file mode 100644
index 0000000000..e466dcbd8e
--- /dev/null
+++ b/actionpack/test/fixtures/test/_partial.erb
@@ -0,0 +1 @@
+invalid
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_partial.html.erb b/actionpack/test/fixtures/test/_partial.html.erb
new file mode 100644
index 0000000000..e39f6c9827
--- /dev/null
+++ b/actionpack/test/fixtures/test/_partial.html.erb
@@ -0,0 +1 @@
+partial html
\ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_partial.rhtml b/actionpack/test/fixtures/test/_partial.rhtml
new file mode 100644
index 0000000000..e69de29bb2
-- 
cgit v1.2.3