Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Doubleclick Fast Fetch: Send default safeframe version on ad request #9613

Merged
merged 2 commits into from
Jun 1, 2017
Merged

Doubleclick Fast Fetch: Send default safeframe version on ad request #9613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd292ca
Send default safeframe version on ad request
keithwrightbos May 30, 2017
225a5aa
fix test failure
keithwrightbos May 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
// Most other ad networks will want to put their A4A code entirely in the
// extensions/amp-ad-network-${NETWORK_NAME}-impl directory.

import {AmpA4A} from '../../amp-a4a/0.1/amp-a4a';
import {AmpA4A, DEFAULT_SAFEFRAME_VERSION} from '../../amp-a4a/0.1/amp-a4a';
import {
isInManualExperiment,
} from '../../../ads/google/a4a/traffic-experiments';
Expand Down Expand Up @@ -136,7 +136,7 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
{name: 'adk', value: this.adKey_(sizeStr)},
{name: 'gdfp_req', value: '1'},
{name: 'impl', value: 'ifr'},
{name: 'sfv', value: 'A'},
{name: 'sfv', value: DEFAULT_SAFEFRAME_VERSION},
{name: 'sz', value: sizeStr},
{name: 'tfcd', value: tfcd == undefined ? null : tfcd},
{name: 'u_sd', value: global.devicePixelRatio},
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ describes.sandboxed('amp-ad-network-doubleclick-impl', {}, () => {
expect(url).to.match(new RegExp(
'^https://securepubads\\.g\\.doubleclick\\.net/gampad/ads' +
// Depending on how the test is run, it can get different results.
'\\?adk=[0-9]+&gdfp_req=1&impl=ifr&sfv=A&sz=320x50' +
'\\?adk=[0-9]+&gdfp_req=1&impl=ifr&sfv=\\d+-\\d+-\\d+&sz=320x50' +
'&u_sd=[0-9]+(&asnt=[0-9]+-[0-9]+)?(&art=2)?' +
'&is_amp=3&amp_v=%24internalRuntimeVersion%24' +
'&d_imp=1&dt=[0-9]+&ifi=[0-9]+&adf=[0-9]+' +
Expand Down