resolve '../baz' correct

browserify · Nov 12, 2012 · 46fe923 · 46fe923
1 parent d1c1012
commit 46fe923
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -33,11 +33,11 @@ exports.sync = function (x, opts) {
         var m = loadAsFileSync(path.resolve(y, x))
             || loadAsDirectorySync(path.resolve(y, x));
         if (m) return m;
+    } else {
+        var n = loadNodeModulesSync(x, y);
+        if (n) return n;
     }
 
-    var n = loadNodeModulesSync(x, y);
-    if (n) return n;
-
     throw new Error("Cannot find module '" + x + "'");
 
     function loadAsFileSync (x) {

diff --git a/test/mock.js b/test/mock.js
@@ -2,7 +2,7 @@ var test = require('tap').test;
 var resolve = require('../');
 
 test('mock', function (t) {
-    t.plan(3);
+    t.plan(4);
 
     var files = {
         '/foo/bar/baz.js' : 'beep'
@@ -33,6 +33,10 @@ test('mock', function (t) {
     t.throws(function () {
         resolve.sync('baz', opts('/foo/bar'));
     });
+
+    t.throws(function () {
+        resolve.sync('../baz', opts('/foo/bar'));
+    });
 });
 
 test('mock package', function (t) {