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

Jump to bottom

No bid version 1.2.5 #5137

Merged
merged 13 commits into from
Apr 22, 2020
Merged

No bid version 1.2.5 #5137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0eba11e
Enable supplyChain support
redaguermas Mar 4, 2020
c0fb8ee
Added support for COPPA
redaguermas Mar 5, 2020
36fab76
Merge branch 'master' of https://github.com/prebid/Prebid.js
redaguermas Mar 13, 2020
51525d7
Merge branch 'master' of https://github.com/prebid/Prebid.js
redaguermas Apr 13, 2020
2a7ee10
Added support for video ad type
redaguermas Apr 17, 2020
bb803ca
Fix lint errors
redaguermas Apr 17, 2020
c489025
Fix lint
redaguermas Apr 17, 2020
d2f5122
Removed "useless condition"
redaguermas Apr 17, 2020
6b11e52
Merge branch 'master' of https://github.com/prebid/Prebid.js
redaguermas Apr 20, 2020
9d0db06
Merge branch 'master' into NoBid-Version-1.2.5
redaguermas Apr 20, 2020
12ea7fb
Using ddepAccess and fixed version to 1.2.5
redaguermas Apr 21, 2020
4b870b3
Fix lint
redaguermas Apr 21, 2020
bf804fd
Fixed vidoe test
redaguermas Apr 22, 2020
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
51 changes: 37 additions & 14 deletions modules/nobidBidAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import * as utils from '../src/utils.js';
import { config } from '../src/config.js';
import { registerBidder } from '../src/adapters/bidderFactory.js';
import { BANNER } from '../src/mediaTypes.js';
import { BANNER, VIDEO } from '../src/mediaTypes.js';
import { getStorageManager } from '../src/storageManager.js';

