Merge branch 'enelson/spyobjproperty' of https://github.com/elliot-nelson/jasmine into elliot-nelson-enelson/spyobjproperty

- Merges #1722 from @elliot-nelson
- Closes #1569
- Fixes #1442

lib/jasmine-core/jasmine-html.js

@@ -81,7 +81,6 @@ jasmineRequire.HtmlReporter = function(j$) {
       addToExistingQueryString =
         options.addToExistingQueryString || defaultQueryString,
       filterSpecs = options.filterSpecs,
-      timer = options.timer || j$.noopTimer,
       htmlReporterMain,
       symbols,
       deprecationWarnings = [];
@@ -115,7 +114,6 @@ jasmineRequire.HtmlReporter = function(j$) {
     var totalSpecsDefined;
     this.jasmineStarted = function(options) {
       totalSpecsDefined = options.totalSpecsDefined || 0;
-      timer.start();
     };
 
     var summary = createDom('div', { className: 'jasmine-summary' });
@@ -194,7 +192,7 @@ jasmineRequire.HtmlReporter = function(j$) {
         createDom(
           'span',
           { className: 'jasmine-duration' },
-          'finished in ' + timer.elapsed() / 1000 + 's'
+          'finished in ' + doneResult.totalTime / 1000 + 's'
         )
       );