Fix engine named routes regression#21743
Closed
merhard wants to merge 2 commits intorails:4-2-stablefrom
Closed
Conversation
added 2 commits
September 23, 2015 18:21
When generating the url for a mounted engine through its proxy, the path should be the sum of three parts: 1. Any `SCRIPT_NAME` request header or the value of `relative_url_root`. 2. A prefix (the engine's mounted path). 3. The path of the named route inside the engine. Since commit rails@0703453, this has been broken. Instead, the path is the sum of four parts: 1. Any `SCRIPT_NAME` request header or the value of `relative_url_root`. 2. The value of `relative_url_root`. 3. A prefix (the engine's mounted path). 4. The path of the named route inside the engine. This commit fixes the regression by providing a benign truthy value for `options[:script_name]` (an empty string) when the prefix is being generated, avoiding the duplicate `relative_url_root` value in the final result. This resolves rails#20920, resolves rails#21459, and closes rails#20958
Fixes two test failures having to do with respecting `default_url_options`: 1. TestGenerationPrefix::WithMountedEngine#test_[APP]_generating_engine's_route_includes_default_url_options[:script_name] [/Users/merhard/Documents/personal/rails/actionpack/test/dispatch/prefix_generation_test.rb:243] 2. TestGenerationPrefix::WithMountedEngine#test_[OBJECT]_generating_engine's_route_includes_default_url_options[:script_name] [/Users/merhard/Documents/personal/rails/actionpack/test/dispatch/prefix_generation_test.rb:281] The empty string was overriding the potential `default_url_options[:script_name]` value. This is fixed by defaulting to `default_url_options` and falling back to an empty string if missing.
|
Thanks for the pull request, and welcome! The Rails team is excited to review your changes, and you should hear from @arthurnn (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
|
|
This was referenced Sep 24, 2015
Member
|
#18775 was merged into master, is this a problem there too? |
Contributor
Author
Member
Yes please. And we will backport the fix to 4-2-stable if we think it is applicable |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request aims to fix a regression that has been present in Rails since v4.2.2
When generating the url for a mounted engine through its proxy, the path should be the sum of three parts:
SCRIPT_NAMErequest header or the value ofrelative_url_root.Since commit 0703453, this has been broken. Instead, the path is the sum of four parts:
SCRIPT_NAMErequest header or the value ofrelative_url_root.relative_url_root.This commit fixes the regression by using the value of
default_url_options[:script_name]or an empty string as a benign truthy value foroptions[:script_name]when the prefix is being generated, avoiding the duplicaterelative_url_rootvalue in the final result.This resolves issues #20920 and #21459.
This is an alternative pull request to #20958.