Add failing test for parent filename in error msg.

Author: jmm

test/resolver.js

@@ -34,6 +34,11 @@ test('async foo', function (t) {
         t.equal(err.message, "Cannot find module 'foo' from '" + path.resolve(dir) + "'");
         t.equal(err.code, 'MODULE_NOT_FOUND');
     });
+
+    // Test that filename is reported as the "from" value when passed.
+    resolve('foo', { basedir: dir, filename: path.join(dir, 'baz.js') }, function (err) {
+        t.equal(err.message, "Cannot find module 'foo' from '" + path.join(dir, 'baz.js') + "'");
+    });
 });
 
 test('bar', function (t) {
@@ -193,6 +198,12 @@ test('cup', function (t) {
         t.equal(err.message, "Cannot find module './cup' from '" + path.resolve(dir) + "'");
         t.equal(err.code, 'MODULE_NOT_FOUND');
     });
+
+    // Test that filename is reported as the "from" value when passed.
+    resolve('./cup', { basedir: dir, extensions: [ '.js' ], filename: path.join(dir, 'cupboard.js') },
+    function (err, res) {
+        t.equal(err.message, "Cannot find module './cup' from '" + path.join(dir, 'cupboard.js') + "'");
+    });
 });
 
 test('mug', function (t) {

test/resolver_sync.js

@@ -1,6 +1,7 @@
 var path = require('path');
 var test = require('tape');
 var resolve = require('../');
+var path = require('path');
 
 test('foo', function (t) {
     var dir = path.join(__dirname, 'resolver');
@@ -19,6 +20,17 @@ test('foo', function (t) {
         resolve.sync('foo', { basedir: dir });
     });
 
+    // Test that filename is reported as the "from" value when passed.
+    t.throws(
+        function () {
+            resolve.sync('foo', { basedir: dir, filename: path.join(dir, 'bar.js') });
+        },
+        {
+            name: 'Error',
+            message: "Cannot find module 'foo' from '" + path.join(dir, 'bar.js') + "'"
+        }
+    );
+
     t.end();
 });