From 7b3fb1d43f57d6ebe3edb75434cae01e140483d0 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Fri, 22 May 2009 17:07:40 -0700
Subject: Got controller/render_js_test.rb to pass on new base

---
 actionpack/Rakefile                                         |  7 +++----
 actionpack/lib/action_controller/new_base/base.rb           |  1 +
 actionpack/lib/action_controller/new_base/render_options.rb | 10 ++++++++++
 actionpack/test/controller/render_js_test.rb                |  2 ++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index ea12adb921..b9819d4a83 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -65,7 +65,6 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
   # ==== Not ported
   # * filters
   # * integration
-  # * render_js
   # * test
   # * view_paths
   t.test_files = %w(
@@ -73,9 +72,9 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
     base benchmark caching capture content_type cookie dispatcher
     filter_params flash helper http_basic_authentication
     http_digest_authentication layout logging mime_responds
-    record_identifier redirect render render_json render_other render_xml
-    request_forgery_protection rescue resources routing selector send_file
-    translation url_rewriter verification webservice
+    record_identifier redirect render render_js render_json
+    render_other render_xml request_forgery_protection rescue
+    resources routing selector send_file url_rewriter verification webservice
   ).map { |name| "test/controller/#{name}_test.rb" }
   t.verbose = true
 end
diff --git a/actionpack/lib/action_controller/new_base/base.rb b/actionpack/lib/action_controller/new_base/base.rb
index e321d97ac1..adb760ea7e 100644
--- a/actionpack/lib/action_controller/new_base/base.rb
+++ b/actionpack/lib/action_controller/new_base/base.rb
@@ -12,6 +12,7 @@ module ActionController
     include ActionController::Redirector
     include ActionController::Renderer
     include ActionController::Renderers::Json
+    include ActionController::Renderers::Js
     include ActionController::Renderers::Xml
     include ActionController::Renderers::Rjs
     include ActionController::Layouts
diff --git a/actionpack/lib/action_controller/new_base/render_options.rb b/actionpack/lib/action_controller/new_base/render_options.rb
index 2ce9d0c7ae..33f8957f6e 100644
--- a/actionpack/lib/action_controller/new_base/render_options.rb
+++ b/actionpack/lib/action_controller/new_base/render_options.rb
@@ -62,6 +62,16 @@ module ActionController
       end      
     end
 
+    module Js
+      include RenderOption
+      register_renderer :js
+
+      def _render_js(js, options)
+        response.content_type ||= Mime::JS
+        self.response_body = js
+      end
+    end
+
     module Xml
       include RenderOption
       register_renderer :xml
diff --git a/actionpack/test/controller/render_js_test.rb b/actionpack/test/controller/render_js_test.rb
index 7b50242910..d02fd3fd4c 100644
--- a/actionpack/test/controller/render_js_test.rb
+++ b/actionpack/test/controller/render_js_test.rb
@@ -19,6 +19,8 @@ class TestController < ActionController::Base
 end
 
 class RenderTest < ActionController::TestCase
+  tests TestController
+
   def test_render_vanilla_js
     get :render_vanilla_js_hello
     assert_equal "alert('hello')", @response.body
-- 
cgit v1.2.3