Merge branch 'master' into 3.0-features

spec/html/HtmlReporterSpec.js

@@ -241,7 +241,7 @@ describe("HtmlReporter", function() {
   });
 
   describe("when Jasmine is done", function() {
-    it("adds EMPTY to the link title of specs that have no expectations", function() {
+    it("adds a warning to the link title of specs that have no expectations", function() {
       if (!window.console) {
         window.console = { error: function(){} };
       }
@@ -260,7 +260,7 @@ describe("HtmlReporter", function() {
       reporter.initialize();
       reporter.jasmineStarted({});
       reporter.suiteStarted({id: 1});
-      reporter.specStarted({id: 1, status: 'passed', passedExpectations: [], failedExpectations: []});
+      reporter.specStarted({id: 1, passedExpectations: [], failedExpectations: []});
       reporter.specDone({
         id: 1,
         status: 'passed',

spec/html/SpyRegistryHtmlSpec.js

@@ -0,0 +1,34 @@
+describe('Spy Registry browser-specific behavior', function() {
+  it('can spy on and unspy window.onerror', function() {
+    requireWriteableOnerror();
+
+    var spies = [],
+      spyRegistry = new jasmineUnderTest.SpyRegistry({
+		  currentSpies: function() { return spies; },
+		  global: window
+		  }),
+      originalHandler = window.onerror;
+
+    try {
+      spyRegistry.spyOn(window, 'onerror');
+      spyRegistry.clearSpies();
+      expect(window.onerror).toBe(originalHandler);
+    } finally {
+      window.onerror = originalHandler;
+    }
+  });
+
+  function requireWriteableOnerror() {
+    var descriptor;
+
+    try {
+      descriptor = Object.getOwnPropertyDescriptor(window, 'onerror');
+    } catch(e) {
+      // IE 8 doesn't support `definePropery` on non-DOM nodes
+    }
+
+    if (descriptor && !(descriptor.writable || descriptor.set)) {
+      pending('Browser declares window.onerror to be readonly');
+    }
+  }
+});