Merge pull request prebid#34 in AOLP_ADS_JS/prebid.js from release/1.…

…3.0 to master

* commit '9d4bc7fda6bcc249544fb8636b98e90fdc8d474b': (44 commits)
  Added support for new adapters introduced in 0.13.0 into AOL analytics
  Updated CHANGELOG
  Fixed merge conflict
  Prebid 0.13.0 Release
  Resolves prebid#635 (prebid#640)
  Add IX Deal Support (prebid#638)
  Bug fix: accept custom timeout prebid#582 & prebid#604 (prebid#641)
  added timeouts to rubicon adapter that consider time-to-start costs (prebid#629)
  Modify handling of no-bids in Krux Link adapter (prebid#628)
  Allow bypassing ajax preflights with config options (prebid#630)
  validateIndentation: Invalid indentation character (prebid#631)
  use `splice` rather than `slice` to remove bids from array (prebid#637)
  delete the callback before calling clearAuction (prebid#636)
  Deal override fix to resolve prebid#618 (prebid#619)
  Update package.json
  Video - create mastertagUrl from adservertag (prebid#614)
  Prevent renderAd from rendering videos (prebid#623)
  Remove unused build depencencies (prebid#622)
  Add pull request template (prebid#615)
  Openx adaptor deal update (prebid#612)
  ...

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,34 @@
+<!--
+Thank you for your pull request. Please make sure this PR is scoped to one change, and that any added or changed code includes tests with greater than 80% code coverage. See http://prebid.org/dev-docs/testing-prebid.html for documentation on testing Prebid.js.
+-->
+
+## Type of change
+<!-- Remove items that don't apply and/or select an item by changing [ ] to [x] -->
+- [ ] Bugfix
+- [ ] Feature
+- [ ] New bidder adapter
+- [ ] Code style update (formatting, local variables)
+- [ ] Refactoring (no functional changes, no api changes)
+- [ ] Build related changes
+- [ ] CI related changes
+- [ ] Other
+
+## Description of change
+<!-- Describe the change proposed in this pull request -->
+
+<!-- For new bidder adapters, please provide the following -->
+- test parameters for validating bids
+```
+{
+  bidder: '<bidder name>',
+  params: {
+    // ...
+  }
+}
+```
+- contact email of the adapter’s maintainer
+- [ ] official adapter submission
+
+
+## Other information
+<!-- References to related PR or issue #s, @mentions of the person or team responsible for reviewing changes, etc. -->

CHANGELOG

@@ -1,3 +1,8 @@
+AOL Prebid 1.3.0
+----------------
+Updated to Prebid 0.13.0.
+
+
 AOL Prebid 1.2.0
 ----------------
 Updated to Prebid 0.12.0.

adapters.json

@@ -1,14 +1,17 @@
 [
     "aardvark",
+    "adblade",
     "adequant",
     "adform",
     "admedia",
     "aol",
     "appnexus",
     "appnexusAst",
+    "getintent",
     "indexExchange",
     "kruxlink",
     "openx",
+    "piximedia",
     "pubmatic",
     "pulsepoint",
     "rubicon",
@@ -24,6 +27,7 @@
     "jcm",
     "underdogmedia",
     "memeglobal",
+    "centro",
     {
       "appnexus": {
         "alias": "brealtime"
@@ -33,5 +37,10 @@
       "appnexus": {
         "alias": "pagescience"
       }
+    },
+    {
+      "appnexusAst": {
+        "supportedMediaTypes": ["video"]
+      }
     }
 ]

browsers.json

@@ -0,0 +1,198 @@
+{
+  "bs_ie_13_windows_10": {
+    "base": "BrowserStack",
+    "os_version": "10",
+    "browser": "edge",
+    "browser_version": "13.0",
+    "device": null,
+    "os": "Windows"
+  },
+  "bs_ie_11_windows_10": {
+    "base": "BrowserStack",
+    "os_version": "10",
+    "browser": "ie",
+    "browser_version": "11.0",
+    "device": null,
+    "os": "Windows"
+  },
+  "bs_firefox_46_windows_10": {
+    "base": "BrowserStack",
+    "os_version": "10",
+    "browser": "firefox",
+    "browser_version": "46.0",
+    "device": null,
+    "os": "Windows"
+  },
+  "bs_chrome_51_windows_10": {
+    "base": "BrowserStack",
+    "os_version": "10",
+    "browser": "chrome",
+    "browser_version": "51.0",
+    "device": null,
+    "os": "Windows"
+  },
+  "bs_ie_11_windows_8.1": {
+    "base": "BrowserStack",
+    "os_version": "8.1",
+    "browser": "ie",
+    "browser_version": "11.0",
+    "device": null,
+    "os": "Windows"
+  },
+  "bs_firefox_46_windows_8.1": {
+    "base": "BrowserStack",
+    "os_version": "8.1",
+    "browser": "firefox",
+    "browser_version": "46.0",
+    "device": null,
+    "os": "Windows"
+  },
+  "bs_chrome_51_windows_8.1": {
+    "base": "BrowserStack",
+    "os_version": "8.1",
+    "browser": "chrome",
+    "browser_version": "51.0",
+    "device": null,
+    "os": "Windows"
+  },
+  "bs_ie_10_windows_8": {
+    "base": "BrowserStack",
+    "os_version": "8",
+    "browser": "ie",
+    "browser_version": "10.0",
+    "device": null,
+    "os": "Windows"
+  },
+  "bs_firefox_46_windows_8": {
+    "base": "BrowserStack",
+    "os_version": "8",
+    "browser": "firefox",
+    "browser_version": "46.0",
+    "device": null,
+    "os": "Windows"
+  },
+  "bs_chrome_51_windows_8": {
+    "base": "BrowserStack",
+    "os_version": "8",
+    "browser": "chrome",
+    "browser_version": "51.0",
+    "device": null,
+    "os": "Windows"
+  },
+  "bs_ie_11_windows_7": {
+    "base": "BrowserStack",
+    "os_version": "7",
+    "browser": "ie",
+    "browser_version": "11.0",
+    "device": null,
+    "os": "Windows"
+  },
+  "bs_ie_10_windows_7": {
+    "base": "BrowserStack",
+    "os_version": "7",
+    "browser": "ie",
+    "browser_version": "10.0",
+    "device": null,
+    "os": "Windows"
+  },
+  "bs_ie_9_windows_7": {
+    "base": "BrowserStack",
+    "os_version": "7",
+    "browser": "ie",
+    "browser_version": "9.0",
+    "device": null,
+    "os": "Windows"
+  },
+  "bs_firefox_46_windows_7": {
+    "base": "BrowserStack",
+    "os_version": "7",
+    "browser": "firefox",
+    "browser_version": "46.0",
+    "device": null,
+    "os": "Windows"
+  },
+  "bs_chrome_51_windows_7": {
+    "base": "BrowserStack",
+    "os_version": "7",
+    "browser": "chrome",
+    "browser_version": "51.0",
+    "device": null,
+    "os": "Windows"
+  },
+  "bs_safari_9.1_mac_elcapitan": {
+    "base": "BrowserStack",
+    "os_version": "El Capitan",
+    "browser": "safari",
+    "browser_version": "9.1",
+    "device": null,
+    "os": "OS X"
+  },
+  "bs_firefox_46_mac_elcapitan": {
+    "base": "BrowserStack",
+    "os_version": "El Capitan",
+    "browser": "firefox",
+    "browser_version": "46.0",
+    "device": null,
+    "os": "OS X"
+  },
+  "bs_chrome_51_mac_elcapitan": {
+    "base": "BrowserStack",
+    "os_version": "El Capitan",
+    "browser": "chrome",
+    "browser_version": "51.0",
+    "device": null,
+    "os": "OS X"
+  },
+  "bs_safari_8_mac_yosemite": {
+    "base": "BrowserStack",
+    "os_version": "Yosemite",
+    "browser": "safari",
+    "browser_version": "8.0",
+    "device": null,
+    "os": "OS X"
+  },
+  "bs_firefox_46_mac_yosemite": {
+    "base": "BrowserStack",
+    "os_version": "Yosemite",
+    "browser": "firefox",
+    "browser_version": "46.0",
+    "device": null,
+    "os": "OS X"
+  },
+  "bs_chrome_51_mac_yosemite": {
+    "base": "BrowserStack",
+    "os_version": "Yosemite",
+    "browser": "chrome",
+    "browser_version": "51.0",
+    "device": null,
+    "os": "OS X"
+  },
+  "bs_safari_7.1_mac_mavericks": {
+    "base": "BrowserStack",
+    "os_version": "Mavericks",
+    "browser": "safari",
+    "browser_version": "7.1",
+    "device": null,
+    "os": "OS X"
+  },
+  "bs_firefox_46_mac_mavericks": {
+    "base": "BrowserStack",
+    "os_version": "Mavericks",
+    "browser": "firefox",
+    "browser_version": "46.0",
+    "device": null,
+    "os": "OS X"
+  },
+  "bs_chrome_49_mac_mavericks": {
+    "base": "BrowserStack",
+    "os_version": "Mavericks",
+    "browser": "chrome",
+    "browser_version": "49.0",
+    "device": null,
+    "os": "OS X"
+  },
+  "Chrome_travis_ci": {
+    "base": "Chrome",
+    "flags": ["--no-sandbox"]
+  }
+}

gulpHelpers.js

@@ -1,7 +1,9 @@
-const fs = require('fs');
+// this will have all of a copy of the normal fs methods as well
+const fs = require('fs.extra');
 const path = require('path');
 const argv = require('yargs').argv;
 const MANIFEST = 'package.json';
+const exec = require('child_process').exec;
 
 module.exports = {
   parseBrowserArgs: function (argv) {
@@ -47,5 +49,62 @@ module.exports = {
       }
       catch (error) {}
     }
+  },
+
+  createEnd2EndTestReport : function(targetDestinationDir) {
+    var browsers = require('./browsers.json');
+    var env = ['default'];
+    var input = 'bs';
+    for(var key in browsers) {
+      if(key.substring(0, input.length) === input) {
+        env.push(key);
+      }
+    }
+
+    //create new directory structure
+    fs.rmrfSync(targetDestinationDir);
+    env.forEach(item => {
+      fs.mkdirpSync(targetDestinationDir + '/' + item);
+    });
+
+    //move xml files to newly created directory
+    var walker = fs.walk('./build/coverage/e2e/reports');
+    walker.on("file", function (root, stat, next) {
+      env.forEach(item => {
+        if(stat.name.search(item) !== -1) {
+          var src = root + '/' + stat.name;
+          var dest = targetDestinationDir + '/' + item + '/' + stat.name;
+          fs.copy(src, dest, {replace: true}, function(err) {
+            if(err) {
+              throw err;
+            }
+          });
+        }
+      });
+      next();
+    });
+
+    //run junit-viewer to read xml and create html
+    env.forEach(item => {
+      //junit-viewer --results="./custom-reports/chrome51" --save="./chrome.html"
+      var cmd = 'junit-viewer --results="' + targetDestinationDir + '/' + item + '" --save="' + targetDestinationDir + '/' + item +'.html"';
+      exec(cmd);
+    });
+
+    //create e2e-results.html
+    var html = '<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><title>End to End Testing Result</title><link rel="stylesheet" href="//code.jquery.com/ui/1.12.0/themes/base/jquery-ui.css"><script src="https://code.jquery.com/jquery-1.12.4.js"></script><script src="https://code.jquery.com/ui/1.12.0/jquery-ui.js"></script><script>$( function() {$( "#tabs" ).tabs({heightStyle: "fill"});});</script></head><body><div style="font-weight: bold;">Note: Refresh in 2-3 seconds if it says "Cannot get ....."</div><div id="tabs" style="height:2000px;">';
+    var li = '';
+    var tabs = '';
+    env.forEach(function(item,i) {
+      i++;
+      li = li + '<li><a href="#tabs-'+i+'">'+item+'</a></li>';
+      tabs = tabs + '<div id="tabs-'+i+'"><iframe name="'+item+'" src="/' + targetDestinationDir.slice(2) + '/'+item+'.html" frameborder="0" style="overflow:hidden;overflow-x:hidden;overflow-y:hidden;height:100%;width:100%;top:50px;left:0px;right:0px;bottom:0px" height="100%" width="100%"></iframe></div>';
+    });
+    html = html + '<ul>' + li + '</ul>' + tabs;
+    html = html + '</div></body></html>';
+
+    var filepath = targetDestinationDir + '/results.html';
+    fs.openSync(filepath, 'w+');
+    fs.writeFileSync(filepath, html);
   }
 };