Merge branch 'master' into master

Author: IlliaMil

gulpfile.js

@@ -5,7 +5,8 @@ var _ = require('lodash');
 var argv = require('yargs').argv;
 var gulp = require('gulp');
 var PluginError = require('plugin-error');
-var fancyLog = require('fancy-log');
+// gulplog available transitively via gulp-cli
+var log = require('gulplog');
 var connect = require('gulp-connect');
 var webpack = require('webpack');
 var webpackStream = require('webpack-stream');
@@ -298,10 +299,10 @@ function bundle(dev, moduleArr) {
   }
   const disclosureFile = path.parse(outputFileName).name + '_disclosures.json';
 
-  fancyLog('Concatenating files:\n', entries);
-  fancyLog('Appending ' + prebid.globalVarName + '.processQueue();');
-  fancyLog('Generating bundle:', outputFileName);
-  fancyLog('Generating storage use disclosure summary:', disclosureFile);
+  log.info('Concatenating files:\n', entries);
+  log.info('Appending ' + prebid.globalVarName + '.processQueue();');
+  log.info('Generating bundle:', outputFileName);
+  log.info('Generating storage use disclosure summary:', disclosureFile);
 
   const wrap = wrapWithHeaderAndFooter(dev, modules, sm);
   const source = wrap(gulp.src(entries, {sourcemaps: sm}))

package-lock.json

@@ -76,7 +76,6 @@
     "eslint-plugin-jsdoc": "^50.6.6",
     "execa": "^1.0.0",
     "faker": "^5.5.3",
-    "fancy-log": "^2.0.0",
     "globals": "^16.3.0",
     "gulp": "^5.0.1",
     "gulp-clean": "^0.4.0",
@@ -88,6 +87,7 @@
     "gulp-rename": "^2.1.0",
     "gulp-replace": "^1.0.0",
     "gulp-tap": "^2.0.0",
+    "gulplog": "^2.2.0",
     "is-docker": "^2.2.1",
     "istanbul": "^0.4.5",
     "karma": "^6.4.4",

package.json

@@ -154,9 +154,7 @@ describe(`UID2 module`, function () {
   const getFullTestTitle = (test) => `${test.parent.title ? getFullTestTitle(test.parent) + ' | ' : ''}${test.title}`;
 
   beforeEach(function () {
-    debugOutput(`----------------- START TEST ------------------`);
     fullTestTitle = getFullTestTitle(this.test.ctx.currentTest);
-    debugOutput(fullTestTitle);
     testSandbox = sinon.createSandbox();
     testSandbox.stub(utils, 'logWarn');
     init(config);
@@ -169,16 +167,13 @@ describe(`UID2 module`, function () {
     testSandbox.restore();
     if (timerSpy.timers.length > 0) {
       if (clearTimersAfterEachTest) {
-        debugOutput(`Cancelling ${timerSpy.timers.length} still-active timers.`);
         timerSpy.clearAllActiveTimers();
       } else {
-        debugOutput(`Waiting on ${timerSpy.timers.length} still-active timers...`, timerSpy.timers);
         await timerSpy.waitAllActiveTimers();
       }
     }
     cookieHelpers.clearCookies(moduleCookieName, publisherCookieName);
     coreStorage.removeDataFromLocalStorage(moduleCookieName);
-    debugOutput('----------------- END TEST ------------------');
   });
 
   describe('Configuration', function() {
@@ -469,7 +464,7 @@ describe(`UID2 module`, function () {
         apiHelpers.respondAfterDelay(1, server);
 
         const bid = await runAuction();
-        expectOptout(bid, optoutToken);
+        expectOptout(bid);
       });
       describe(`when the response doesn't arrive before the auction timer`, function() {
         testApiSuccessAndFailure(async function() {