[Tests] add more pathfilter tests

Author: ljharb

test/pathfilter.js

@@ -2,41 +2,67 @@ var path = require('path');
 var test = require('tape');
 var resolve = require('../');
 
-test('#62: deep module references and the pathFilter', function (t) {
-    t.plan(9);
+var resolverDir = path.join(__dirname, '/pathfilter/deep_ref');
 
-    var resolverDir = path.join(__dirname, '/pathfilter/deep_ref');
-    var pathFilter = function (pkg, x, remainder) {
+var pathFilterFactory = function (t) {
+    return function (pkg, x, remainder) {
         t.equal(pkg.version, '1.2.3');
         t.equal(x, path.join(resolverDir, 'node_modules/deep/ref'));
         t.equal(remainder, 'ref');
         return 'alt';
     };
+};
+
+test('#62: deep module references and the pathFilter', function (t) {
+    t.test('deep/ref.js', function (st) {
+        st.plan(3);
 
-    resolve('deep/ref', { basedir: resolverDir }, function (err, res, pkg) {
-        if (err) t.fail(err);
+        resolve('deep/ref', { basedir: resolverDir }, function (err, res, pkg) {
+            if (err) st.fail(err);
 
-        t.equal(pkg.version, '1.2.3');
-        t.equal(res, path.join(resolverDir, 'node_modules/deep/ref.js'));
+            st.equal(pkg.version, '1.2.3');
+            st.equal(res, path.join(resolverDir, 'node_modules/deep/ref.js'));
+        });
+
+        var res = resolve.sync('deep/ref', { basedir: resolverDir });
+        st.equal(res, path.join(resolverDir, 'node_modules/deep/ref.js'));
+    });
+
+    t.test('deep/deeper/ref', function (st) {
+        st.plan(4);
+
+        resolve(
+            'deep/deeper/ref',
+            { basedir: resolverDir },
+            function (err, res, pkg) {
+                if (err) t.fail(err);
+                st.notEqual(pkg, undefined);
+                st.equal(pkg.version, '1.2.3');
+                st.equal(res, path.join(resolverDir, 'node_modules/deep/deeper/ref.js'));
+            }
+        );
+
+        var res = resolve.sync(
+            'deep/deeper/ref',
+            { basedir: resolverDir }
+        );
+        st.equal(res, path.join(resolverDir, 'node_modules/deep/deeper/ref.js'));
+    });
+
+    t.test('deep/ref alt', function (st) {
+        st.plan(4);
+
+        var pathFilter = pathFilterFactory(st);
+
+        resolve(
+            'deep/ref',
+            { basedir: resolverDir, pathFilter: pathFilter },
+            function (err, res, pkg) {
+                if (err) st.fail(err);
+                st.equal(res, path.join(resolverDir, 'node_modules/deep/alt.js'));
+            }
+        );
     });
 
-    resolve(
-        'deep/deeper/ref',
-        { basedir: resolverDir },
-        function (err, res, pkg) {
-            if (err) t.fail(err);
-            t.notEqual(pkg, undefined);
-            t.equal(pkg.version, '1.2.3');
-            t.equal(res, path.join(resolverDir, 'node_modules/deep/deeper/ref.js'));
-        }
-    );
-
-    resolve(
-        'deep/ref',
-        { basedir: resolverDir, pathFilter: pathFilter },
-        function (err, res, pkg) {
-            if (err) t.fail(err);
-            t.equal(res, path.join(resolverDir, 'node_modules/deep/alt.js'));
-        }
-    );
+    t.end();
 });