Default headers, removed in controller actions, will not be reapplied to the test response

[jone]

Default headers, removed in controller actions, were reapplied to the test response, although it works perfectly in production.
This change disables merging headers with the default headers a second time in the test response.

/cc @senny

[senny]

@jone thank you 💛

[jeremy]

This assumes that a TestResponse is always instantiated with an existing response's headers, which include the default headers. Is that accurate? If you create a TestResponse with headers = {}, when are the default headers merged if this method is overridden to ignore them?

[senny]

@jeremy you're right, that was the assumption. I see this is not the case for controller tests.

I'll write tests to show the introduced bug and move the patch into a new subclass only used for integration tests.

Thank you for pointing this out.

[kaspth]

@42001983 to stop getting these emails you have to unwatch the Rails repository on GitHub.

[jeremy]

Fixed by optionally merging the default headers rather than disabling the merge. Added a regression test for functional tests to demonstrate (thanks @senny!)