From 8c5b64c7d7a04b05bab86bd5e8721783b57df9e9 Mon Sep 17 00:00:00 2001
From: John-David Dalton <john.david.dalton@gmail.com>
Date: Thu, 11 Feb 2016 12:58:38 -0800
Subject: [PATCH] Have browser fp convert auto wrap lodash if found.

---
 fp/_convertBrowser.js |  3 +++
 test/test-fp.js       | 16 ++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/fp/_convertBrowser.js b/fp/_convertBrowser.js
index fd7489781..fbd217485 100644
--- a/fp/_convertBrowser.js
+++ b/fp/_convertBrowser.js
@@ -11,4 +11,7 @@ function browserConvert(lodash, options) {
   return baseConvert(lodash, lodash, options);
 }
 
+if (typeof _ == 'function') {
+  _ = browserConvert(_.runInContext());
+}
 module.exports = browserConvert;
diff --git a/test/test-fp.js b/test/test-fp.js
index 9662fcc65..1433713c2 100644
--- a/test/test-fp.js
+++ b/test/test-fp.js
@@ -35,10 +35,11 @@
   ));
 
   /** Load stable Lodash and QUnit Extras. */
-  var _ = root._ || load('../lodash.js');
-  if (_) {
-    _ = _.runInContext(root);
-  }
+  var _ = root._ || (root._ = (
+    _ = load('../lodash.js'),
+    _.runInContext(root)
+  ));
+
   var QUnitExtras = load('../node_modules/qunit-extras/qunit-extras.js');
   if (QUnitExtras) {
     QUnitExtras.runInContext(root);
@@ -63,8 +64,11 @@
     };
   }());
 
-  var mapping = root.mapping || load('../fp/_mapping.js'),
-      fp = convert(_.runInContext());
+  var fp = root.fp
+    ? (fp = _.noConflict(), _ = root._, fp)
+    : convert(_.runInContext());
+
+  var mapping = root.mapping || load('../fp/_mapping.js');
 
   /*--------------------------------------------------------------------------*/