3 files changed, 22 insertions, 5 deletions

diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index d4a18a673c..e6b2ee7e9f 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -4,6 +4,7 @@ require 'pathname'
 
 module Fun
   class GamesController < ActionController::Base
+    # :ported:
     def hello_world
     end
   end
@@ -116,6 +117,7 @@ class TestController < ActionController::Base
     render :text => "hello #{@person}"
   end
 
+  # :ported:
   def render_action_hello_world
     render :action => "hello_world"
   end
@@ -839,17 +841,20 @@ class RenderTest < ActionController::TestCase
     assert_equal "hello david", @response.body
   end
 
+  # :ported:
   def test_render_action
     get :render_action_hello_world
     assert_template "test/hello_world"
   end
 
+  # :ported:
   def test_render_action_hello_world_as_string
     get :render_action_hello_world_as_string
     assert_equal "Hello world!", @response.body
     assert_template "test/hello_world"
   end
 
+  # :ported:
   def test_render_action_with_symbol
     get :render_action_hello_world_with_symbol
     assert_template "test/hello_world"
@@ -949,6 +954,7 @@ class RenderTest < ActionController::TestCase
     assert_equal 'application/json', @response.content_type
   end
 
+  # :ported:
   def test_render_custom_code
     get :render_custom_code
     assert_response 404
@@ -1082,6 +1088,7 @@ class RenderTest < ActionController::TestCase
     assert_template "test/hello_world"
   end
 
+  # :ported:
   def test_nested_rendering
     @controller = Fun::GamesController.new
     get :hello_world
diff --git a/actionpack/test/new_base/render_test.rb b/actionpack/test/new_base/render_test.rb
index 93bc8d854c..bc7203f294 100644
--- a/actionpack/test/new_base/render_test.rb
+++ b/actionpack/test/new_base/render_test.rb
@@ -35,4 +35,14 @@ module Render
       end
     end
   end
+  
+  class TestRenderObjectMethod < SimpleRouteCase
+    describe "Methods on Object are not actions"
+    
+    test "raises an exception" do
+      assert_raises(AbstractController::ActionNotFound) do
+        get "/render/blank_render/clone"
+      end
+    end
+  end
 end
\ No newline at end of file
diff --git a/actionpack/test/new_base/test_helper.rb b/actionpack/test/new_base/test_helper.rb
index 03af5a66a6..d58b83cf7b 100644
--- a/actionpack/test/new_base/test_helper.rb
+++ b/actionpack/test/new_base/test_helper.rb
@@ -34,6 +34,8 @@ end
 
 module ActionController
   class Base2 < Http
+    abstract!
+    
     use AbstractController::Callbacks
     use AbstractController::Helpers
     use AbstractController::Logger
@@ -80,15 +82,13 @@ module ActionController
     end
     
     def respond_to_action?(action_name)
-      super || view_paths.find_by_parts(action_name, {:formats => formats, :locales => [I18n.locale]}, controller_path)
+      super || view_paths.find_by_parts?(action_name.to_s, {:formats => formats, :locales => [I18n.locale]}, controller_path)
     end
-    
-    # append_view_path File.join(File.dirname(__FILE__), '..', 'fixtures')
-        
-    CORE_METHODS = self.public_instance_methods
   end
   
   class CompatibleBase2 < Base2
+    abstract!
+    
     use ActionController::Rails2Compatibility
   end
 end