Merge pull request #74 from fatso83/pr-62-repacked

PR #62 repacked (fixes #59).
sinonjs · Jul 13, 2016 · 5d4310d · 5d4310d
2 parents f464603 + 2b4e22b
commit 5d4310d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/lolex-src.js b/src/lolex-src.js
@@ -356,10 +356,10 @@
 
         for (i = 0, l = clock.methods.length; i < l; i++) {
             method = clock.methods[i];
-            if (method === "hrtime") {
+            if (method === "hrtime" && target.process) {
                 target.process.hrtime = clock[installedHrTime];
             } else {
-                if (target[method].hadOwnProperty) {
+                if (target[method] && target[method].hadOwnProperty) {
                     target[method] = clock["_" + method];
                 } else {
                     try {

diff --git a/test/lolex-test.js b/test/lolex-test.js
@@ -29,6 +29,21 @@ var GlobalDate = Date;
 var NOOP = function NOOP() { return undefined; };
 var hrtimePresent = (global.process && typeof global.process.hrtime === "function");
 
+describe("issue #59", function () {
+    var context = {
+        Date: Date,
+        setTimeout: setTimeout,
+        clearTimeout: clearTimeout
+    };
+    var clock;
+
+    it("should install and uninstall the clock on a custom target", function () {
+        clock = lolex.install(context);
+        // this would throw an error before issue #59 was fixed
+        clock.uninstall();
+    });
+});
+
 describe("lolex", function () {
 
     describe("setTimeout", function () {