add expectedError method#6581
Merged
erwinmombay merged 4 commits intoampproject:masterfrom Dec 20, 2016
Merged
Conversation
da3b87c to
52460dd
Compare
dvoytenko
suggested changes
Dec 9, 2016
| expectedError(tag, var_args) { | ||
| const error = this.error(tag, var_args); | ||
| if (error) { | ||
| error.expected = true; |
Contributor
There was a problem hiding this comment.
While correct, it's a bit weird to set flag on an error after it's been reported. Maybe better refactor call into a private method and call from both methods with different flags?
Member
Author
There was a problem hiding this comment.
yeah i can do that, that was actually the original code i had written.
52460dd to
4bc5a5f
Compare
Member
Author
|
@dvoytenko changes made. PTAL |
jridgewell
reviewed
Dec 9, 2016
Contributor
jridgewell
left a comment
There was a problem hiding this comment.
Can we add #expectedError calls to xhr-impl.js and amp-accordion.js, too?
| * @return {!Error|undefined} | ||
| */ | ||
| error(tag, var_args) { | ||
| error_(tag, var_args) { |
src/log.js
Outdated
| const error = this.error_.apply(this, arguments); | ||
| if (error) { | ||
| error.expected = true; | ||
| this.win.setTimeout(() => {throw error;}); |
Contributor
There was a problem hiding this comment.
Don't we have a rethrowAsync?
Member
Author
There was a problem hiding this comment.
yeah, i think it calls createErrorVarArgs again though
Member
Author
|
@jridgewell can you point out to me what the expectedError is in xhr? |
dvoytenko
approved these changes
Dec 9, 2016
Contributor
|
Ping. |
Member
Author
|
@jridgewell sorry bout that, will finish this today. got caught up in this other issue |
ac0dc33 to
5ec84cb
Compare
erwinmombay
commented
Dec 16, 2016
| xhr.open(method, url); | ||
| } else { | ||
| throw new Error('CORS is not supported'); | ||
| throw dev().createExpectedError('CORS is not supported'); |
erwinmombay
commented
Dec 16, 2016
| }; | ||
| xhr.onabort = () => { | ||
| reject(new Error('Request aborted')); | ||
| reject(user().createExpectedError('Request aborted')); |
5ec84cb to
9062274
Compare
dvoytenko
approved these changes
Dec 17, 2016
9062274 to
a4a008e
Compare
a4a008e to
d1f3715
Compare
Lith
pushed a commit
to Lith/amphtml
that referenced
this pull request
Dec 22, 2016
* add expectedError method * add private helper method and tests * add private annotation * add createExpectedError method and fix xhr-impl
Lith
pushed a commit
to Lith/amphtml
that referenced
this pull request
Dec 22, 2016
* add expectedError method * add private helper method and tests * add private annotation * add createExpectedError method and fix xhr-impl
torch2424
pushed a commit
to torch2424/amphtml
that referenced
this pull request
Jan 3, 2017
* add expectedError method * add private helper method and tests * add private annotation * add createExpectedError method and fix xhr-impl
This was referenced Aug 13, 2020
This was referenced Dec 18, 2020
This was referenced Jan 11, 2021
This was referenced Feb 14, 2021
This was referenced Jun 7, 2021
This was referenced Jul 26, 2021
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
3 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.
No description provided.