Reduce test loudness (#243)

ofrobots · web-flow · commit 66158238844e · 2017-02-14T16:34:02.000-08:00
* make the tests less loud
* simplify appPathRelativeToRepository unit test
diff --git a/src/agent/v8debugapi.js b/src/agent/v8debugapi.js
@@ -287,8 +287,8 @@ function create(logger_, config_, jsFiles_, sourcemapper_) {
     // we are going to assume that repository root === the starting working
     // directory.
     var matchingScript;
-    var scripts = findScripts(mapInfo ? mapInfo.file : 
-      path.normalize(breakpoint.location.path));
+    var scripts = findScripts(mapInfo ? mapInfo.file :
+      path.normalize(breakpoint.location.path), config, fileStats);
     if (scripts.length === 0) {
       return setErrorStatusAndCallback(cb, breakpoint,
         StatusMessage.BREAKPOINT_SOURCE_LOCATION,
@@ -406,25 +406,6 @@ function create(logger_, config_, jsFiles_, sourcemapper_) {
   //   return v8bp;
   // }
 
-  function findScripts(scriptPath) {
-    // Use repository relative mapping if present.
-    if (config.appPathRelativeToRepository) {
-      var candidate = scriptPath.replace(config.appPathRelativeToRepository,
-        config.workingDirectory);
-      // There should be no ambiguity resolution if project root is provided.
-      return fileStats[candidate] ? [ candidate ] : [];
-    }
-    var regexp = pathToRegExp(scriptPath);
-    // Next try to match path.
-    var matches = Object.keys(fileStats).filter(regexp.test.bind(regexp));
-    if (matches.length === 1) {
-      return matches;
-    }
-
-    // Finally look for files with the same name regardless of path.
-    return findScriptsFuzzy(scriptPath, Object.keys(fileStats));
-  }
-
   function onBreakpointHit(breakpoint, callback, execState) {
     var v8bp = breakpoints[breakpoint.id].v8Breakpoint;
 
@@ -584,6 +565,25 @@ function pathToRegExp(scriptPath) {
   return new RegExp(scriptPath + '$');
 }
 
+function findScripts(scriptPath, config, fileStats) {
+  // Use repository relative mapping if present.
+  if (config.appPathRelativeToRepository) {
+    var candidate = scriptPath.replace(config.appPathRelativeToRepository,
+                                       config.workingDirectory);
+    // There should be no ambiguity resolution if project root is provided.
+    return fileStats[candidate] ? [candidate] : [];
+  }
+  var regexp = pathToRegExp(scriptPath);
+  // Next try to match path.
+  var matches = Object.keys(fileStats).filter(regexp.test.bind(regexp));
+  if (matches.length === 1) {
+    return matches;
+  }
+
+  // Finally look for files with the same name regardless of path.
+  return findScriptsFuzzy(scriptPath, Object.keys(fileStats));
+}
+
 /**
  * Given an list of available files and a script path to match, this function
  * tries to resolve the script to a (hopefully unique) match in the file list
@@ -625,5 +625,6 @@ function findScriptsFuzzy(scriptPath, fileList) {
 module.exports = {
   create: create,
   // Exposed for unit testing.
+  findScripts: findScripts,
   findScriptsFuzzy: findScriptsFuzzy
 };
diff --git a/test/test-debuglet.js b/test/test-debuglet.js
@@ -17,7 +17,7 @@
 
 var _ = require('lodash');
 var assert = require('assert');
-var defaultConfig = require('../src/agent/config.js');
+var DEFAULT_CONFIG = require('../src/agent/config.js');
 var Debuglet = require('../src/agent/debuglet.js');
 var extend = require('extend');
 
@@ -32,6 +32,8 @@ var nock = require('nock');
 var nocks = require('./nocks.js');
 nock.disableNetConnect();
 
+var defaultConfig = extend(true, {}, DEFAULT_CONFIG, {logLevel: 0});
+
 var oldGP;
 
 var bp = {
diff --git a/test/test-env-relative-repository-path.js b/test/test-env-relative-repository-path.js
diff --git a/test/test-v8debugapi.js b/test/test-v8debugapi.js
@@ -1211,6 +1211,25 @@ describe('v8debugapi', function() {
   it('should be possible to set deferred breakpoints');
 });
 
+describe('v8debugapi.findScripts', function() {
+  it('should properly handle appPathRelativeToRepository', function() {
+    var config = extend(true, {}, config, {
+      workingDirectory: '/some/strange/directory',
+      appPathRelativeToRepository: '/my/project/root'
+    });
+
+    var fakeFileStats = {
+      '/some/strange/directory/test/fixtures/a/hello.js':
+          {hash: 'fake', lines: 5},
+      '/my/project/root/test/fixtures/a/hello.js': {hash: 'fake', lines: 50}
+    };
+    var scriptPath = '/my/project/root/test/fixtures/a/hello.js';
+    var result = v8debugapi.findScripts(scriptPath, config, fakeFileStats);
+    assert.deepEqual(
+        result, ['/some/strange/directory/test/fixtures/a/hello.js']);
+  });
+});
+
 describe('v8debugapi.findScriptsFuzzy', function() {
   var fuzzy = v8debugapi.findScriptsFuzzy;
 
