Added the :rjs render option

3 files changed, 16 insertions, 0 deletions

diff --git a/actionpack/test/controller/render_other_test.rb b/actionpack/test/controller/render_other_test.rb
index ddbdd2d213..3c52b7036d 100644
--- a/actionpack/test/controller/render_other_test.rb
+++ b/actionpack/test/controller/render_other_test.rb
@@ -103,6 +103,14 @@ class TestController < ActionController::Base
   end  
   
 private
+  def default_render
+    if @alternate_default_render
+      @alternate_default_render.call
+    else
+      super
+    end
+  end
+
   def determine_layout
     case action_name
       when "render_js_with_explicit_template",
diff --git a/actionpack/test/template/javascript_helper_test.rb b/actionpack/test/template/javascript_helper_test.rb
index f9bc92c7c9..8caabfc3e1 100644
--- a/actionpack/test/template/javascript_helper_test.rb
+++ b/actionpack/test/template/javascript_helper_test.rb
@@ -3,6 +3,8 @@ require 'abstract_unit'
 class JavaScriptHelperTest < ActionView::TestCase
   tests ActionView::Helpers::JavaScriptHelper
 
+  def _evaluate_assigns_and_ivars() end
+
   attr_accessor :formats, :output_buffer
 
   def setup
@@ -10,6 +12,8 @@ class JavaScriptHelperTest < ActionView::TestCase
     @template = self
   end
 
+  def _evaluate_assigns_and_ivars() end
+
   def test_escape_javascript
     assert_equal '', escape_javascript(nil)
     assert_equal %(This \\"thing\\" is really\\n netos\\'), escape_javascript(%(This "thing" is really\n netos'))
diff --git a/actionpack/test/template/prototype_helper_test.rb b/actionpack/test/template/prototype_helper_test.rb
index 28851f113f..f9f418aec9 100644
--- a/actionpack/test/template/prototype_helper_test.rb
+++ b/actionpack/test/template/prototype_helper_test.rb
@@ -61,6 +61,8 @@ class PrototypeHelperBaseTest < ActionView::TestCase
 end
 
 class PrototypeHelperTest < PrototypeHelperBaseTest
+  def _evaluate_assigns_and_ivars() end
+
   def setup
     @record = @author = Author.new
     @article = Article.new
@@ -304,6 +306,8 @@ class JavaScriptGeneratorTest < PrototypeHelperBaseTest
     @generator = create_generator
   end
 
+  def _evaluate_assigns_and_ivars() end
+
   def test_insert_html_with_string
     assert_equal 'Element.insert("element", { top: "\\u003Cp\\u003EThis is a test\\u003C/p\\u003E" });',
       @generator.insert_html(:top, 'element', '<p>This is a test</p>')