Update tests to use both the token and the AST based finder.

browserify · May 11, 2018 · 3ed9968 · 3ed9968
1 parent ec5d003
commit 3ed9968
Show file tree

Hide file tree

Showing 16 changed files with 74 additions and 9 deletions.
diff --git a/test/both.js b/test/both.js
@@ -11,6 +11,14 @@ test('both', function (t) {
     t.end();
 });
 
+test('both fullParse', function (t) {
+    var modules = detective.find(src, { fullParse: true });
+    t.deepEqual(modules.strings, [ 'a', 'b' ]);
+    t.deepEqual(modules.expressions, [ "'c' + x", "'d' + y" ]);
+    t.notOk(modules.nodes, 'has no nodes');
+    t.end();
+});
+
 test('both with nodes specified in opts', function (t) {
     var modules = detective.find(src, { nodes: true });
     t.deepEqual(modules.strings, [ 'a', 'b' ]);
@@ -24,3 +32,17 @@ test('both with nodes specified in opts', function (t) {
       'has a node for each require');
     t.end();
 });
+
+test('both with nodes and fullParse', function (t) {
+    var modules = detective.find(src, { nodes: true, fullParse: true });
+    t.deepEqual(modules.strings, [ 'a', 'b' ]);
+    t.deepEqual(modules.expressions, [ "'c' + x", "'d' + y" ]);
+    t.deepEqual(
+      modules.nodes.map(function (n) {
+        var arg = n.arguments[0];
+        return arg.value || arg.left.value;
+      }),
+      [ 'a', 'b', 'c', 'd' ],
+      'has a node for each require');
+    t.end();
+});
diff --git a/test/chained.js b/test/chained.js
@@ -5,5 +5,6 @@ var src = fs.readFileSync(__dirname + '/files/chained.js');
 
 test('chained', function (t) {
     t.deepEqual(detective(src), [ 'c', 'b', 'a' ]);
+    t.deepEqual(detective(src, { fullParse: true }), [ 'c', 'b', 'a' ]);
     t.end();
 });
diff --git a/test/comment.js b/test/comment.js
@@ -9,3 +9,10 @@ test('comment', function (t) {
     t.notOk(modules.nodes, 'has no nodes');
     t.end();
 });
+
+test('comment fullParse', function (t) {
+    var modules = detective.find(src, { fullParse: true });
+    t.deepEqual(modules.strings, [ 'beep' ]);
+    t.notOk(modules.nodes, 'has no nodes');
+    t.end();
+});
diff --git a/test/complicated.js b/test/complicated.js
@@ -51,8 +51,9 @@ var sources = [
 ];
 
 test('complicated', function (t) {
-    t.plan(sources.length);
+    t.plan(sources.length * 2);
     sources.forEach(function(src) {
         t.deepEqual(detective(src), [ 'a' ]);
+        t.deepEqual(detective(src, { fullParse: true }), [ 'a' ]);
     });
 });
diff --git a/test/es6-module.js b/test/es6-module.js
@@ -4,6 +4,7 @@ var fs = require('fs');
 var src = fs.readFileSync(__dirname + '/files/es6-module.js');
 
 test('es6-module', function (t) {
-    t.plan(1);
+    t.plan(2);
     t.deepEqual(detective(src, {parse: {sourceType: 'module'}}), [ 'a', 'b' ]);
+    t.deepEqual(detective(src, {parse: {sourceType: 'module'}, fullParse: true}), [ 'a', 'b' ]);
 });
diff --git a/test/generators.js b/test/generators.js
@@ -4,6 +4,7 @@ var fs = require('fs');
 var src = fs.readFileSync(__dirname + '/files/generators.js');
 
 test('generators', function (t) {
-    t.plan(1);
+    t.plan(2);
     t.deepEqual(detective(src), [ 'a', 'b' ]);
+    t.deepEqual(detective(src, { fullParse: true }), [ 'a', 'b' ]);
 });
diff --git a/test/nested.js b/test/nested.js
@@ -5,5 +5,6 @@ var src = fs.readFileSync(__dirname + '/files/nested.js');
 
 test('nested', function (t) {
     t.deepEqual(detective(src), [ 'a', 'b', 'c' ]);
+    t.deepEqual(detective(src, { fullParse: true }), [ 'a', 'b', 'c' ]);
     t.end();
 });
diff --git a/test/noargs.js b/test/noargs.js
@@ -7,8 +7,9 @@ var fs = require('fs');
 var src = [ 'fn();', 'otherfn();', 'fn();' ].join('\n')
 
 test('noargs', function (t) {
-    t.plan(1);
+    t.plan(2);
     t.deepEqual(detective(src, { word: 'fn' }).length, 0, 'finds no arg id');
+    t.deepEqual(detective(src, { word: 'fn', fullParse: true }).length, 0, 'finds no arg id');
 });
 
 test('find noargs with nodes', function (t) {
@@ -24,3 +25,17 @@ test('find noargs with nodes', function (t) {
       'all matches are correct'
     );
 });
+
+test('find noargs with nodes and fullParse', function (t) {
+    t.plan(4);
+    var modules = detective.find(src, { word: 'fn', nodes: true, fullParse: true });
+    t.equal(modules.strings.length, 0, 'finds no arg id');
+    t.equal(modules.expressions.length, 0, 'finds no expressions');
+    t.equal(modules.nodes.length, 2, 'finds a node for each matching function call');
+    t.equal(
+      modules.nodes.filter(function (x) { 
+        return x.callee.name === 'fn' 
+      }).length, 2, 
+      'all matches are correct'
+    );
+});
diff --git a/test/return.js b/test/return.js
@@ -4,6 +4,7 @@ var fs = require('fs');
 var src = [ 'require("a")\nreturn' ];
 
 test('return', function (t) {
-    t.plan(1);
+    t.plan(2);
     t.deepEqual(detective(src), [ 'a' ]);
+    t.deepEqual(detective(src, { fullParse: true }), [ 'a' ]);
 });
diff --git a/test/scope.js b/test/scope.js
@@ -4,6 +4,7 @@ var fs = require('fs');
 var src = fs.readFileSync(__dirname + '/files/scope.js');
 
 test('scope', function (t) {
-    t.plan(1);
+    t.plan(2);
     t.deepEqual(detective(src), [ './x', './z' ]);
+    t.deepEqual(detective(src, { fullParse: true }), [ './x', './z' ]);
 });
diff --git a/test/set-in-object-pattern.js b/test/set-in-object-pattern.js
@@ -8,5 +8,9 @@ test('set in object pattern', function (t) {
         detective(src, { word : 'load' }),
         [ 'a', 'b', 'c', 'tt' ]
     );
+    t.deepEqual(
+        detective(src, { word : 'load', fullParse: true }),
+        [ 'a', 'b', 'c', 'tt' ]
+    );
     t.end();
-});
+});
diff --git a/test/shebang.js b/test/shebang.js
@@ -4,6 +4,7 @@ var fs = require('fs');
 var src = fs.readFileSync(__dirname + '/files/shebang.js');
 
 test('shebang', function (t) {
-    t.plan(1);
+    t.plan(2);
     t.deepEqual(detective(src), [ 'a', 'b', 'c' ]);
+    t.deepEqual(detective(src, { fullParse: true }), [ 'a', 'b', 'c' ]);
 });
