config double passname validation

GoogleChrome · Apr 29, 2017 · f0481df · f0481df
1 parent 3339e1e
commit f0481df
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/lighthouse-cli/test/smokehouse/pwa-config.js b/lighthouse-cli/test/smokehouse/pwa-config.js
@@ -21,7 +21,7 @@
  */
 module.exports = {
   passes: [{
-    ecordTrace: true,
+    recordTrace: true,
     gatherers: [
       'url',
       'theme-color',

diff --git a/lighthouse-core/config/config.js b/lighthouse-core/config/config.js
@@ -129,13 +129,9 @@ function validatePasses(passes, audits, rootPath) {
     });
   });
 
-  // Log if multiple passes require trace could overwrite one another.
+  // Passes should have unique passName's. Warn otherwise.
   const usedNames = new Set();
   passes.forEach((pass, index) => {
-    if (!pass.recordTrace) {
-      return;
-    }
-
     const passName = pass.passName || Audit.DEFAULT_PASS;
     if (usedNames.has(passName)) {
       log.warn('config', `passes[${index}] may overwrite trace ` +

diff --git a/lighthouse-core/test/config/config-test.js b/lighthouse-core/test/config/config-test.js
@@ -85,9 +85,12 @@ describe('Config', () => {
     return new Promise((resolve, reject) => {
       const warningListener = function(args) {
         const warningMsg = args[1];
-        if (new RegExp(`overwrite.+${unlikelyPassName}`).test(warningMsg)) {
+        const isMatch = new RegExp(`overwrite.+${unlikelyPassName}`).test(warningMsg);
+        if (isMatch) {
           log.events.removeListener('warning', warningListener);
           resolve();
+        } else {
+          reject(isMatch);
         }
       };
       log.events.addListener('warning', warningListener);