Allow xhr errors to parse json responses. #3669
Merged
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
| @@ -157,7 +157,7 @@ export class Xhr { | |||
| setupJson_(init); | |||
|
|
|||
| return this.fetchAmpCors_(input, init).then(response => { | |||
| return assertSuccess(response).json(); | |||
| return assertSuccess(response).then(response => response.json()); | |||
1 task
| err.retriable = true; | ||
| } | ||
| if (response.headers.get('Content-Type') == 'application/json') { | ||
| return response.json().then(json => { |
There was a problem hiding this comment.
You can't return a new promise here - you are still in the constructor of the top-level promise. This is most likely not what you want. You probably just need to run promise w/o return values.
| mockXhr.getResponseHeader = () => 'application/json'; | ||
| const promise = assertSuccess( | ||
| createResponseInstance('{"a": 2}', mockXhr)); | ||
| promise.should.be.rejected; |
There was a problem hiding this comment.
@dvoytenko this catches the problem with returning the resolved promise. I don't understand it well tbh, but my guess is that the promise is resolving and the .should.be.rejected won't catch this if we returned the resolved promise.
|
PTAL |
|
LGTM |
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.
A split PR from #3583
ITI: #3343