Merge branch 'master' into 3.0-features

2018-01-10 15:23:35 -08:00
parent 16e07a0e99 b943f6b736
commit cf2f922e30
16 changed files with 373 additions and 155 deletions
@@ -275,6 +275,24 @@ describe("SpyRegistry", function() {

      expect(jasmineUnderTest.isSpy(subject.spiedFunc)).toBe(false);
    });
+
+    it("restores window.onerror by overwriting, not deleting", function() {
+      function FakeWindow() {
+      }
+      FakeWindow.prototype.onerror = function() {};
+
+      var spies = [],
+        global = new FakeWindow(),
+        spyRegistry = new jasmineUnderTest.SpyRegistry({
+          currentSpies: function() { return spies; },
+          global: global
+        });
+
+      spyRegistry.spyOn(global, 'onerror');
+      spyRegistry.clearSpies();
+      expect(global.onerror).toBe(FakeWindow.prototype.onerror);
+      expect(global.hasOwnProperty('onerror')).toBe(true);
+    });
  });

    describe('spying on properties', function() {