AbstractRequest.relative_url_root is no longer automatically configured by a HTTP header. It can now be set in your configuration environment with config.action_controller.relative_url_root

1 files changed, 27 insertions, 28 deletions

diff --git a/actionpack/test/controller/url_rewriter_test.rb b/actionpack/test/controller/url_rewriter_test.rb
index a9974db5d5..64e9a085ca 100644
--- a/actionpack/test/controller/url_rewriter_test.rb
+++ b/actionpack/test/controller/url_rewriter_test.rb
@@ -7,7 +7,7 @@ class UrlRewriterTests < Test::Unit::TestCase
     @request = ActionController::TestRequest.new
     @params = {}
     @rewriter = ActionController::UrlRewriter.new(@request, @params)
-  end 
+  end
 
   def test_port
     assert_equal('http://test.host:1271/c/a/i',
@@ -24,7 +24,7 @@ class UrlRewriterTests < Test::Unit::TestCase
       @rewriter.rewrite(:protocol => 'https://', :controller => 'c', :action => 'a', :id => 'i')
     )
   end
-  
+
   def test_user_name_and_password
     assert_equal(
       'http://david:secret@test.host/c/a/i',
@@ -38,12 +38,12 @@ class UrlRewriterTests < Test::Unit::TestCase
       @rewriter.rewrite(:user => "openid.aol.com/nextangler", :password => "one two?", :controller => 'c', :action => 'a', :id => 'i')
     )
   end
-  
-  def test_anchor 
-    assert_equal( 
-      'http://test.host/c/a/i#anchor', 
-      @rewriter.rewrite(:controller => 'c', :action => 'a', :id => 'i', :anchor => 'anchor') 
-    ) 
+
+  def test_anchor
+    assert_equal(
+      'http://test.host/c/a/i#anchor',
+      @rewriter.rewrite(:controller => 'c', :action => 'a', :id => 'i', :anchor => 'anchor')
+    )
   end
 
   def test_overwrite_params
@@ -55,12 +55,12 @@ class UrlRewriterTests < Test::Unit::TestCase
     u = @rewriter.rewrite(:only_path => false, :overwrite_params => {:action => 'hi'})
     assert_match %r(/hi/hi/2$), u
   end
-  
+
   def test_overwrite_removes_original
     @params[:controller] = 'search'
     @params[:action] = 'list'
     @params[:list_page] = 1
-    
+
     assert_equal '/search/list?list_page=2', @rewriter.rewrite(:only_path => true, :overwrite_params => {"list_page" => 2})
     u = @rewriter.rewrite(:only_path => false, :overwrite_params => {:list_page => 2})
     assert_equal 'http://test.host/search/list?list_page=2', u
@@ -86,19 +86,19 @@ class UrlRewriterTests < Test::Unit::TestCase
 end
 
 class UrlWriterTests < Test::Unit::TestCase
-  
+
   class W
     include ActionController::UrlWriter
   end
-  
+
   def teardown
     W.default_url_options.clear
   end
-  
+
   def add_host!
     W.default_url_options[:host] = 'www.basecamphq.com'
   end
-  
+
   def test_exception_is_thrown_without_host
     assert_raises RuntimeError do
       W.new.url_for :controller => 'c', :action => 'a', :id => 'i'
@@ -110,35 +110,35 @@ class UrlWriterTests < Test::Unit::TestCase
       W.new.url_for(:only_path => true, :controller => 'c', :action => 'a', :anchor => 'anchor')
     )
   end
-  
+
   def test_default_host
     add_host!
     assert_equal('http://www.basecamphq.com/c/a/i',
       W.new.url_for(:controller => 'c', :action => 'a', :id => 'i')
     )
   end
-  
+
   def test_host_may_be_overridden
     add_host!
     assert_equal('http://37signals.basecamphq.com/c/a/i',
       W.new.url_for(:host => '37signals.basecamphq.com', :controller => 'c', :action => 'a', :id => 'i')
     )
   end
-  
+
   def test_port
     add_host!
     assert_equal('http://www.basecamphq.com:3000/c/a/i',
       W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :port => 3000)
     )
   end
-  
+
   def test_protocol
     add_host!
     assert_equal('https://www.basecamphq.com/c/a/i',
       W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :protocol => 'https')
     )
   end
-  
+
   def test_protocol_with_and_without_separator
     add_host!
     assert_equal('https://www.basecamphq.com/c/a/i',
@@ -184,15 +184,15 @@ class UrlWriterTests < Test::Unit::TestCase
   end
 
   def test_relative_url_root_is_respected
-    orig_relative_url_root = ActionController::AbstractRequest.relative_url_root
-    ActionController::AbstractRequest.relative_url_root = '/subdir'
+    orig_relative_url_root = ActionController::Base.relative_url_root
+    ActionController::Base.relative_url_root = '/subdir'
 
     add_host!
     assert_equal('https://www.basecamphq.com/subdir/c/a/i',
       W.new.url_for(:controller => 'c', :action => 'a', :id => 'i', :protocol => 'https')
     )
   ensure
-    ActionController::AbstractRequest.relative_url_root = orig_relative_url_root
+    ActionController::Base.relative_url_root = orig_relative_url_root
   end
 
   def test_named_routes
@@ -217,8 +217,8 @@ class UrlWriterTests < Test::Unit::TestCase
   end
 
   def test_relative_url_root_is_respected_for_named_routes
-    orig_relative_url_root = ActionController::AbstractRequest.relative_url_root
-    ActionController::AbstractRequest.relative_url_root = '/subdir'
+    orig_relative_url_root = ActionController::Base.relative_url_root
+    ActionController::Base.relative_url_root = '/subdir'
 
     ActionController::Routing::Routes.draw do |map|
       map.home '/home/sweet/home/:user', :controller => 'home', :action => 'index'
@@ -231,7 +231,7 @@ class UrlWriterTests < Test::Unit::TestCase
       controller.send(:home_url, :host => 'www.basecamphq.com', :user => 'again')
   ensure
     ActionController::Routing::Routes.load!
-    ActionController::AbstractRequest.relative_url_root = orig_relative_url_root
+    ActionController::Base.relative_url_root = orig_relative_url_root
   end
 
   def test_only_path
@@ -239,14 +239,14 @@ class UrlWriterTests < Test::Unit::TestCase
       map.home '/home/sweet/home/:user', :controller => 'home', :action => 'index'
       map.connect ':controller/:action/:id'
     end
-    
+
     # We need to create a new class in order to install the new named route.
     kls = Class.new { include ActionController::UrlWriter }
     controller = kls.new
     assert controller.respond_to?(:home_url)
     assert_equal '/brave/new/world',
       controller.send(:url_for, :controller => 'brave', :action => 'new', :id => 'world', :only_path => true)
-    
+
     assert_equal("/home/sweet/home/alabama", controller.send(:home_url, :user => 'alabama', :host => 'unused', :only_path => true))
     assert_equal("/home/sweet/home/alabama", controller.send(:home_path, 'alabama'))
   ensure
@@ -306,5 +306,4 @@ class UrlWriterTests < Test::Unit::TestCase
     def extract_params(url)
       url.split('?', 2).last.split('&')
     end
-
 end