const storage = getStorageManager();
const BIDDER_CODE = 'nobid';
window.nobidVersion = '1.2.4';
window.nobidVersion = '1.2.5';
window.nobid = window.nobid || {};
window.nobid.bidResponses = window.nobid.bidResponses || {};
window.nobid.timeoutTotal = 0;
Expand Down Expand Up @@ -156,9 +156,6 @@ function nobidBuildRequests(bids, bidderRequest) {
} else {
a.g = {};
}
if (adunitObject.companion) {
a.c = adunitObject.companion;
}
if (adunitObject.div) {
removeByAttrValue(adunits, 'd', adunitObject.div);
}
Expand All @@ -171,9 +168,11 @@ function nobidBuildRequests(bids, bidderRequest) {
if (adunitObject.placementId) {
a.pid = adunitObject.placementId;
}
/* {"BIDDER_ID":{"WxH":"TAG_ID", "WxH":"TAG_ID"}} */
if (adunitObject.rtb) {
a.rtb = adunitObject.rtb;
if (adunitObject.ad_type) {
a.at = adunitObject.ad_type;
}
if (adunitObject.params) {
a.params = adunitObject.params;
}
adunits.push(a);
return adunits;
Expand All @@ -197,10 +196,24 @@ function nobidBuildRequests(bids, bidderRequest) {
var sizes = bid.sizes;
siteId = (typeof bid.params['siteId'] != 'undefined' && bid.params['siteId']) ? bid.params['siteId'] : siteId;
var placementId = bid.params['placementId'];
if (siteId && bid.params && bid.params.tags) {
newAdunit({div: divid, sizes: sizes, rtb: bid.params.tags, siteId: siteId, placementId: placementId}, adunits);
} else if (siteId) {
newAdunit({div: divid, sizes: sizes, siteId: siteId, placementId: placementId}, adunits);

var adType = 'banner';
const videoMediaType = utils.deepAccess(bid, 'mediaTypes.video');
const context = utils.deepAccess(bid, 'mediaTypes.video.context');
if (bid.mediaType === VIDEO || (videoMediaType && context === 'instream')) {
adType = 'video';
}

if (siteId) {
newAdunit({
div: divid,
sizes: sizes,
siteId: siteId,
placementId: placementId,
ad_type: adType,
params: bid.params
},
adunits);
}
}
if (siteId) {
Expand Down Expand Up @@ -246,8 +259,18 @@ function nobidInterpretResponse(response, bidRequest) {
netRevenue: true,
ttl: 300,
ad: bid.adm,
mediaType: BANNER
mediaType: bid.atype || BANNER,
};
if (bid.vastUrl) {
bidResponse.vastUrl = bid.vastUrl;
}
if (bid.vastXml) {
bidResponse.vastXml = bid.vastXml;
}
if (bid.videoCacheKey) {
bidResponse.videoCacheKey = bid.videoCacheKey;
}

bidResponses.push(bidResponse);
}
return bidResponses;
Expand All @@ -266,7 +289,7 @@ window.nobid.renderTag = function(doc, id, win) {
}
export const spec = {
code: BIDDER_CODE,
supportedMediaTypes: [BANNER],
supportedMediaTypes: [BANNER, VIDEO],
/**
* Determines whether or not the given bid request is valid.
*
Expand Down
89 changes: 89 additions & 0 deletions test/spec/modules/nobidBidAdapter_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,95 @@ describe('Nobid Adapter', function () {
});
});

describe('isVideoBidRequestValid', function () {
let bid = {
bidder: 'nobid',
params: {
siteId: 2,
video: {
skippable: true,
playback_methods: ['auto_play_sound_off'],
position: 'atf',
mimes: ['video/x-flv', 'video/mp4', 'video/x-ms-wmv', 'application/x-shockwave-flash', 'application/javascript'],
minduration: 1,
maxduration: 30,
frameworks: [1, 2, 3, 4, 5, 6]
}
},
adUnitCode: 'adunit-code',
sizes: [[640, 480]],
bidId: '30b31c1838de1e',
bidderRequestId: '22edbae2733bf6',
auctionId: '1d1a030790a475',
mediaTypes: {
video: {
context: 'instream'
}
}
};
const SITE_ID = 2;
const REFERER = 'https://www.examplereferer.com';
let bidRequests = [
{
bidder: 'nobid',
params: {
siteId: SITE_ID,
video: {
skippable: true,
playback_methods: ['auto_play_sound_off'],
position: 'atf',
mimes: ['video/x-flv', 'video/mp4', 'video/x-ms-wmv', 'application/x-shockwave-flash', 'application/javascript'],
minduration: 1,
maxduration: 30,
frameworks: [1, 2, 3, 4, 5, 6]
}
},
adUnitCode: 'adunit-code',
bidId: '30b31c1838de1e',
bidderRequestId: '22edbae2733bf6',
auctionId: '1d1a030790a475',
mediaTypes: {
video: {
playerSize: [640, 480],
context: 'instream'
}
}
}
];

let bidderRequest = {
refererInfo: {referer: REFERER}
}

it('should add source and version to the tag', function () {
const request = spec.buildRequests(bidRequests, bidderRequest);
const payload = JSON.parse(request.data);
expect(payload.sid).to.equal(SITE_ID);
expect(payload.l).to.exist.and.to.equal(encodeURIComponent(REFERER));
expect(payload.a).to.exist;
expect(payload.t).to.exist;
expect(payload.tz).to.exist;
expect(payload.r).to.exist;
expect(payload.lang).to.exist;
expect(payload.ref).to.exist;
expect(payload.a[0].d).to.exist.and.to.equal('adunit-code');
expect(payload.a[0].at).to.exist.and.to.equal('video');
expect(payload.a[0].params.video).to.exist;
expect(payload.a[0].params.video.skippable).to.exist.and.to.equal(true);
expect(payload.a[0].params.video.playback_methods).to.exist.and.to.contain('auto_play_sound_off');
expect(payload.a[0].params.video.position).to.exist.and.to.equal('atf');
expect(payload.a[0].params.video.mimes).to.exist.and.to.contain('video/x-flv');
expect(payload.a[0].params.video.minduration).to.exist.and.to.equal(1);
expect(payload.a[0].params.video.maxduration).to.exist.and.to.equal(30);
expect(payload.a[0].params.video.frameworks[0]).to.exist.and.to.equal(1);
expect(payload.a[0].params.video.frameworks[1]).to.exist.and.to.equal(2);
expect(payload.a[0].params.video.frameworks[2]).to.exist.and.to.equal(3);
expect(payload.a[0].params.video.frameworks[3]).to.exist.and.to.equal(4);
expect(payload.a[0].params.video.frameworks[4]).to.exist.and.to.equal(5);
expect(payload.a[0].params.video.frameworks[5]).to.exist.and.to.equal(6);
});
});

describe('buildRequests', function () {
const SITE_ID = 2;
const REFERER = 'https://www.examplereferer.com';
Expand Down