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

Fix buildMasterVideoTagFromAdserverTag() not selecting winning bid #1106

Merged
merged 1 commit into from
Apr 18, 2017
Merged

Fix buildMasterVideoTagFromAdserverTag() not selecting winning bid #1106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions src/adserver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import {formatQS} from './url';
import {getWinningBids} from './targeting';

//Adserver parent class
const AdServer = function(attr) {
this.name = attr.adserver;
this.code = attr.code;
this.getWinningBidByCode = function() {
var bidObject = $$PREBID_GLOBAL$$._bidsReceived.find(bid => bid.adUnitCode === this.code);
return bidObject;
return getWinningBids(this.code)[0];
};
};

Expand All @@ -30,9 +30,11 @@ exports.dfpAdserver = function (options, urlComponents) {

adserver.appendQueryParams = function() {
var bid = adserver.getWinningBidByCode();
this.urlComponents.search.description_url = encodeURIComponent(bid.descriptionUrl);
this.urlComponents.search.cust_params = getCustomParams(bid.adserverTargeting);
this.urlComponents.search.correlator = Date.now();
if (bid) {
this.urlComponents.search.description_url = encodeURIComponent(bid.descriptionUrl);
this.urlComponents.search.cust_params = getCustomParams(bid.adserverTargeting);
this.urlComponents.search.correlator = Date.now();
}
};

adserver.verifyAdserverTag = function() {
Expand Down
45 changes: 44 additions & 1 deletion test/spec/unit/pbjs_api_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ import {
var assert = require('chai').assert;
var expect = require('chai').expect;

var urlParse = require('url-parse');

var prebid = require('src/prebid');
var utils = require('src/utils');
var bidmanager = require('src/bidmanager');
Expand Down Expand Up @@ -1426,6 +1428,27 @@ describe('Unit: Prebid Module', function () {
beforeEach(() => {
resetAuction();
$$PREBID_GLOBAL$$._bidsReceived = [
{
"bidderCode": "appnexusAstDummyName",
"width": 0,
"height": 0,
"statusMessage": "Bid returned empty or error response",
"adId": "233bcbee889d46d",
"requestId": 123456,
"responseTimestamp": 1462919238959,
"requestTimestamp": 1462919238910,
"cpm": 0,
"bidder": "appnexus",
"adUnitCode": "/19968336/header-bid-tag-0",
"timeToRespond": 49,
"pbLg": "0.00",
"pbMg": "0.00",
"pbHg": "0.00",
"pbAg": "0.00",
"pbDg": "0.00",
"pbCg": "",
"adserverTargeting": {}
},
{
"bidderCode": "appnexusAst",
"dealId" : "1234",
Expand All @@ -1435,7 +1458,8 @@ describe('Unit: Prebid Module', function () {
"adId": "233bcbee889d46d",
"creative_id": 29681110,
"cpm": 10,
"adUrl": "http://lax1-ib.adnxs.com/ab?e=wqT_3QL8BKh8AgAAAwDWAAUBCMjAybkFEMLLiJWTu9PsVxjL84KE1tzG-kkgASotCQAAAQII4D8RAQcQAADgPxkJCQjwPyEJCQjgPykRCaAwuvekAji-B0C-B0gCUNbLkw5YweAnYABokUB4190DgAEBigEDVVNEkgUG8FKYAawCoAH6AagBAbABALgBAcABA8gBANABANgBAOABAPABAIoCOnVmKCdhJywgNDk0NDcyLCAxNDYyOTE5MjQwKTt1ZigncicsIDI5NjgxMTEwLDIeAPBskgLZASFmU21rZ0FpNjBJY0VFTmJMa3c0WUFDREI0Q2N3QURnQVFBUkl2Z2RRdXZla0FsZ0FZSk1IYUFCd0EzZ0RnQUVEaUFFRGtBRUJtQUVCb0FFQnFBRURzQUVBdVFFQUFBQUFBQURnUDhFQgkMTEFBNERfSkFRMkxMcEVUMU93XzJRFSggd1AtQUJBUFVCBSxASmdDaW9EVTJnV2dBZ0MxQWcBFgRDOQkIqERBQWdQSUFnUFFBZ1BZQWdQZ0FnRG9BZ0Q0QWdDQUF3RS6aAiUhV1FrbmI63AAcd2VBbklBUW8JXPCVVS7YAugH4ALH0wHqAh9odHRwOi8vcHJlYmlkLm9yZzo5OTk5L2dwdC5odG1sgAMAiAMBkAMAmAMFoAMBqgMAsAMAuAMAwAOsAsgDANgDAOADAOgDAPgDA4AEAJIEBC9qcHSYBACiBAoxMC4xLjEzLjM3qAQAsgQICAAQABgAIAC4BADABADIBADSBAoxMC4wLjg1Ljkx&s=1bf15e8cdc7c0c8c119614c6386ab1496560da39&referrer=http%3A%2F%2Fprebid.org%3A9999%2Fgpt.html",
"vastUrl": "http://www.simplevideoad.com/",
"descriptionUrl": "http://www.simplevideoad.com/",
"responseTimestamp": 1462919239340,
"requestTimestamp": 1462919238919,
"bidder": "appnexus",
Expand Down Expand Up @@ -1481,13 +1505,32 @@ describe('Unit: Prebid Module', function () {
expect(masterTagUrl).to.equal(adserverTag);
});

it('should return original adservertag if there are no bids for the given placement code', () => {
var options = {
'adserver': 'dfp',
'code': 'one-without-bids'
};
var masterTagUrl = $$PREBID_GLOBAL$$.buildMasterVideoTagFromAdserverTag(adserverTag, options);
expect(masterTagUrl).to.equal(adserverTag);
});

it('should log error when google\'s parameters are missing in adserverTag', () => {
var logErrorSpy = sinon.spy(utils, 'logError');
var adserverTag = 'https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/19968336/header-bid-tag-0&impl=s&gdfp_req=1&env=vp&output=xml_vast2&unviewed_position_start=1&url=www.test.com';
var masterTagUrl = $$PREBID_GLOBAL$$.buildMasterVideoTagFromAdserverTag(adserverTag, options);
assert.ok(logErrorSpy.calledOnce, true);
utils.logError.restore();
});

it('should append parameters to the adserverTag', () => {
var masterTagUrl = $$PREBID_GLOBAL$$.buildMasterVideoTagFromAdserverTag(adserverTag, options);
var masterTagUrlParsed = urlParse(masterTagUrl, true);
var masterTagQuery = masterTagUrlParsed.query;
var expectedTargetingQuery = 'hb_bidder=appnexus&hb_adid=233bcbee889d46d&hb_pb=10.00&hb_size=300x250&foobar=300x250&hb_deal_appnexusAst=1234';

expect(masterTagQuery).to.have.property('cust_params').and.to.equal(expectedTargetingQuery);
expect(masterTagQuery).to.have.property('description_url').and.to.equal('http://www.simplevideoad.com/');
});
});

describe('setBidderSequence', () => {
Expand Down