6 files changed, 29 insertions, 26 deletions
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index 899435ff38..f48b73b63a 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -593,13 +593,13 @@ XML
   end
 
   def test_should_have_knowledge_of_client_side_cookie_state_even_if_they_are_not_set
-    @request.cookies['foo'] = 'bar'
+    cookies['foo'] = 'bar'
     get :no_op
     assert_equal 'bar', cookies['foo']
   end
 
   def test_should_detect_if_cookie_is_deleted
-    @request.cookies['foo'] = 'bar'
+    cookies['foo'] = 'bar'
     get :delete_cookie
     assert_nil cookies['foo']
   end
diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb
index e42c39f527..c975c4f7ba 100644
--- a/actionpack/test/dispatch/cookies_test.rb
+++ b/actionpack/test/dispatch/cookies_test.rb
@@ -430,54 +430,48 @@ class CookiesTest < ActionController::TestCase
 
 
   def test_setting_request_cookies_is_indifferent_access
-    @request.cookies.clear
-    @request.cookies[:user_name] = "andrew"
+    cookies.clear
+    cookies[:user_name] = "andrew"
     get :string_key_mock
-    assert_equal "david", cookies[:user_name]
+    assert_equal "david", cookies['user_name']
 
-    @request.cookies.clear
-    @request.cookies['user_name'] = "andrew"
+    cookies.clear
+    cookies['user_name'] = "andrew"
     get :symbol_key_mock
-    assert_equal "david", cookies['user_name']
+    assert_equal "david", cookies[:user_name]
   end
 
   def test_cookies_retained_across_requests
     get :symbol_key
-    assert_equal "user_name=david; path=/", @response.headers["Set-Cookie"]
+    assert_cookie_header "user_name=david; path=/"
     assert_equal "david", cookies[:user_name]
 
     get :noop
     assert_nil @response.headers["Set-Cookie"]
-    assert_equal "user_name=david", @request.env['HTTP_COOKIE']
     assert_equal "david", cookies[:user_name]
 
     get :noop
     assert_nil @response.headers["Set-Cookie"]
-    assert_equal "user_name=david", @request.env['HTTP_COOKIE']
     assert_equal "david", cookies[:user_name]
   end
 
   def test_cookies_can_be_cleared
     get :symbol_key
-    assert_equal "user_name=david; path=/", @response.headers["Set-Cookie"]
     assert_equal "david", cookies[:user_name]
 
-    @request.cookies.clear
+    cookies.clear
     get :noop
-    assert_nil @response.headers["Set-Cookie"]
-    assert_nil @request.env['HTTP_COOKIE']
     assert_nil cookies[:user_name]
 
     get :symbol_key
-    assert_equal "user_name=david; path=/", @response.headers["Set-Cookie"]
     assert_equal "david", cookies[:user_name]
   end
 
-  def test_cookies_are_escaped
-    @request.cookies[:user_ids] = '1;2'
+  def test_can_set_http_cookie_header
+    @request.env['HTTP_COOKIE'] = "user_name=david"
     get :noop
-    assert_equal "user_ids=1%3B2", @request.env['HTTP_COOKIE']
-    assert_equal "1;2", cookies[:user_ids]
+    assert_equal 'david', cookies['user_name']
+    assert_equal 'david', cookies[:user_name]
   end
 
   private
diff --git a/actionpack/test/dispatch/test_request_test.rb b/actionpack/test/dispatch/test_request_test.rb
index 81a8c24525..c520fb59ec 100644
--- a/actionpack/test/dispatch/test_request_test.rb
+++ b/actionpack/test/dispatch/test_request_test.rb
@@ -34,12 +34,15 @@ class TestRequestTest < ActiveSupport::TestCase
     assert_equal({}, req.cookies)
     assert_equal nil, req.env["HTTP_COOKIE"]
 
-    req.cookies["user_name"] = "david"
-    assert_equal({"user_name" => "david"}, req.cookies)
-    assert_equal "user_name=david", req.env["HTTP_COOKIE"]
+    req.cookie_jar["user_name"] = "david"
+    assert_cookies({"user_name" => "david"}, req.cookie_jar)
 
-    req.cookies["login"] = "XJ-122"
-    assert_equal({"user_name" => "david", "login" => "XJ-122"}, req.cookies)
-    assert_equal %w(login=XJ-122 user_name=david), req.env["HTTP_COOKIE"].split(/; /).sort
+    req.cookie_jar["login"] = "XJ-122"
+    assert_cookies({"user_name" => "david", "login" => "XJ-122"}, req.cookie_jar)
   end
+
+  private
+    def assert_cookies(expected, cookie_jar)
+      assert_equal(expected, cookie_jar.instance_variable_get("@cookies"))
+    end
 end
diff --git a/actionpack/test/fixtures/sprockets/app/javascripts/extra.js b/actionpack/test/fixtures/sprockets/app/javascripts/extra.js
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/actionpack/test/fixtures/sprockets/app/javascripts/extra.js
diff --git a/actionpack/test/fixtures/sprockets/app/stylesheets/extra.css b/actionpack/test/fixtures/sprockets/app/stylesheets/extra.css
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/actionpack/test/fixtures/sprockets/app/stylesheets/extra.css
diff --git a/actionpack/test/template/sprockets_helper_test.rb b/actionpack/test/template/sprockets_helper_test.rb
index ebb7e48d70..b1317d0a35 100644
--- a/actionpack/test/template/sprockets_helper_test.rb
+++ b/actionpack/test/template/sprockets_helper_test.rb
@@ -94,6 +94,9 @@ class SprocketsHelperTest < ActionView::TestCase
 
     assert_equal "<script src=\"/assets/xmlhr-d41d8cd98f00b204e9800998ecf8427e.js?body=1\" type=\"text/javascript\"></script>\n<script src=\"/assets/application-d41d8cd98f00b204e9800998ecf8427e.js?body=1\" type=\"text/javascript\"></script>",
       javascript_include_tag(:application, :debug => true)
+
+    assert_equal  "<script src=\"/assets/xmlhr-d41d8cd98f00b204e9800998ecf8427e.js\" type=\"text/javascript\"></script>\n<script src=\"/assets/extra-d41d8cd98f00b204e9800998ecf8427e.js\" type=\"text/javascript\"></script>",
+      javascript_include_tag("xmlhr", "extra")
   end
 
   test "stylesheet path" do
@@ -127,5 +130,8 @@ class SprocketsHelperTest < ActionView::TestCase
 
     assert_equal "<link href=\"/assets/style-d41d8cd98f00b204e9800998ecf8427e.css?body=1\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<link href=\"/assets/application-68b329da9893e34099c7d8ad5cb9c940.css?body=1\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />",
       stylesheet_link_tag(:application, :debug => true)
+
+    assert_equal "<link href=\"/assets/style-d41d8cd98f00b204e9800998ecf8427e.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />\n<link href=\"/assets/extra-d41d8cd98f00b204e9800998ecf8427e.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\" />",
+      stylesheet_link_tag("style", "extra")
   end
 end