Handle all valid URL path characters for rootURL/baseURL in tests-server #5909
Conversation
This file contains 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
| @@ -41,7 +41,8 @@ TestsServerAddon.prototype.serverMiddleware = function(config) { | |||
| var filePath = path.join(results.directory, assetPath); | |||
|
|
|||
| if (!existsSync(filePath) || !fs.statSync(filePath).isFile()) { | |||
| var newURL = baseURL + '/tests/index.html'; | |||
| // N.B., `baseURL` will end with a slash as it went through `cleanBaseURL` | |||
| var newURL = baseURL + 'tests/index.html'; | |||
There was a problem hiding this comment.
This appeared to be an existing bug. Without this change I got a double /, making my assertions fail: /braden/+//tests/index.html.
There was a problem hiding this comment.
Correct, no need for that code comment though IMHO
|
@rwjblue r? |
|
The AppVeyor problem is related to phantomjs-prebuilt not being installed (for the Environment: nodejs_version=4.2). Does not seem related to these changes. retest this |
|
This works for me. The appveyor build probably needs a re-run to get around a temporary network problem? |
|
kicking appveyor now |
les2
force-pushed
the
test-server-base-url-escaping
branch
from
900b15a
to
d8607dd
Compare
|
Pushed a change to a comment to make build run again. |
|
Looks good in general 👍 Not sure what's up with CI at the moment... |
|
@les2 could you rebase on the current master branch? hopefully that should solve the CI issues... |
|
@Turbo87 rebasing ... |
Unit test demonstrating bug caused by `+` in baseURL or rootURL.
The previous implementation used a regular expression for matching the beginning of the request path against the baseURL + 'tests' but did not escape the baseURL. Because RFC 3986 allows some characters that are not valid in regexes, this caused problems when using them for the baseURL. Closes ember-cli#5876
les2
force-pushed
the
test-server-base-url-escaping
branch
from
d8607dd
to
17465cd
Compare
|
@Turbo87 @stefanpenner CI passes now |
|
📌 Commit 17465cd has been approved by |
|
⚡ Test exempted - status |
homu
added a commit
that referenced
this pull request
May 26, 2016
Handle all valid URL path characters for rootURL/baseURL in tests-server The previous implementation used a regular expression for matching the beginning of the request path against the baseURL + 'tests' but did not escape the baseURL. Because RFC 3986 allows some characters that are not valid in regexes, this caused problems when using them for the baseURL. Closes #5876
|
@stefanpenner @nathanhammond I'd like to pull this into the |
homu
added a commit
that referenced
this pull request
Jun 2, 2016
"tests-server" test cleanup This PR cleans up the "tests-server" unit test now that #5909 is merged.
|
Late to seeing this. It's in beta now! 😛 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The previous implementation used a regular expression for matching the
beginning of the request path against the baseURL + 'tests' but did
not escape the baseURL. Because RFC 3986 allows some characters that
are not valid in regexes, this caused problems when using them for
the baseURL.
Closes #5876