From 98f77e08278658ec47c9eb2e8f819d781c1eaebf Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Fri, 26 Feb 2010 15:00:33 -0800
Subject: Rename named_url_helpers to url_helpers and url_helpers to url_for

---
 actionpack/test/controller/caching_test.rb     | 2 +-
 actionpack/test/controller/integration_test.rb | 8 ++++----
 actionpack/test/controller/resources_test.rb   | 4 ++--
 actionpack/test/controller/routing_test.rb     | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'actionpack/test/controller')

diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 98cea945a7..67b6a1d858 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -512,7 +512,7 @@ class ActionCacheTest < ActionController::TestCase
       @response   = ActionController::TestResponse.new
       @controller = ActionCachingTestController.new
       # ROUTES TODO: It seems bad to explicitly remix in the class
-      @controller.singleton_class.send(:include, @router.named_url_helpers)
+      @controller.singleton_class.send(:include, @router.url_helpers)
       @request.host = 'hostname.com'
     end
 
diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 437d26e4ed..5352243734 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -221,7 +221,7 @@ class IntegrationTestUsesCorrectClass < ActionController::IntegrationTest
 end
 
 class IntegrationProcessTest < ActionController::IntegrationTest
-  include SharedTestRoutes.named_url_helpers
+  include SharedTestRoutes.url_helpers
 
   class IntegrationController < ActionController::Base
     def get
@@ -388,7 +388,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest
       with_routing do |set|
         controller = ::IntegrationProcessTest::IntegrationController.clone
         controller.class_eval do
-          include set.named_url_helpers
+          include set.url_helpers
         end
 
         set.draw do |map|
@@ -396,7 +396,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest
           get 'get/:action', :to => controller
         end
 
-        self.singleton_class.send(:include, set.named_url_helpers)
+        self.singleton_class.send(:include, set.url_helpers)
 
         yield
       end
@@ -404,7 +404,7 @@ class IntegrationProcessTest < ActionController::IntegrationTest
 end
 
 class MetalIntegrationTest < ActionController::IntegrationTest
-  include SharedTestRoutes.named_url_helpers
+  include SharedTestRoutes.url_helpers
 
   class Poller
     def self.call(env)
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index b377e5bbbc..cf0cab3690 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -1231,7 +1231,7 @@ class ResourcesTest < ActionController::TestCase
 
       @controller = "#{options[:options][:controller].camelize}Controller".constantize.new
       # ROUTES TODO: Figure out a way to not extend the routing helpers here
-      @controller.singleton_class.send(:include, @router.named_url_helpers)
+      @controller.singleton_class.send(:include, @router.url_helpers)
       @request    = ActionController::TestRequest.new
       @response   = ActionController::TestResponse.new
       get :index, options[:options]
@@ -1301,7 +1301,7 @@ class ResourcesTest < ActionController::TestCase
     def assert_singleton_named_routes_for(singleton_name, options = {})
       (options[:options] ||= {})[:controller] ||= singleton_name.to_s.pluralize
       @controller = "#{options[:options][:controller].camelize}Controller".constantize.new
-      @controller.singleton_class.send(:include, @router.named_url_helpers)
+      @controller.singleton_class.send(:include, @router.url_helpers)
       @request    = ActionController::TestRequest.new
       @response   = ActionController::TestResponse.new
       get :show, options[:options]
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index f2fccfbcfc..31f86d2dde 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -251,7 +251,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
   def setup_for_named_route
     inst = MockController.clone.new
-    inst.class.send(:include, rs.named_url_helpers)
+    inst.class.send(:include, rs.url_helpers)
     inst
   end
 
@@ -741,7 +741,7 @@ class RouteSetTest < ActiveSupport::TestCase
       map.users '/admin/users', :controller => 'admin/users', :action => 'index'
     end
 
-    MockController.clone.new.tap { |inst| inst.class.send(:include, set.named_url_helpers)}
+    MockController.clone.new.tap { |inst| inst.class.send(:include, set.url_helpers)}
   end
 
   def test_named_route_hash_access_method
-- 
cgit v1.2.3