Merge branch 'master' of https://github.com/rails/rails into performance_test

Conflicts:
	activesupport/lib/active_support/testing/performance.rb

1 files changed, 4 insertions, 4 deletions

diff --git a/actionpack/test/controller/new_base/render_implicit_action_test.rb b/actionpack/test/controller/new_base/render_implicit_action_test.rb
index 3bb3016fdb..1e2191d417 100644
--- a/actionpack/test/controller/new_base/render_implicit_action_test.rb
+++ b/actionpack/test/controller/new_base/render_implicit_action_test.rb
@@ -33,10 +33,10 @@ module RenderImplicitAction
       assert_status 200
     end
 
-    test "action_method? returns true for implicit actions" do
-      assert SimpleController.new.action_method?(:hello_world)
-      assert SimpleController.new.action_method?(:"hyphen-ated")
-      assert SimpleController.new.action_method?(:not_implemented)
+    test "available_action? returns true for implicit actions" do
+      assert SimpleController.new.available_action?(:hello_world)
+      assert SimpleController.new.available_action?(:"hyphen-ated")
+      assert SimpleController.new.available_action?(:not_implemented)
     end
   end
 end