Updates expected Adzerk URL format. #13106
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
glevitzky
changed the title
lannka
reviewed
Jan 29, 2018
examples/adzerk.amp.html
Outdated
| @@ -14,21 +14,21 @@ | |||
|
|
|||
| <amp-ad width=300 height=250 | |||
| type="adzerk" | |||
| src="https://adzerk.com?id=0"> | |||
| src="https://engine.adzerk.net/amp?id=0"> | |||
There was a problem hiding this comment.
you might not want the URL to be from the pub, we can hard code in the extension.
also, the id param is only for dev purpose.
lannka
reviewed
Jan 29, 2018
| } | ||
| // TODO(adzerk): specify expected src path. | ||
| return /^https:\/\/adzerk.com\?id=\d+$/i.test(src) ? src : ''; | ||
| return `https://engine.adzerk.net/amp?r='${data}'`; |
There was a problem hiding this comment.
I think we should URL encode the data?
There was a problem hiding this comment.
actually encode the single quotes as well
encodeURIComponent(`'${data}'`)
lannka
reviewed
Jan 29, 2018
| } | ||
| // TODO(adzerk): specify expected src path. | ||
| return /^https:\/\/adzerk.com\?id=\d+$/i.test(src) ? src : ''; | ||
| return `https://engine.adzerk.net/amp?r='${encodeURIComponent(data)}'`; |
There was a problem hiding this comment.
you need to encode the single quotes as well
lannka
reviewed
Jan 29, 2018
| it('should be invalid', () => { | ||
| try { | ||
| impl.getAdUrl(); | ||
| expect(false).to.be.true; |
There was a problem hiding this comment.
no try-catch needed if you do
expect(() => imp.getAdUrl()).to.throw(/Expected data-r attribte/);
lannka
approved these changes
Jan 29, 2018
lannka
approved these changes
Jan 29, 2018
|
For #12903 |
gzgogo
pushed a commit
to gzgogo/amphtml
that referenced
this pull request
Feb 14, 2018
* Updated expected Adzerk URL format. * Moving away from using src attr on amp-ad. * Using data-r. * Test update. * Removing unused src attr from test. * Encoding json object. * Encoding quotes. * Test fix * Removing external quotes and added one more test.
gzgogo
pushed a commit
to gzgogo/amphtml
that referenced
this pull request
Feb 14, 2018
* Updated expected Adzerk URL format. * Moving away from using src attr on amp-ad. * Using data-r. * Test update. * Removing unused src attr from test. * Encoding json object. * Encoding quotes. * Test fix * Removing external quotes and added one more test.
gzgogo
pushed a commit
to gzgogo/amphtml
that referenced
this pull request
Feb 14, 2018
* Updated expected Adzerk URL format. * Moving away from using src attr on amp-ad. * Using data-r. * Test update. * Removing unused src attr from test. * Encoding json object. * Encoding quotes. * Test fix * Removing external quotes and added one more test.
RanAbram
pushed a commit
to RanAbram/amphtml
that referenced
this pull request
Mar 12, 2018
* Updated expected Adzerk URL format. * Moving away from using src attr on amp-ad. * Using data-r. * Test update. * Removing unused src attr from test. * Encoding json object. * Encoding quotes. * Test fix * Removing external quotes and added one more test.
protonate
pushed a commit
to protonate/amphtml
that referenced
this pull request
Mar 15, 2018
* Updated expected Adzerk URL format. * Moving away from using src attr on amp-ad. * Using data-r. * Test update. * Removing unused src attr from test. * Encoding json object. * Encoding quotes. * Test fix * Removing external quotes and added one more test.
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.
Ensures that ad requests can only be sent to:
https://engine.adzerk.net/amp. Note that query params may be appended to the end of the URL; this is especially the case for local testing, which relies on some appended id to differentiate between different templates in the /data/ directory.