From 5b9a8e9bf9145610edc9bd8d616d61e57ec3063c Mon Sep 17 00:00:00 2001
From: John-David Dalton <john.david.dalton@gmail.com>
Date: Wed, 29 Jan 2014 00:24:19 -0800
Subject: [PATCH] Fix tests for lodash-amd.

---
 test/test.js | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/test/test.js b/test/test.js
index 1bd6fd394..acf5d1315 100644
--- a/test/test.js
+++ b/test/test.js
@@ -49,15 +49,31 @@
 
     if (!amd) {
       try {
-        return require('fs').realpathSync(result);
+        return require.resolve(result);
       } catch(e) { }
     }
     return result;
   }());
 
+  /** The `ui` object */
+  var ui = root.ui || (root.ui = {
+    'buildPath': filePath,
+    'loaderPath': '',
+    'urlParams': {}
+  });
+
+  /** The basename of the Lo-Dash file to test */
+  var basename = /[\w.-]+$/.exec(filePath)[0];
+
   /** Detect if running in Java */
   var isJava = !document && !!root.java;
 
+  /** Used to indicate testing a modularized build */
+  var isModularize = ui.isModularize || /\b(?:commonjs|(index|main)\.js|lodash-(?:amd|node)|modularize|npm)\b/.test([ui.buildPath, ui.urlParams.build, basename]);
+
+  /** Detect if testing `npm` modules */
+  var isNpm = isModularize && /\bnpm\b/.test([ui.buildPath, ui.urlParams.build]);
+
   /** Detects if running in a PhantomJS web page */
   var isPhantomPage = typeof callPhantom == 'function';
 
@@ -141,20 +157,6 @@
     (_.runInContext ? _.runInContext(root) : _)
   ));
 
-  try {
-    filePath = require.resolve(filePath);
-  } catch(e) { }
-
-  /** The `ui` object */
-  var ui = root.ui || (root.ui = {
-    'buildPath': filePath,
-    'loaderPath': '',
-    'urlParams': {}
-  });
-
-  /** The basename of the Lo-Dash file to test */
-  var basename = _.result(/[\w.-]+$/.exec(filePath), 0, '');
-
   /** Used to pass falsey values to methods */
   var falsey = [, '', 0, false, NaN, null, undefined];
 
@@ -174,12 +176,6 @@
     return result;
   }());
 
-  /** Used to indicate testing a modularized build */
-  var isModularize = ui.isModularize || /\b(?:commonjs|(index|main)\.js|lodash-(?:amd|node)|modularize|npm)\b/.test([ui.buildPath, ui.urlParams.build, basename]);
-
-  /** Detect if testing `npm` modules */
-  var isNpm = isModularize && /\bnpm\b/.test([ui.buildPath, ui.urlParams.build]);
-
   /** Used to check problem JScript properties (a.k.a. the [[DontEnum]] bug) */
   var shadowedProps = [
     'constructor',