Revert "Merge pull request #27586 from maclover7/jm-fix-27584"

This reverts commit 5eff7a9c, reversing
changes made to 5f03172f.

Reason: It caused a regression. The test case is on the PR.
上级 9667813b
......@@ -389,7 +389,9 @@ def determine_default_controller_class(name)
# Note that the request method is not verified. The different methods are
# available to make the tests more expressive.
def get(action, **args)
process(action, method: "GET", **args)
res = process(action, method: "GET", **args)
cookies.update res.cookies
res
end
# Simulate a POST request with the given parameters and set/volley the response.
......@@ -517,7 +519,6 @@ def process(action, method: "GET", params: {}, session: nil, body: nil, flash: {
unless @request.cookie_jar.committed?
@request.cookie_jar.write(@response)
cookies.update(@request.cookie_jar.instance_variable_get(:@cookies))
cookies.update(@response.cookies)
end
end
@response.prepare!
......
......@@ -395,15 +395,6 @@ def test_deleted_cookie_predicate
assert_equal false, cookies.deleted?("another")
end
# Ensure all HTTP methods have their cookies updated
[:get, :post, :patch, :put, :delete, :head].each do |method|
define_method("test_deleting_cookie_#{method}") do
request.cookies[:user_name] = "Joe"
public_send method, :logout
assert_nil cookies[:user_name]
end
end
def test_deleted_cookie_predicate_with_mismatching_options
cookies[:user_name] = "Joe"
cookies.delete("user_name", path: "/path")
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册