From 6921fb66d54207d6a6b8327229c1f77859e0b84e Mon Sep 17 00:00:00 2001
From: jdalton <john.david.dalton@gmail.com>
Date: Wed, 24 Jun 2015 23:00:57 -0700
Subject: [PATCH] Add `_.noConflict` test.

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

diff --git a/test/test.js b/test/test.js
index f2744730a..a5ea822f0 100644
--- a/test/test.js
+++ b/test/test.js
@@ -11446,13 +11446,31 @@
     test('should return the `lodash` function', 1, function() {
       if (!isModularize) {
         var oldDash = root._;
-        strictEqual(_.noConflict(), _);
+        strictEqual(_.noConflict(), oldDash);
         root._ = oldDash;
       }
       else {
         skipTest();
       }
     });
+
+    test('should work with a `context` of `this`', 2, function() {
+      if (!isModularize && !document && _._object) {
+        var fs = require('fs'),
+            vm = require('vm'),
+            expected = {},
+            context = vm.createContext({ '_': expected }),
+            source = fs.readFileSync(filePath);
+
+        vm.runInContext(source + '\nthis.lodash = this._.noConflict()', context);
+
+        strictEqual(context._, expected);
+        ok(!!context.lodash);
+      }
+      else {
+        skipTest(2);
+      }
+    });
   }());
 
   /*--------------------------------------------------------------------------*/
@@ -15967,11 +15985,11 @@
             debouncedAppend.call(args[0], args[1]);
           }
         };
-        
+
         var debouncedAppend = _.debounce(append, 32);
         debouncedAppend.call('a1', 'a2');
         equal(value, '');
-        
+
         setTimeout(function(){
           equal(value, 'a1a2b1b2', 'append was debounced successfully');
           QUnit.start();