From b122632ca3e09ded28bfae455e55829041134e36 Mon Sep 17 00:00:00 2001
From: "alex.arvanitidis" <alex.arvanitidis@marfeel.com>
Date: Fri, 1 Jun 2018 17:36:44 +0200
Subject: [PATCH] Rubicon test server and client for same position

---
 modules.json          | 1 +
 modules/s2sTesting.js | 5 +++++
 package-lock.json     | 2 +-
 src/adaptermanager.js | 5 ++++-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/modules.json b/modules.json
index 0daae4069eb..657eb18be05 100644
--- a/modules.json
+++ b/modules.json
@@ -10,6 +10,7 @@
     "prebidServerBidAdapter",
     "consentManagement",
     "criteoBidAdapter",
+    "s2sTesting",
 
     "marfeelAnalyticsAdapter"
 ]
diff --git a/modules/s2sTesting.js b/modules/s2sTesting.js
index 60ab150530f..fd79b94e874 100644
--- a/modules/s2sTesting.js
+++ b/modules/s2sTesting.js
@@ -30,6 +30,11 @@ export function getSourceBidderMap(adUnits = []) {
       bid.finalSource = bid.calcSource || bidSource[bid.bidder] || CLIENT; // default to client
       // add bidder to sourceBidders data structure
       sourceBidders[bid.finalSource][bid.bidder] = true;
+
+      if (bid.bidder === 'rubicon') {
+        sourceBidders[CLIENT][bid.bidder] = true;
+        sourceBidders[SERVER][bid.bidder] = true;
+      }
     });
   });
 
diff --git a/package-lock.json b/package-lock.json
index a9896b2c5c7..6cb07a86423 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "1.11.0-pre",
+  "version": "1.11.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/src/adaptermanager.js b/src/adaptermanager.js
index 98d9d5fb426..545834e3617 100644
--- a/src/adaptermanager.js
+++ b/src/adaptermanager.js
@@ -100,8 +100,11 @@ function getAdUnitCopyForPrebidServer(adUnits) {
   let adUnitsCopy = utils.deepClone(adUnits);
 
   adUnitsCopy.forEach((adUnit) => {
-    // filter out client side bids
     adUnit.bids = adUnit.bids.filter((bid) => {
+      if (bid.bidder === 'rubicon') {
+        return true;
+      }
+
       return includes(adaptersServerSide, bid.bidder) && (!doingS2STesting() || bid.finalSource !== s2sTestingModule.CLIENT);
     }).map((bid) => {
       bid.bid_id = utils.getUniqueIdentifierStr();