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

rubicon: avoid passing unknown position #4207

Merged
merged 5 commits into from
Sep 19, 2019
Merged

rubicon: avoid passing unknown position #4207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
78ea51d
rubicon: not passing pos if not specified
bretg Sep 18, 2019
eaa6f00
added comment
bretg Sep 18, 2019
d12fee8
not sending pos for video when undefined
bretg Sep 18, 2019
9005d77
cleaning up test
bretg Sep 18, 2019
55d7c03
fixed unit test
bretg Sep 18, 2019
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
14 changes: 12 additions & 2 deletions modules/rubiconBidAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,6 @@ export const spec = {
'zone_id': params.zoneId,
'size_id': parsedSizes[0],
'alt_size_ids': parsedSizes.slice(1).join(',') || undefined,
'p_pos': params.position === 'atf' || params.position === 'btf' ? params.position : 'unknown',
'rp_floor': (params.floor = parseFloat(params.floor)) > 0.01 ? params.floor : 0.01,
'rp_secure': isSecure() ? '1' : '0',
'tk_flint': `${configIntType || DEFAULT_INTEGRATION}_v$prebid.version$`,
Expand All @@ -409,6 +408,11 @@ export const spec = {
'rf': _getPageUrl(bidRequest, bidderRequest)
};

// add p_pos only if specified and valid
if (params.position === 'atf' || params.position === 'btf') {
data['p_pos'] = params.position;
}

if ((bidRequest.userId || {}).tdid) {
data['tpid_tdid'] = bidRequest.userId.tdid;
}
Expand Down Expand Up @@ -768,8 +772,14 @@ function addVideoParameters(data, bidRequest) {
if (typeof data.imp[0].video === 'object' && data.imp[0].video.skipafter === undefined) {
data.imp[0].video.skipafter = bidRequest.params.video.skipdelay;
}
// video.pos can already be specified by adunit.mediatypes.video.pos.
// but if not, it might be specified in the params
if (typeof data.imp[0].video === 'object' && data.imp[0].video.pos === undefined) {
data.imp[0].video.pos = bidRequest.params.position === 'atf' ? 1 : (bidRequest.params.position === 'btf' ? 3 : 0);
if (bidRequest.params.position === 'atf') {
data.imp[0].video.pos = 1;
} else if (bidRequest.params.position === 'btf') {
data.imp[0].video.pos = 3;
}
}

const size = parseSizes(bidRequest, 'video')
Expand Down
43 changes: 31 additions & 12 deletions test/spec/modules/rubiconBidAdapter_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,28 @@ describe('the rubicon adapter', function () {
});
});

it('should not send p_pos to AE if not params.position specified', function() {
var noposRequest = utils.deepClone(bidderRequest);
delete noposRequest.bids[0].params.position;

let [request] = spec.buildRequests(noposRequest.bids, noposRequest);
let data = parseQuery(request.data);

expect(data['site_id']).to.equal('70608');
expect(data['p_pos']).to.equal(undefined);
});

it('should not send p_pos to AE if not params.position is invalid', function() {
var badposRequest = utils.deepClone(bidderRequest);
badposRequest.bids[0].params.position = 'bad';

let [request] = spec.buildRequests(badposRequest.bids, badposRequest);
let data = parseQuery(request.data);

expect(data['site_id']).to.equal('70608');
expect(data['p_pos']).to.equal(undefined);
});

it('ad engine query params should be ordered correctly', function () {
sandbox.stub(Math, 'random').callsFake(() => 0.1);
let [request] = spec.buildRequests(bidderRequest.bids, bidderRequest);
Expand Down Expand Up @@ -1135,14 +1157,6 @@ describe('the rubicon adapter', function () {
expect(post.ext.prebid.cache.vastxml.returnCreative).to.equal(false)
});

it('should send request with proper ad position', function () {
createVideoBidderRequest();
let positionBidderRequest = utils.deepClone(bidderRequest);
positionBidderRequest.bids[0].mediaTypes.video.pos = 1;
let [request] = spec.buildRequests(positionBidderRequest.bids, positionBidderRequest);
expect(request.data.imp[0].video.pos).to.equal(1);
});

it('should send correct bidfloor to PBS', function() {
createVideoBidderRequest();

Expand Down Expand Up @@ -1171,13 +1185,18 @@ describe('the rubicon adapter', function () {
expect(request.data.imp[0]).to.not.haveOwnProperty('bidfloor');
});

it('should send request with proper ad position when mediaTypes.video.pos is not defined', function () {
it('should send request with proper ad position', function () {
createVideoBidderRequest();
let positionBidderRequest = utils.deepClone(bidderRequest);
positionBidderRequest.bids[0].mediaTypes.video.pos = 1;
let [request] = spec.buildRequests(positionBidderRequest.bids, positionBidderRequest);
expect(request.data.imp[0].video.pos).to.equal(1);

positionBidderRequest = utils.deepClone(bidderRequest);
positionBidderRequest.bids[0].params.position = undefined;
positionBidderRequest.bids[0].mediaTypes.video.pos = undefined;
let [request] = spec.buildRequests(positionBidderRequest.bids, positionBidderRequest);
expect(request.data.imp[0].video.pos).to.equal(0);
[request] = spec.buildRequests(positionBidderRequest.bids, positionBidderRequest);
expect(request.data.imp[0].video.pos).to.equal(undefined);

positionBidderRequest = utils.deepClone(bidderRequest);
positionBidderRequest.bids[0].params.position = 'atf'
Expand All @@ -1195,7 +1214,7 @@ describe('the rubicon adapter', function () {
positionBidderRequest.bids[0].params.position = 'foobar';
positionBidderRequest.bids[0].mediaTypes.video.pos = undefined;
[request] = spec.buildRequests(positionBidderRequest.bids, positionBidderRequest);
expect(request.data.imp[0].video.pos).to.equal(0);
expect(request.data.imp[0].video.pos).to.equal(undefined);
});

it('should properly enforce video.context to be either instream or outstream', function () {
Expand Down