2 files changed, 25 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index fb2faf7a4e..d128006404 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -137,30 +137,39 @@ class RequestTest < ActiveSupport::TestCase
   test "subdomains" do
     request = stub_request 'HTTP_HOST' => "www.rubyonrails.org"
     assert_equal %w( www ), request.subdomains
+    assert_equal "www", request.subdomain
 
     request = stub_request 'HTTP_HOST' => "www.rubyonrails.co.uk"
     assert_equal %w( www ), request.subdomains(2)
+    assert_equal "www", request.subdomain(2)
 
     request = stub_request 'HTTP_HOST' => "dev.www.rubyonrails.co.uk"
     assert_equal %w( dev www ), request.subdomains(2)
+    assert_equal "dev.www", request.subdomain(2)
 
     request = stub_request 'HTTP_HOST' => "dev.www.rubyonrails.co.uk", :tld_length => 2
     assert_equal %w( dev www ), request.subdomains
+    assert_equal "dev.www", request.subdomain
 
     request = stub_request 'HTTP_HOST' => "foobar.foobar.com"
     assert_equal %w( foobar ), request.subdomains
+    assert_equal "foobar", request.subdomain
 
     request = stub_request 'HTTP_HOST' => "192.168.1.200"
     assert_equal [], request.subdomains
+    assert_equal "", request.subdomain
 
     request = stub_request 'HTTP_HOST' => "foo.192.168.1.200"
     assert_equal [], request.subdomains
+    assert_equal "", request.subdomain
 
     request = stub_request 'HTTP_HOST' => "192.168.1.200.com"
     assert_equal %w( 192 168 1 ), request.subdomains
+    assert_equal "192.168.1", request.subdomain
 
     request = stub_request 'HTTP_HOST' => nil
     assert_equal [], request.subdomains
+    assert_equal "", request.subdomain
   end
 
   test "standard_port" do
diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb
index 27f55fd7ab..b0efbcef4a 100644
--- a/actionpack/test/dispatch/session/cookie_store_test.rb
+++ b/actionpack/test/dispatch/session/cookie_store_test.rb
@@ -50,6 +50,11 @@ class CookieStoreTest < ActionDispatch::IntegrationTest
       get_session_id
     end
 
+    def renew_session_id
+      request.session_options[:renew] = true
+      head :ok
+    end
+
     def rescue_action(e) raise end
   end
 
@@ -102,6 +107,17 @@ class CookieStoreTest < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_properly_renew_cookies
+    with_test_route_set do
+      get '/set_session_value'
+      get '/persistent_session_id'
+      session_id = response.body
+      get '/renew_session_id'
+      get '/persistent_session_id'
+      assert_not_equal response.body, session_id
+    end
+  end
+
   def test_does_set_secure_cookies_over_https
     with_test_route_set(:secure => true) do
       get '/set_session_value', nil, 'HTTPS' => 'on'