3 files changed, 37 insertions, 3 deletions
diff --git a/actionpack/test/fixtures/digestor/messages/_form.html.erb b/actionpack/test/fixtures/digestor/messages/_form.html.erb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/actionpack/test/fixtures/digestor/messages/_form.html.erb
diff --git a/actionpack/test/fixtures/digestor/messages/edit.html.erb b/actionpack/test/fixtures/digestor/messages/edit.html.erb
new file mode 100644
index 0000000000..a9e0a88e32
--- /dev/null
+++ b/actionpack/test/fixtures/digestor/messages/edit.html.erb
@@ -0,0 +1,5 @@
+<%= render              "header" %>
+<%= render    partial:  "form" %>
+<%= render              @message %>
+<%= render ( @message.events ) %>
+<%= render    :partial =>    "comments/comment", :collection => @message.comments %>
diff --git a/actionpack/test/template/digestor_test.rb b/actionpack/test/template/digestor_test.rb
index 067ab500f5..9c84f3107f 100644
--- a/actionpack/test/template/digestor_test.rb
+++ b/actionpack/test/template/digestor_test.rb
@@ -16,7 +16,7 @@ class FixtureFinder
   TMP_DIR      = "#{File.dirname(__FILE__)}/../tmp"
   
   def find(logical_name, keys, partial, options)
-    FixtureTemplate.new("#{TMP_DIR}/#{partial ? logical_name.gsub(%r|/([^/]+)$|, '/_\1') : logical_name}.#{options[:formats].first}.erb")
+    FixtureTemplate.new("#{TMP_DIR}/digestor/#{partial ? logical_name.gsub(%r|/([^/]+)$|, '/_\1') : logical_name}.#{options[:formats].first}.erb")
   end
 end
 
@@ -26,7 +26,7 @@ class TemplateDigestorTest < ActionView::TestCase
   end
   
   def teardown
-    FileUtils.rm_r FixtureFinder::TMP_DIR
+    FileUtils.rm_r File.join(FixtureFinder::TMP_DIR, "digestor")
     ActionView::Digestor.cache.clear
   end
 
@@ -92,6 +92,35 @@ class TemplateDigestorTest < ActionView::TestCase
     end
   end
 
+  def test_extra_whitespace_in_render_partial
+    assert_digest_difference("messages/edit") do
+      change_template("messages/_form")
+    end
+  end
+
+  def test_extra_whitespace_in_render_named_partial
+    assert_digest_difference("messages/edit") do
+      change_template("messages/_header")
+    end
+  end
+
+  def test_extra_whitespace_in_render_record
+    assert_digest_difference("messages/edit") do
+      change_template("messages/_message")
+    end
+  end
+
+  def test_extra_whitespace_in_render_with_parenthesis
+    assert_digest_difference("messages/edit") do
+      change_template("events/_event")
+    end
+  end
+
+  def test_old_style_hash_in_render_invocation
+    assert_digest_difference("messages/edit") do
+      change_template("comments/_comment")
+    end
+  end
 
   private
     def assert_logged(message)
@@ -121,7 +150,7 @@ class TemplateDigestorTest < ActionView::TestCase
     end
     
     def change_template(template_name)
-      File.open("#{FixtureFinder::TMP_DIR}/#{template_name}.html.erb", "w") do |f|
+      File.open("#{FixtureFinder::TMP_DIR}/digestor/#{template_name}.html.erb", "w") do |f|
         f.write "\nTHIS WAS CHANGED!"
       end
     end