From bae691f61ab8cf4a59adaee6406855e11d009c74 Mon Sep 17 00:00:00 2001
From: Carlhuda <carlhuda@engineyard.com>
Date: Fri, 26 Feb 2010 15:20:41 -0800
Subject: Change the API for setting global options for #url_for to
 self.url_options = { ... }

	This attr_accessor can be set in a before filter or in the action itself.
    Overwriting default_url_options still works but will output a deprecation notice.
---
 actionpack/lib/action_dispatch/testing/integration.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actionpack/lib/action_dispatch/testing/integration.rb')

diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index fb067601c8..0bad9c37d6 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -357,7 +357,7 @@ module ActionDispatch
       extend ActiveSupport::Concern
       include ActionDispatch::Routing::UrlFor
 
-      def merge_options(options)
+      def url_options
         opts = super.reverse_merge(
           :host => host,
           :protocol => https? ? "https" : "http"
-- 
cgit v1.2.3