Skip to content

Commit ac18a8b

Browse files
authored
Merge pull request rails#55466 from skipkayhil/hm-ptllkywuvnyxqums
Fix response_finished Executor test for Rack HEAD
2 parents 605afba + 1d76b7b commit ac18a8b

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

actionpack/test/dispatch/executor_test.rb

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,15 @@ def test_complete_callbacks_are_called_on_rack_response_finished
174174
completed = false
175175
executor.to_complete { completed = true }
176176

177-
env = { "rack.response_finished" => [] }
177+
env = Rack::MockRequest.env_for
178+
env["rack.response_finished"] = []
179+
178180
call_and_return_body(env)
179181

180182
assert_not completed
181183

182184
assert_equal 1, env["rack.response_finished"].size
183-
env["rack.response_finished"].first.call({}, 200, {}, nil)
185+
env["rack.response_finished"].first.call(env, 200, {}, nil)
184186

185187
assert completed
186188
end
@@ -189,7 +191,8 @@ def test_complete_callbacks_are_called_once_on_rack_response_finished_when_excep
189191
completed_count = 0
190192
executor.to_complete { completed_count += 1 }
191193

192-
env = { "rack.response_finished" => [] }
194+
env = Rack::MockRequest.env_for
195+
env["rack.response_finished"] = []
193196

194197
begin
195198
call_and_return_body(env) do
@@ -199,15 +202,14 @@ def test_complete_callbacks_are_called_once_on_rack_response_finished_when_excep
199202
end
200203

201204
assert_equal 1, env["rack.response_finished"].size
202-
env["rack.response_finished"].first.call({}, 200, {}, nil)
205+
env["rack.response_finished"].first.call(env, 200, {}, nil)
203206

204207
assert_equal 1, completed_count
205208
end
206209

207210
private
208-
def call_and_return_body(env = {}, &block)
211+
def call_and_return_body(env = Rack::MockRequest.env_for, &block)
209212
app = block || proc { [200, {}, []] }
210-
env = Rack::MockRequest.env_for("", env)
211213
_, _, body = middleware(app).call(env)
212214
body
213215
end

0 commit comments

Comments
 (0)