1 files changed, 29 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb
index 21d11ff31c..b542824789 100644
--- a/actionpack/test/dispatch/session/cookie_store_test.rb
+++ b/actionpack/test/dispatch/session/cookie_store_test.rb
@@ -185,6 +185,35 @@ class CookieStoreTest < ActionController::IntegrationTest
     end
   end
 
+  def test_session_store_with_explicit_domain
+    with_test_route_set(:domain => "example.es") do
+      get '/set_session_value'
+      assert_match /domain=example\.es/, headers['Set-Cookie']
+      headers['Set-Cookie']
+    end
+  end
+  
+  def test_session_store_without_domain 
+    with_test_route_set do
+      get '/set_session_value'
+      assert_no_match /domain\=/, headers['Set-Cookie']
+    end
+  end
+  
+  def test_session_store_with_nil_domain
+    with_test_route_set(:domain => nil) do
+      get '/set_session_value'
+      assert_no_match /domain\=/, headers['Set-Cookie']
+    end
+  end
+  
+  def test_session_store_with_all_domains
+    with_test_route_set(:domain => :all) do
+      get '/set_session_value'
+      assert_match /domain=\.example\.com/, headers['Set-Cookie']
+    end
+  end
+  
   private
 
     # Overwrite get to send SessionSecret in env hash