Auctionmanager spec refactor pr (#2155)

* refactor auctionmanager_spec.js and getKeyValueTargetingPairs consolidate duplicated code into helper functions. * re-add timeout test removed in PR #2067 to auctionmanager_spec.js
prebid · Mar 2, 2018 · c92a590 · c92a590
1 parent f7ee794
commit c92a590
Show file tree

Hide file tree

Showing 2 changed files with 268 additions and 341 deletions.
diff --git a/src/auction.js b/src/auction.js
@@ -389,20 +389,24 @@ export function getStandardBidderSettings() {
 }
 
 export function getKeyValueTargetingPairs(bidderCode, custBidObj) {
+  if (!custBidObj) {
+    return {};
+  }
+
   var keyValues = {};
   var bidder_settings = $$PREBID_GLOBAL$$.bidderSettings;
 
   // 1) set the keys from "standard" setting or from prebid defaults
-  if (custBidObj && bidder_settings) {
+  if (bidder_settings) {
     // initialize default if not set
     const standardSettings = getStandardBidderSettings();
     setKeys(keyValues, standardSettings, custBidObj);
-  }
 
-  // 2) set keys from specific bidder setting override if they exist
-  if (bidderCode && custBidObj && bidder_settings && bidder_settings[bidderCode] && bidder_settings[bidderCode][CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING]) {
-    setKeys(keyValues, bidder_settings[bidderCode], custBidObj);
-    custBidObj.sendStandardTargeting = bidder_settings[bidderCode].sendStandardTargeting;
+    // 2) set keys from specific bidder setting override if they exist
+    if (bidderCode && bidder_settings[bidderCode] && bidder_settings[bidderCode][CONSTANTS.JSON_MAPPING.ADSERVER_TARGETING]) {
+      setKeys(keyValues, bidder_settings[bidderCode], custBidObj);
+      custBidObj.sendStandardTargeting = bidder_settings[bidderCode].sendStandardTargeting;
+    }
   }
 
   // set native key value targeting