From ae6e0655130b90bc88904f8f167db9ba297723b2 Mon Sep 17 00:00:00 2001 From: Roni Gordon Date: Fri, 25 Nov 2016 15:18:49 -0500 Subject: [PATCH] Code Refactoring - Upgrading end point. --- src/adapters/indexExchange.js | 159 ++++++++++++++++-- test/helpers/index_adapter_response.js | 96 ----------- .../adapters/indexExchange_request_spec.js | 2 +- .../adapters/indexExchange_response_spec.js | 54 +++--- .../adapters/indexExchange_validation_spec.js | 2 +- 5 files changed, 175 insertions(+), 138 deletions(-) delete mode 100644 test/helpers/index_adapter_response.js diff --git a/src/adapters/indexExchange.js b/src/adapters/indexExchange.js index dbf7158e767..7f6888e974e 100644 --- a/src/adapters/indexExchange.js +++ b/src/adapters/indexExchange.js @@ -13,6 +13,7 @@ var CONSTANTS = { "queryParam": "pbjs_ix_debug", "mode": { "sandbox": { + "topFrameLimit": 10, "queryValue": "sandbox", "siteID": "999990" } @@ -20,8 +21,123 @@ var CONSTANTS = { } }; -var cygnus_index_parse_res = function () { -}; +var OPEN_MARKET = 'IOM'; +var PRIVATE_MARKET = 'IPM'; + +window.cygnus_index_parse_res = function(response) { + try { + if (response) { + if (typeof _IndexRequestData !== "object" || typeof _IndexRequestData.impIDToSlotID !== "object" || typeof _IndexRequestData.impIDToSlotID[response.id] === "undefined") { + return; + } + var targetMode = 1; + var callbackFn; + if (typeof _IndexRequestData.reqOptions === 'object' && typeof _IndexRequestData.reqOptions[response.id] === 'object') { + if (typeof _IndexRequestData.reqOptions[response.id].callback === "function") { + callbackFn = _IndexRequestData.reqOptions[response.id].callback; + } + if (typeof _IndexRequestData.reqOptions[response.id].targetMode === "number") { + targetMode = _IndexRequestData.reqOptions[response.id].targetMode; + } + } + + _IndexRequestData.lastRequestID = response.id; + _IndexRequestData.targetIDToBid = {}; + _IndexRequestData.targetIDToResp = {}; + _IndexRequestData.targetIDToCreative = {}; + + var allBids = []; + var seatbidLength = typeof response.seatbid === "undefined" ? 0 : response.seatbid.length; + for (var i = 0; i < seatbidLength; i++) { + for (var j = 0; j < response.seatbid[i].bid.length; j++) { + var bid = response.seatbid[i].bid[j]; + if (typeof bid.ext !== "object" || typeof bid.ext.pricelevel !== "string") { + continue; + } + if (typeof _IndexRequestData.impIDToSlotID[response.id][bid.impid] === "undefined") { + continue; + } + var slotID = _IndexRequestData.impIDToSlotID[response.id][bid.impid]; + var targetID; + var noTargetModeTargetID; + var targetPrefix; + if (typeof bid.ext.dealid === "string") { + if (targetMode === 1) { + targetID = slotID + bid.ext.pricelevel; + } else { + targetID = slotID + "_" + bid.ext.dealid; + } + noTargetModeTargetID = slotID + '_' + bid.ext.dealid; + targetPrefix = PRIVATE_MARKET + '_'; + } else { + targetID = slotID + bid.ext.pricelevel; + noTargetModeTargetID = slotID + bid.ext.pricelevel; + targetPrefix = OPEN_MARKET + '_'; + } + if (_IndexRequestData.targetIDToBid[targetID] === undefined) { + _IndexRequestData.targetIDToBid[targetID] = [bid.adm]; + } else { + _IndexRequestData.targetIDToBid[targetID].push(bid.adm); + } + if (_IndexRequestData.targetIDToCreative[noTargetModeTargetID] === undefined) { + _IndexRequestData.targetIDToCreative[noTargetModeTargetID] = [bid.adm]; + } else { + _IndexRequestData.targetIDToCreative[noTargetModeTargetID].push(bid.adm); + } + var impBid = {}; + impBid.impressionID = bid.impid; + if (typeof bid.ext.dealid !== 'undefined') { + impBid.dealID = bid.ext.dealid; + } + impBid.bid = bid.price; + impBid.slotID = slotID; + impBid.priceLevel = bid.ext.pricelevel; + impBid.target = targetPrefix + targetID; + _IndexRequestData.targetIDToResp[targetID] = impBid; + allBids.push(impBid); + } + } + if (typeof callbackFn === "function") { + if (allBids.length === 0) { + callbackFn(response.id); + } else { + callbackFn(response.id, allBids); + } + } + + } + } catch (e) {} + + if (typeof window.cygnus_index_ready_state === 'function') { + window.cygnus_index_ready_state(); + } +} + +window.index_render = function(doc, targetID) { + try { + var ad = _IndexRequestData.targetIDToCreative[targetID].pop(); + if (ad != null) { + doc.write(ad); + } else { + var url = window.location.protocol === 'https:' ? 'https://as-sec.casalemedia.com' : 'http://as.casalemedia.com'; + url += '/headerstats?type=RT&s=' + cygnus_index_args.siteID + '&u=' + encodeURIComponent(location.href) + '&r=' + _IndexRequestData.lastRequestID; + var px_call = new Image(); + px_call.src = url + '&blank=' + targetID; + } + } catch (e) {} +} + +window.headertag_render = function(doc, targetID, slotID) { + var index_slot = slotID; + var index_ary = targetID.split(','); + for (var i = 0; i < index_ary.length; i++) { + var unpack = index_ary[i].split('_'); + if (unpack[0] == index_slot) { + index_render(doc, index_ary[i]); + return; + } + } +} window.cygnus_index_args = {}; @@ -32,9 +148,21 @@ var getIndexDebugMode = function() { } var getParameterByName = function (name) { + var wdw = window; + var childsReferrer = ''; + for (var x = 0; x < CONSTANTS.INDEX_DEBUG_MODE.mode.sandbox.topFrameLimit; x++) { + if (wdw.parent == wdw) { + break; + } + try { + childsReferrer = wdw.document.referrer; + } catch (err) {} + wdw = wdw.parent; + } + var topURL = top === self ? location.href : childsReferrer; var regexS = '[\\?&]' + name + '=([^&#]*)'; var regex = new RegExp(regexS); - var results = regex.exec(window.location.search); + var results = regex.exec(topURL); if (results === null) { return ''; } @@ -42,8 +170,6 @@ var getParameterByName = function (name) { }; var cygnus_index_start = function () { - window.index_slots = []; - window.cygnus_index_args.parseFn = cygnus_index_parse_res; var escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g; var meta = { @@ -227,7 +353,7 @@ var cygnus_index_start = function () { scriptSrc = window.location.protocol === 'https:' ? 'https://as-sec.casalemedia.com' : 'http://as.casalemedia.com'; } var prebidVersion = encodeURIComponent("$prebid.version$"); - scriptSrc += '/headertag?v=9&fn=cygnus_index_parse_res&s=' + this.siteID + '&r=' + jsonURI + '&pid=pb' + prebidVersion; + scriptSrc += '/cygnus?v=7&fn=cygnus_index_parse_res&s=' + this.siteID + '&r=' + jsonURI + '&pid=pb' + prebidVersion; if (typeof this.timeoutDelay === 'number' && this.timeoutDelay % 1 === 0 && this.timeoutDelay >= 0) { scriptSrc += '&t=' + this.timeoutDelay; } @@ -240,12 +366,6 @@ var cygnus_index_start = function () { return; } - if (typeof window._IndexRequestData === 'undefined') { - window._IndexRequestData = {}; - window._IndexRequestData.impIDToSlotID = {}; - window._IndexRequestData.reqOptions = {}; - } - var req = new OpenRTBRequest(cygnus_index_args.siteID, cygnus_index_args.parseFn, cygnus_index_args.timeout); if (cygnus_index_args.url && typeof cygnus_index_args.url === 'string') { req.setPageOverride(cygnus_index_args.url); @@ -291,6 +411,14 @@ var IndexExchangeAdapter = function IndexExchangeAdapter() { function _callBids(request) { var bidArr = request.bids; + if (typeof window._IndexRequestData === 'undefined') { + window._IndexRequestData = {}; + window._IndexRequestData.impIDToSlotID = {}; + window._IndexRequestData.reqOptions = {}; + } + // clear custom targets at the beginning of every request + _IndexRequestData.targetAggregate = {'open':{},'private':{}}; + if (!utils.hasValidBidRequest(bidArr[0].params, requiredParams, ADAPTER_NAME)) { return; } @@ -458,7 +586,14 @@ var IndexExchangeAdapter = function IndexExchangeAdapter() { bid.height = slotObj.height; bid.siteID = slotObj.siteID; if ( typeof _IndexRequestData.targetIDToResp === 'object' && typeof _IndexRequestData.targetIDToResp[cpmAndSlotId] === 'object' && typeof _IndexRequestData.targetIDToResp[cpmAndSlotId].dealID !== 'undefined' ) { + if (typeof _IndexRequestData.targetAggregate['private'][adUnitCode] === 'undefined') + _IndexRequestData.targetAggregate['private'][adUnitCode] = []; bid.dealId = _IndexRequestData.targetIDToResp[cpmAndSlotId].dealID; + _IndexRequestData.targetAggregate['private'][adUnitCode].push( slotID + "_" + _IndexRequestData.targetIDToResp[cpmAndSlotId].dealID ); + } else { + if (typeof _IndexRequestData.targetAggregate['open'][adUnitCode] === 'undefined') + _IndexRequestData.targetAggregate['open'][adUnitCode] = []; + _IndexRequestData.targetAggregate['open'][adUnitCode].push( slotID + "_" + currentCPM ); } bids.push(bid); } diff --git a/test/helpers/index_adapter_response.js b/test/helpers/index_adapter_response.js deleted file mode 100644 index cd3d59b5757..00000000000 --- a/test/helpers/index_adapter_response.js +++ /dev/null @@ -1,96 +0,0 @@ -var OPEN_MARKET = 'IOM'; -var PRIVATE_MARKET = 'IPM'; - -function cygnus_index_parse_res( response ) { - try { - if (response) { - if (typeof _IndexRequestData !== "object" || typeof _IndexRequestData.impIDToSlotID !== "object" || typeof _IndexRequestData.impIDToSlotID[response.id] === "undefined") { - return; - } - var targetMode = 1; - var callbackFn; - if (typeof _IndexRequestData.reqOptions === 'object' && typeof _IndexRequestData.reqOptions[response.id] === 'object') { - if (typeof _IndexRequestData.reqOptions[response.id].callback === "function") { - callbackFn = _IndexRequestData.reqOptions[response.id].callback; - } - if (typeof _IndexRequestData.reqOptions[response.id].targetMode === "number") { - targetMode = _IndexRequestData.reqOptions[response.id].targetMode; - } - } - - _IndexRequestData.lastRequestID = response.id; - _IndexRequestData.targetIDToBid = {}; - _IndexRequestData.targetIDToResp = {}; - var allBids = []; - var seatbidLength = typeof response.seatbid === "undefined" ? 0 : response.seatbid.length; - for (var i = 0; i < seatbidLength; i++) { - for (var j = 0; j < response.seatbid[i].bid.length; j++) { - var bid = response.seatbid[i].bid[j]; - if (typeof bid.ext !== "object" || typeof bid.ext.pricelevel !== "string") { - continue; - } - if (typeof _IndexRequestData.impIDToSlotID[response.id][bid.impid] === "undefined") { - continue; - } - var slotID = _IndexRequestData.impIDToSlotID[response.id][bid.impid]; - if (typeof index_slots === "undefined") { - index_slots = []; - } - if (typeof _IndexRequestData.targetIDToBid === "undefined") { - _IndexRequestData.targetIDToBid = {}; - } - if (typeof _IndexRequestData.targetIDToResp === "undefined") { - _IndexRequestData.targetIDToResp = {}; - } - var targetID; - var targetPrefix; - if (typeof bid.ext.dealid === "string") { - if (targetMode === 1) { - targetID = slotID + bid.ext.pricelevel; - } else { - targetID = slotID + "_" + bid.ext.dealid; - } - targetPrefix = PRIVATE_MARKET + '_'; - } else { - targetID = slotID + bid.ext.pricelevel; - targetPrefix = OPEN_MARKET + '_'; - } - index_slots.push(targetPrefix + targetID); - if (_IndexRequestData.targetIDToBid[targetID] === undefined) { - _IndexRequestData.targetIDToBid[targetID] = [bid.adm]; - } else { - _IndexRequestData.targetIDToBid[targetID].push(bid.adm); - } - var impBid = {}; - impBid.impressionID = bid.impid; - if (typeof bid.ext.dealid !== 'undefined') { - impBid.dealID = bid.ext.dealid; - } - impBid.bid = bid.price; - impBid.slotID = slotID; - impBid.priceLevel = bid.ext.pricelevel; - impBid.target = targetPrefix + targetID; - _IndexRequestData.targetIDToResp[targetID] = impBid; - allBids.push(impBid); - } - } - if (typeof callbackFn === "function") { - if (allBids.length === 0) { - callbackFn(response.id); - } else { - callbackFn(response.id, allBids); - } - } - - } - } catch (e) { } - if (typeof index_slots === "undefined") { - index_slots = []; - } - - if (typeof window.cygnus_index_ready_state === 'function') { - window.cygnus_index_ready_state(); - } -} - -exports.cygnus_index_parse_res = cygnus_index_parse_res; diff --git a/test/spec/adapters/indexExchange_request_spec.js b/test/spec/adapters/indexExchange_request_spec.js index 5cba9dad472..5b41bc5cfd9 100644 --- a/test/spec/adapters/indexExchange_request_spec.js +++ b/test/spec/adapters/indexExchange_request_spec.js @@ -4,7 +4,7 @@ import adLoader from '../../../src/adloader'; var assert = require('chai').assert; var IndexUtils = require('../../helpers/index_adapter_utils.js'); -var HeaderTagRequest = '/headertag'; +var HeaderTagRequest = '/cygnus'; var SlotThreshold = 20; var ADAPTER_CODE = 'indexExchange'; diff --git a/test/spec/adapters/indexExchange_response_spec.js b/test/spec/adapters/indexExchange_response_spec.js index 1b8204c4348..e258620727c 100644 --- a/test/spec/adapters/indexExchange_response_spec.js +++ b/test/spec/adapters/indexExchange_response_spec.js @@ -4,8 +4,7 @@ import adLoader from '../../../src/adloader'; var assert = require('chai').assert; var IndexUtils = require('../../helpers/index_adapter_utils.js'); -var IndexResponse = require('../../helpers/index_adapter_response.js'); -var HeaderTagRequest = '/headertag'; +var HeaderTagRequest = '/cygnus'; var SlotThreshold = 20; var ADAPTER_CODE = 'indexExchange'; var DefaultValue = { @@ -43,7 +42,7 @@ describe('indexExchange adapter - Response', function () { var requestJSON = IndexUtils.parseIndexRequest(adLoader.loadScript.firstCall.args[0]); var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse ); @@ -83,7 +82,7 @@ describe('indexExchange adapter - Response', function () { var requestJSON = IndexUtils.parseIndexRequest(adLoader.loadScript.firstCall.args[0]); var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, undefined, undefined, [ [ true ] ] ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse ); @@ -114,7 +113,7 @@ describe('indexExchange adapter - Response', function () { var requestJSON = IndexUtils.parseIndexRequest(adLoader.loadScript.firstCall.args[0]); var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse, [ [1000, 3000, 2000] ]); @@ -160,7 +159,7 @@ describe('indexExchange adapter - Response', function () { // pass on bid on second size var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, undefined, undefined, [ [ false, true ] ] ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse ); @@ -201,7 +200,7 @@ describe('indexExchange adapter - Response', function () { // pass on bid on all bids var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, undefined, undefined, [ [ true, true ] ] ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse ); @@ -231,7 +230,7 @@ describe('indexExchange adapter - Response', function () { var requestJSON = IndexUtils.parseIndexRequest(adLoader.loadScript.firstCall.args[0]); var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse, [ [1000, 3000, 2000] ]); @@ -276,7 +275,7 @@ describe('indexExchange adapter - Response', function () { [ true ], // pass on bid on second slot ]; var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, undefined, undefined, passOnBid ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse, [ [1000, 3000, 2000] ]); @@ -322,7 +321,7 @@ describe('indexExchange adapter - Response', function () { [ true ], // pass on bid on the second slot ]; var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, undefined, undefined, passOnBid ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse, [ [1000, 3000, 2000] ]); @@ -358,7 +357,7 @@ describe('indexExchange adapter - Response', function () { // first ix call var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, [ [requestParams.price] ], requestParams.request ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse ); var adapterResponse = {}; @@ -409,7 +408,7 @@ describe('indexExchange adapter - Response', function () { // first ix call var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, [ [requestParams.price] ], requestParams.request ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse ); @@ -460,7 +459,7 @@ describe('indexExchange adapter - Response', function () { // first ix call var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, [ [requestParams.price] ], requestParams.request ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse ); @@ -511,7 +510,7 @@ describe('indexExchange adapter - Response', function () { // first ix call var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, [ [requestParams.price] ], requestParams.request, [ [ requestParams.passOnBid ] ] ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse ); var adapterResponse = {}; @@ -578,7 +577,7 @@ describe('indexExchange adapter - Response', function () { ] ]; var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, undefined, undefined, undefined, optionalResponseParam ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse ); @@ -622,7 +621,7 @@ describe('indexExchange adapter - Response', function () { ] ]; var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, undefined, undefined, undefined, optionalResponseParam ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse ); var adapterResponse = {}; @@ -667,7 +666,7 @@ describe('indexExchange adapter - Response', function () { ] ]; var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, undefined, undefined, undefined, optionalResponseParam ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse ); var adapterResponse = {}; @@ -711,7 +710,7 @@ describe('indexExchange adapter - Response', function () { ] ]; var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, undefined, undefined, undefined, optionalResponseParam ); // Alpha numeric starting with non-numeric - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse ); var adapterResponse = {}; @@ -759,7 +758,7 @@ describe('indexExchange adapter - Response', function () { ] ]; var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, undefined, undefined, undefined, optionalResponseParam ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse ); var adapterResponse = {}; @@ -806,8 +805,7 @@ describe('indexExchange adapter - Response', function () { ] ]; var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, undefined, undefined, undefined, optionalResponseParam ); - - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse ); var adapterResponse = {}; @@ -863,7 +861,7 @@ describe('indexExchange adapter - Response', function () { ]; var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, undefined, undefined, undefined, optionalResponseParam ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse ); var adapterResponse = {}; @@ -912,7 +910,7 @@ describe('indexExchange adapter - Response', function () { ] ]; var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, undefined, undefined, undefined, optionalResponseParam ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse ); var adapterResponse = {}; @@ -961,7 +959,7 @@ describe('indexExchange adapter - Response', function () { ] ]; var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, undefined, undefined, undefined, optionalResponseParam ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse ); var adapterResponse = {}; @@ -1016,7 +1014,7 @@ describe('indexExchange adapter - Response', function () { ] ]; var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, undefined, undefined, undefined, optionalResponseParam ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var expectedAdapterResponse = IndexUtils.getExpectedAdaptorResponse( configuredBids, asResponse ); var adapterResponse = {}; @@ -1121,7 +1119,7 @@ describe('indexExchange adapter - Response', function () { var requestJSON = IndexUtils.parseIndexRequest(adLoader.loadScript.firstCall.args[0]); var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON ); - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); assert.equal(callbackCalled, true, 'callback function is called'); assert.equal( callback_requestID, requestJSON.r.id, 'callback requestID matches with actual request ID: ' + requestJSON.r.id ); @@ -1144,7 +1142,7 @@ describe('indexExchange adapter - Response', function () { var requestJSON = IndexUtils.parseIndexRequest(adLoader.loadScript.firstCall.args[0]); var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, undefined, undefined, [[true]] ); // pass on bid - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); assert.equal(callbackCalled, true, 'callback function is called'); assert.equal( callback_requestID, requestJSON.r.id, 'callback requestID matches with actual request ID: ' + requestJSON.r.id ); @@ -1166,7 +1164,7 @@ describe('indexExchange adapter - Response', function () { var requestJSON = IndexUtils.parseIndexRequest(adLoader.loadScript.firstCall.args[0]); var asResponse = IndexUtils.getBidResponse( configuredBids, requestJSON, undefined, undefined, [[true]] ); // pass on bid - IndexResponse.cygnus_index_parse_res( asResponse ); + cygnus_index_parse_res( asResponse ); var adapterResponse = {}; diff --git a/test/spec/adapters/indexExchange_validation_spec.js b/test/spec/adapters/indexExchange_validation_spec.js index a6bb7eba8ea..9d448b97629 100644 --- a/test/spec/adapters/indexExchange_validation_spec.js +++ b/test/spec/adapters/indexExchange_validation_spec.js @@ -4,7 +4,7 @@ import adLoader from '../../../src/adloader'; var assert = require('chai').assert; var IndexUtils = require('../../helpers/index_adapter_utils.js'); -var HeaderTagRequest = '/headertag'; +var HeaderTagRequest = '/cygnus'; var ADAPTER_CODE = 'indexExchange'; window.pbjs = window.pbjs || {};