Merge pull request #6 from prebid/master

Merge prebid master into fork
pm-manasi-moghe · Jan 18, 2019 · 5dc2d30 · 5dc2d30
2 parents 881c7db + 92bfb29
commit 5dc2d30
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/karma.conf.maker.js b/karma.conf.maker.js
@@ -20,7 +20,10 @@ function newWebpackConfig(codeCoverage) {
     webpackConfig.module.rules.push({
       enforce: 'post',
       exclude: /(node_modules)|(test)|(integrationExamples)|(build)|polyfill.js|(src\/adapters\/analytics\/ga.js)/,
-      loader: 'istanbul-instrumenter-loader',
+      use: {
+        loader: 'istanbul-instrumenter-loader',
+        options: { esModules: true }
+      },
       test: /\.js$/
     })
   }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "1.38.0-pre",
+  "version": "1.39.0-pre",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {

diff --git a/test/spec/modules/currency_spec.js b/test/spec/modules/currency_spec.js
@@ -34,7 +34,7 @@ describe('currency', function () {
   describe('setConfig', function () {
     beforeEach(function() {
       sandbox = sinon.sandbox.create();
-      clock = sinon.useFakeTimers(1047010195974);
+      clock = sinon.useFakeTimers(1046952000000); // 2003-03-06T12:00:00Z
     });
 
     afterEach(function () {