Merge branch 'prebid:master' into master

.circleci/config.yml

@@ -38,28 +38,12 @@ aliases:
       name: BrowserStack End to end testing
       command: gulp e2e-test
 
-  # Download and run BrowserStack local
-  - &download_browserstack
-      name : Download BrowserStackLocal binary
-      command : |
-        # Download the browserstack binary file
-        wget "https://www.browserstack.com/browserstack-local/BrowserStackLocal-linux-x64.zip"
-        # Unzip it
-        unzip BrowserStackLocal-linux-x64.zip
-
-  - &start_browserstack
-    name: Start BrowserStackLocal
-    command: ./BrowserStackLocal --key ${BROWSERSTACK_ACCESS_KEY} --automate-only --local-identifier ${CIRCLE_WORKFLOW_JOB_ID}
-    background: true
-
   - &unit_test_steps
     - checkout
     - restore_cache: *restore_dep_cache
     - run: npm ci
     - save_cache: *save_dep_cache
     - run: *install
-    - run: *download_browserstack
-    - run: *start_browserstack
     - run: *run_unit_test
 
   - &endtoend_test_steps
@@ -68,8 +52,6 @@ aliases:
     - run: npm install
     - save_cache: *save_dep_cache
     - run: *install
-    - run: *download_browserstack
-    - run: *start_browserstack
     - run: *run_endtoend_test
 
 version: 2
@@ -87,6 +69,9 @@ workflows:
   commit:
     jobs:
       - build
+      - e2etest:
+          requires:
+            - build
 
 experimental:
   pipelines: true

karma.conf.maker.js

@@ -81,9 +81,7 @@ function setBrowsers(karmaConf, browserstack) {
     karmaConf.browserStack = {
       username: process.env.BROWSERSTACK_USERNAME,
       accessKey: process.env.BROWSERSTACK_ACCESS_KEY,
-      build: 'Prebidjs Unit Tests ' + new Date().toLocaleString(),
-      startTunnel: false,
-      localIdentifier: process.env.CIRCLE_WORKFLOW_JOB_ID
+      build: 'Prebidjs Unit Tests ' + new Date().toLocaleString()
     }
     if (process.env.TRAVIS) {
       karmaConf.browserStack.startTunnel = false;
@@ -173,7 +171,7 @@ module.exports = function(codeCoverage, browserstack, watchMode, file, disableFe
     browserNoActivityTimeout: 3e5, // default 10000
     captureTimeout: 3e5, // default 60000,
     browserDisconnectTolerance: 3,
-    concurrency: 6,
+    concurrency: 5, // browserstack allows us 5 concurrent sessions
 
     plugins: plugins
   };

modules/adrinoBidAdapter.js

@@ -40,7 +40,7 @@ export const spec = {
         bidId: validBidRequests[i].bidId,
         nativeParams: validBidRequests[i].nativeParams,
         placementHash: validBidRequests[i].params.hash,
-        // TODO: is 'page' the right value here?
+        userId: validBidRequests[i].userId,
         referer: bidderRequest.refererInfo.page,
         userAgent: navigator.userAgent,
       }

modules/adtelligentBidAdapter.js

@@ -43,7 +43,7 @@ export const spec = {
     { code: 'selectmedia', gvlid: 775 },
     { code: 'navelix', gvlid: 380 },
     'pgam',
-    'ocm',
+    { code: 'ocm', gvlid: 1148 },
     { code: 'vidcrunchllc', gvlid: 1145 },
   ],
   supportedMediaTypes: [VIDEO, BANNER],