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

fix failing lint errors on circle ci #5918

Merged
merged 1 commit into from
Nov 2, 2020
Merged

fix failing lint errors on circle ci #5918

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
30 changes: 15 additions & 15 deletions modules/districtmDMXBidAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as utils from '../src/utils.js';
import { registerBidder } from '../src/adapters/bidderFactory.js';
import {config} from '../src/config.js';
import { config } from '../src/config.js';
import { BANNER, VIDEO } from '../src/mediaTypes.js';

const BIDDER_CODE = 'districtmDMX';
Expand Down Expand Up @@ -28,12 +28,12 @@ export const spec = {
response = response.body || {};
if (response.seatbid) {
if (utils.isArray(response.seatbid)) {
const {seatbid} = response;
const { seatbid } = response;
let winners = seatbid.reduce((bid, ads) => {
let ad = ads.bid.reduce(function(oBid, nBid) {
let ad = ads.bid.reduce(function (oBid, nBid) {
if (oBid.price < nBid.price) {
const bid = matchRequest(nBid.impid, bidRequest);
const {width, height} = defaultSize(bid);
const { width, height } = defaultSize(bid);
nBid.cpm = parseFloat(nBid.price).toFixed(2);
nBid.bidId = nBid.impid;
nBid.requestId = nBid.impid;
Expand Down Expand Up @@ -61,7 +61,7 @@ export const spec = {
oBid.cpm = oBid.price;
return oBid;
}
}, {price: 0});
}, { price: 0 });
if (ad.adm) {
bid.push(ad)
}
Expand Down Expand Up @@ -98,7 +98,7 @@ export const spec = {
let params = config.getConfig('dmx');
dmxRequest.user = params.user || {};
let site = params.site || {};
dmxRequest.site = {...dmxRequest.site, ...site}
dmxRequest.site = { ...dmxRequest.site, ...site }
} catch (e) {

}
Expand Down Expand Up @@ -144,7 +144,7 @@ export const spec = {
dmxRequest.source = {};
dmxRequest.source.ext = {};
dmxRequest.source.ext.schain = schain || {}
} catch (e) {}
} catch (e) { }
let tosendtags = bidRequest.map(dmx => {
var obj = {};
obj.id = dmx.bidId;
Expand All @@ -171,7 +171,7 @@ export const spec = {
w: cleanSizes(dmx.sizes, 'w'),
h: cleanSizes(dmx.sizes, 'h'),
format: cleanSizes(dmx.sizes).map(s => {
return {w: s[0], h: s[1]};
return { w: s[0], h: s[1] };
}).filter(obj => typeof obj.w === 'number' && typeof obj.h === 'number')
};
}
Expand Down Expand Up @@ -214,7 +214,7 @@ export const spec = {
}
}

export function getFloor (bid) {
export function getFloor(bid) {
let floor = null;
if (typeof bid.getFloor === 'function') {
const floorInfo = bid.getFloor({
Expand Down Expand Up @@ -294,7 +294,7 @@ export function shuffle(sizes, list) {
}
results.push(current);
results = list.filter(l => results.map(r => `${r[0]}x${r[1]}`).indexOf(`${l.size[0]}x${l.size[1]}`) !== -1);
results = results.sort(function(a, b) {
results = results.sort(function (a, b) {
return b.s - a.s;
})
return results.map(r => r.size);
Expand Down Expand Up @@ -340,7 +340,7 @@ export function upto5(allimps, dmxRequest, bidderRequest, DMXURI) {
*
*/
export function matchRequest(id, bidRequest) {
const {bids} = bidRequest.bidderRequest;
const { bids } = bidRequest.bidderRequest;
const [returnValue] = bids.filter(bid => bid.bidId === id);
return returnValue;
}
Expand All @@ -356,7 +356,7 @@ export function checkDeepArray(Arr) {
}
}
export function defaultSize(thebidObj) {
const {sizes} = thebidObj;
const { sizes } = thebidObj;
const returnObject = {};
returnObject.width = checkDeepArray(sizes)[0];
returnObject.height = checkDeepArray(sizes)[1];
Expand All @@ -377,7 +377,7 @@ export function bindUserId(eids, value, source, atype) {
}
}

export function getApi({api}) {
export function getApi({ api }) {
let defaultValue = [2];
if (api && Array.isArray(api) && api.length > 0) {
return api
Expand All @@ -394,7 +394,7 @@ export function getPlaybackmethod(playback) {
return [2]
}

export function getProtocols({protocols}) {
export function getProtocols({ protocols }) {
let defaultValue = [2, 3, 5, 6, 7, 8];
if (protocols && Array.isArray(protocols) && protocols.length > 0) {
return protocols;
Expand All @@ -416,7 +416,7 @@ export function cleanVast(str, nurl) {
}
return str;
} catch (e) {
if(!nurl) {
if (!nurl) {
return str
}
const insrt = `<Impression><![CDATA[${nurl}]]></Impression>`
Expand Down
79 changes: 41 additions & 38 deletions test/spec/modules/districtmDmxBidAdapter_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {expect} from 'chai';
import { expect } from 'chai';
import * as _ from 'lodash';
import {spec, matchRequest, checkDeepArray, defaultSize, upto5, cleanSizes, shuffle, getApi, bindUserId, getPlaybackmethod, getProtocols, cleanVast} from '../../../modules/districtmDMXBidAdapter.js';
import { spec, matchRequest, checkDeepArray, defaultSize, upto5, cleanSizes, shuffle, getApi, bindUserId, getPlaybackmethod, getProtocols, cleanVast } from '../../../modules/districtmDMXBidAdapter.js';

const sample_vast = `<VAST version="3.0">
<Ad id="6">
Expand Down Expand Up @@ -144,8 +144,12 @@ const bidRequestVideo = [{
'video/mp4'],
}
},
'mediaTypes': { video: {context: 'instream', // or 'outstream'
playerSize: [[640, 480]]} },
'mediaTypes': {
video: {
context: 'instream', // or 'outstream'
playerSize: [[640, 480]]
}
},
'adUnitCode': 'div-gpt-ad-12345678-1',
'transactionId': 'f6d13fa6-ebc1-41ac-9afa-d8171d22d2c2',
'sizes': [
Expand Down Expand Up @@ -602,53 +606,53 @@ const emptyResponseSeatBid = { body: { seatbid: [] } };

describe('DistrictM Adaptor', function () {
const districtm = spec;
describe('verification of upto5', function() {
it('upto5 function should always break 12 imps into 3 request same for 15', function() {
describe('verification of upto5', function () {
it('upto5 function should always break 12 imps into 3 request same for 15', function () {
expect(upto5([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], bidRequest, bidderRequest, 'https://google').length).to.be.equal(3)
expect(upto5([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15], bidRequest, bidderRequest, 'https://google').length).to.be.equal(3)
})
})

describe('test vast tag', function() {
it('img tag should not be present', function() {
describe('test vast tag', function () {
it('img tag should not be present', function () {
expect(cleanVast(sample_vast).indexOf('img') !== -1).to.be.equal(false)
})
})
describe('Test getApi function', function() {
describe('Test getApi function', function () {
const data = {
api: [1]
}
it('Will return 1 for vpaid version 1', function() {
it('Will return 1 for vpaid version 1', function () {
expect(getApi(data)[0]).to.be.equal(1)
})
it('Will return 2 for vpaid default', function() {
it('Will return 2 for vpaid default', function () {
expect(getApi({})[0]).to.be.equal(2)
})
})

describe('Test cleanSizes function', function() {
it('sequence will be respected', function() {
describe('Test cleanSizes function', function () {
it('sequence will be respected', function () {
expect(cleanSizes(bidderRequest.bids[0].sizes).toString()).to.be.equal('300,250,300,600')
})
it('sequence will be respected', function() {
it('sequence will be respected', function () {
expect(cleanSizes([[728, 90], [970, 90], [300, 600], [320, 50]]).toString()).to.be.equal('728,90,320,50,300,600,970,90')
})
})

describe('Test getPlaybackmethod function', function() {
it('getPlaybackmethod will return 2', function() {
describe('Test getPlaybackmethod function', function () {
it('getPlaybackmethod will return 2', function () {
expect(getPlaybackmethod([])[0]).to.be.equal(2)
})
it('getPlaybackmethod will return 6', function() {
it('getPlaybackmethod will return 6', function () {
expect(getPlaybackmethod(['viewport_sound_off'])[0]).to.be.equal(6)
})
})

describe('Test getProtocols function', function() {
it('getProtocols will return 3', function() {
expect(getProtocols({protocols: [3]})[0]).to.be.equal(3)
describe('Test getProtocols function', function () {
it('getProtocols will return 3', function () {
expect(getProtocols({ protocols: [3] })[0]).to.be.equal(3)
})
it('getProtocols will return 6', function() {
it('getProtocols will return 6', function () {
expect(_.isEqual(getProtocols({}), [2, 3, 5, 6, 7, 8])).to.be.equal(true)
})
})
Expand Down Expand Up @@ -687,7 +691,7 @@ describe('DistrictM Adaptor', function () {
memberid: 10003,
};
it(`function should return true`, function () {
expect(districtm.isBidRequestValid({params})).to.be.equal(true);
expect(districtm.isBidRequestValid({ params })).to.be.equal(true);
});
it(`function should return false`, function () {
expect(districtm.isBidRequestValid({ params: { memberid: 12345 } })).to.be.equal(false);
Expand Down Expand Up @@ -716,19 +720,19 @@ describe('DistrictM Adaptor', function () {
it(`the function should return an array`, function () {
expect(buildRequestResults).to.be.an('object');
});
it(`contain gdpr consent & ccpa`, function() {
it(`contain gdpr consent & ccpa`, function () {
const bidr = JSON.parse(buildRequestResults.data)
expect(bidr.regs.ext.gdpr).to.be.equal(1);
expect(bidr.regs.ext.us_privacy).to.be.equal('1NY');
expect(bidr.user.ext.consent).to.be.an('string');
});
it(`test contain COPPA`, function() {
it(`test contain COPPA`, function () {
const bidr = JSON.parse(buildRequestResults.data)
bidr.regs = bidr.regs || {};
bidr.regs.coppa = 1;
expect(bidr.regs.coppa).to.be.equal(1)
})
it(`test should not contain COPPA`, function() {
it(`test should not contain COPPA`, function () {
const bidr = JSON.parse(buildRequestResultsNoCoppa.data)
expect(bidr.regs.coppa).to.be.equal(0)
})
Expand All @@ -737,17 +741,17 @@ describe('DistrictM Adaptor', function () {
});
});

describe('bidRequest Video testing', function() {
describe('bidRequest Video testing', function () {
const request = districtm.buildRequests(bidRequestVideo, bidRequestVideo);
const data = JSON.parse(request.data)
expect(data instanceof Object).to.be.equal(true)
})

describe(`interpretResponse test usage`, function () {
const responseResults = districtm.interpretResponse(responses, {bidderRequest});
const emptyResponseResults = districtm.interpretResponse(emptyResponse, {bidderRequest});
const emptyResponseResultsNegation = districtm.interpretResponse(responsesNegative, {bidderRequest});
const emptyResponseResultsEmptySeat = districtm.interpretResponse(emptyResponseSeatBid, {bidderRequest});
const responseResults = districtm.interpretResponse(responses, { bidderRequest });
const emptyResponseResults = districtm.interpretResponse(emptyResponse, { bidderRequest });
const emptyResponseResultsNegation = districtm.interpretResponse(responsesNegative, { bidderRequest });
const emptyResponseResultsEmptySeat = districtm.interpretResponse(emptyResponseSeatBid, { bidderRequest });
it(`the function should return an array`, function () {
expect(responseResults).to.be.an('array');
});
Expand All @@ -767,10 +771,10 @@ describe('DistrictM Adaptor', function () {
});

describe(`check validation for id sync gdpr ccpa`, () => {
let allin = spec.getUserSyncs({iframeEnabled: true}, {}, bidderRequest.gdprConsent, bidderRequest.uspConsent)[0]
let noCCPA = spec.getUserSyncs({iframeEnabled: true}, {}, bidderRequest.gdprConsent, null)[0]
let noGDPR = spec.getUserSyncs({iframeEnabled: true}, {}, null, bidderRequest.uspConsent)[0]
let nothing = spec.getUserSyncs({iframeEnabled: true}, {}, null, null)[0]
let allin = spec.getUserSyncs({ iframeEnabled: true }, {}, bidderRequest.gdprConsent, bidderRequest.uspConsent)[0]
let noCCPA = spec.getUserSyncs({ iframeEnabled: true }, {}, bidderRequest.gdprConsent, null)[0]
let noGDPR = spec.getUserSyncs({ iframeEnabled: true }, {}, null, bidderRequest.uspConsent)[0]
let nothing = spec.getUserSyncs({ iframeEnabled: true }, {}, null, null)[0]

/*

Expand All @@ -793,10 +797,10 @@ describe('DistrictM Adaptor', function () {
})

describe(`Helper function testing`, function () {
const bid = matchRequest('29a28a1bbc8a8d', {bidderRequest});
const {width, height} = defaultSize(bid);
const bid = matchRequest('29a28a1bbc8a8d', { bidderRequest });
const { width, height } = defaultSize(bid);
it(`test matchRequest`, function () {
expect(matchRequest('29a28a1bbc8a8d', {bidderRequest})).to.be.an('object');
expect(matchRequest('29a28a1bbc8a8d', { bidderRequest })).to.be.an('object');
});
it(`test checkDeepArray`, function () {
expect(_.isEqual(checkDeepArray([728, 90]), [728, 90])).to.be.equal(true);
Expand All @@ -811,4 +815,3 @@ describe('DistrictM Adaptor', function () {
});
});
});