diff --git a/test/sparse-array.js b/test/sparse-array.js
@@ -8,6 +8,9 @@ test('sparse-array', function (t) {
     t.doesNotThrow(function () {
       detective(src)
     })
+    t.doesNotThrow(function () {
+      detective(src, { fullParse: true })
+    })
     t.end();
 });
 

diff --git a/test/strings.js b/test/strings.js
@@ -5,5 +5,6 @@ var src = fs.readFileSync(__dirname + '/files/strings.js');
 
 test('single', function (t) {
     t.deepEqual(detective(src), [ 'a', 'b', 'c', 'events', 'doom', 'y', 'events2' ]);
+    t.deepEqual(detective(src, { fullParse: true }), [ 'a', 'b', 'c', 'events', 'doom', 'y', 'events2' ]);
     t.end();
 });
diff --git a/test/word.js b/test/word.js
@@ -8,5 +8,9 @@ test('word', function (t) {
         detective(src, { word : 'load' }),
         [ 'a', 'b', 'c', 'events', 'doom', 'y', 'events2' ]
     );
+    t.deepEqual(
+        detective(src, { word : 'load', fullParse: true }),
+        [ 'a', 'b', 'c', 'events', 'doom', 'y', 'events2' ]
+    );
     t.end();
 });
diff --git a/test/yield.js b/test/yield.js
@@ -4,6 +4,7 @@ var fs = require('fs');
 var src = fs.readFileSync(__dirname + '/files/yield.js');
 
 test('yield', function (t) {
-    t.plan(1);
+    t.plan(2);
     t.deepEqual(detective(src), [ 'a', 'c' ]);
+    t.deepEqual(detective(src, { fullParse: true }), [ 'a', 'c' ]);
 });