teabag 0.5.5 → 0.6.0

data/README.md

@@ -31,11 +31,12 @@ If you'd like to use Teabag with [Guard](https://github.com/guard/guard), check
 2. [Usage](#usage)
 3. [Writing Specs](#writing-specs)
 4. [Fixtures](#fixtures)
-5. [Suites](#suites)
-6. [Configuration](#configuration)
-7. [Test Frameworks](#test-frameworks)
-8. [Support Libraries](#support-libraries)
-9. [CI Support](#ci-support)
+5. [Coverage](#coverage)
+6. [Suites](#suites)
+7. [Configuration](#configuration)
+8. [Test Frameworks](#test-frameworks)
+9. [Support Libraries](#support-libraries)
+10. [CI Support](#ci-support)
 
 
 ## Installation
@@ -219,6 +220,31 @@ describe "Using fixtures", ->
 Check out an example of using fixtures with [Mocha](https://github.com/modeset/teabag/wiki/Using-Mocha) and [QUnit](https://github.com/modeset/teabag/wiki/Using-QUnit).
 
 
+## Coverage
+
+Teabag can use [Istanbul](https://github.com/gotwarlost/istanbul) to generate code coverage statistics and reports. Install Istanbul and adjust the configuration to always generate coverage reports, or specify by passing `--coverage` to the command line interface. Check the [configuration](#configuration) for more information.
+
+Each suite allows you to specify which files should be ignored when generating coverage reports, which allows you to ignore support libraries and dependencies that you're not testing.
+
+The following example will generate a simple text report and an HTML report with annotated source that you can inspect further.
+
+```shell
+bundle exec teabag --coverage-reports=text,html
+```
+
+An example text report that's output to the console after the tests have completed.
+```
+--------------------+-----------+-----------+-----------+-----------+
+File                |   % Stmts |% Branches |   % Funcs |   % Lines |
+--------------------+-----------+-----------+-----------+-----------+
+  phantomjs/        |     93.75 |        75 |     94.12 |     93.65 |
+    runner.coffee   |     93.75 |        75 |     94.12 |     93.65 |
+--------------------+-----------+-----------+-----------+-----------+
+All files           |     93.75 |        75 |     94.12 |     93.65 |
+--------------------+-----------+-----------+-----------+-----------+
+```
+
+
 ## Suites
 
 Teabag uses the concept of suites to group your tests at a high level. These suites are run in isolation from one another, and can have different configurations. You can define suites in the configuration, and for brevity `config` is the argument passed to the `Teabag.setup` block.
@@ -287,6 +313,12 @@ end
   <b>default:</b> <code>["teabag"]</code>
 </dd>
 
+<dt> no_coverage </dt><dd>
+  If you're running coverage reports you may want to exclude libraries like jQuery, or support libraries that you're not testing. Accepts an array of filenames or regular expressions. For example, to remove jQuery use "jquery.min.js" etc.<br/><br/>
+
+  <b>default:</b> <code>`[%r{/support/}, %r{/(.+)_helper.}]`</code>
+</dd>
+
 </dl>
 
 
@@ -409,11 +441,34 @@ These configuration directives are applicable only when running via the rake tas
   <b>default:</b> <code>true</code>
 
   <ul>
-    <li>CLI: --[no-]color</li>
+    <li>CLI: -c, --[no-]color</li>
     <li>ENV: COLOR=false</li>
   </ul>
 </dd>
 
+<dt> coverage </dt><dd>
+  Add instrumentation to your code and display coverage information. Requires <a href="https://github.com/gotwarlost/istanbul">istanbul</a>.<br/><br/>
+
+  <b>default:</b> <code>false</code>
+
+  <ul>
+    <li>CLI: -C, --coverage</li>
+    <li>ENV: COVERAGE=true</li>
+  </ul>
+</dd>
+
+<dt> coverage </dt><dd>
+  Specify which code coverage reports instanbul should generate.<br/><br/>
+
+  <b>available:</b> text-summary, text, html, lcov, lcovonly, cobertura<br/>
+  <b>default:</b> <code>nil</code>
+
+  <ul>
+    <li>CLI: -R, --coverage-reports REPORTS</li>
+    <li>ENV: COVERAGE_REPORTS=text,html</li>
+  </ul>
+</dd>
+
 </dl>
 
 

data/app/assets/javascripts/teabag-jasmine.js

@@ -2622,8 +2622,6 @@ jasmine.version_= {
 
     Teabag.location = window.location;
 
-    Teabag.console = window.console;
-
     Teabag.messages = [];
 
     Teabag.execute = function() {
@@ -2641,7 +2639,7 @@ jasmine.version_= {
         all = [];
       }
       deps = [];
-      if ((paths = window.location.search.match(/[\?&]file(\[\])?=[^&\?]*/gi)) === null) {
+      if ((paths = this.location.search.match(/[\?&]file(\[\])?=[^&\?]*/gi)) === null) {
         return all;
       }
       for (_i = 0, _len = paths.length; _i < _len; _i++) {
@@ -2662,9 +2660,12 @@ jasmine.version_= {
     };
 
     Teabag.log = function() {
-      var _ref;
       this.messages.push(arguments[0]);
-      return (_ref = this.console).log.apply(_ref, arguments);
+      try {
+        return console.log.apply(console, arguments);
+      } catch (e) {
+        throw new Error("Unable to use console.log for logging");
+      }
     };
 
     Teabag.getMessages = function() {
@@ -3035,8 +3036,9 @@ jasmine.version_= {
     HTML.prototype.buildLayout = function() {
       var el;
       el = this.createEl("div");
-      document.body.appendChild(el);
-      return el.innerHTML = Teabag.Reporters.HTML.template;
+      el.id = "teabag-interface";
+      el.innerHTML = Teabag.Reporters.HTML.template;
+      return document.body.appendChild(el);
     };
 
     HTML.prototype.buildSuiteSelect = function() {
@@ -3066,7 +3068,7 @@ jasmine.version_= {
     };
 
     HTML.prototype.reportRunnerStarting = function(runner) {
-      this.total.exist = runner.total || runner.specs().length;
+      this.total.exist = runner.total || (typeof runner.specs === "function" ? runner.specs().length : void 0) || 0;
       if (this.total.exist) {
         return this.setText("stats-duration", "...");
       }
@@ -3501,7 +3503,7 @@ jasmine.version_= {
 }).call(this);
 (function() {
 
-  Teabag.Reporters.HTML.template = "<div id=\"teabag-interface\">\n  <div class=\"teabag-clearfix\">\n    <div id=\"teabag-title\">\n      <h1>Teabag</h1>\n      <ul>\n        <li>version: <b id=\"teabag-version\"></b></li>\n        <li id=\"teabag-env-info\"></li>\n      </ul>\n    </div>\n    <div id=\"teabag-progress\"></div>\n    <ul id=\"teabag-stats\">\n      <li>passes: <b id=\"teabag-stats-passes\">0</b></li>\n      <li>failures: <b id=\"teabag-stats-failures\">0</b></li>\n      <li>skipped: <b id=\"teabag-stats-skipped\">0</b></li>\n      <li>duration: <b id=\"teabag-stats-duration\">&infin;</b></li>\n    </ul>\n  </div>\n\n  <div id=\"teabag-controls\" class=\"teabag-clearfix\">\n    <div id=\"teabag-toggles\">\n      <button id=\"teabag-use-catch\" title=\"Toggle using try/catch wrappers when possible\">Try/Catch</button>\n      <button id=\"teabag-build-full-report\" title=\"Toggle building the full report\">Full Report</button>\n      <button id=\"teabag-display-progress\" title=\"Toggle displaying progress as tests run\">Progress</button>\n    </div>\n    <div id=\"teabag-suites\"></div>\n  </div>\n\n  <hr/>\n\n  <div id=\"teabag-filter\">\n    <h1>Filtering</h1>\n    <ul id=\"teabag-filter-list\"></ul>\n  </div>\n\n  <div id=\"teabag-report\">\n    <ol id=\"teabag-report-failures\"></ol>\n    <ol id=\"teabag-report-all\"></ol>\n  </div>\n</div>";
+  Teabag.Reporters.HTML.template = "<div class=\"teabag-clearfix\">\n  <div id=\"teabag-title\">\n    <h1>Teabag</h1>\n    <ul>\n      <li>version: <b id=\"teabag-version\"></b></li>\n      <li id=\"teabag-env-info\"></li>\n    </ul>\n  </div>\n  <div id=\"teabag-progress\"></div>\n  <ul id=\"teabag-stats\">\n    <li>passes: <b id=\"teabag-stats-passes\">0</b></li>\n    <li>failures: <b id=\"teabag-stats-failures\">0</b></li>\n    <li>skipped: <b id=\"teabag-stats-skipped\">0</b></li>\n    <li>duration: <b id=\"teabag-stats-duration\">&infin;</b></li>\n  </ul>\n</div>\n\n<div id=\"teabag-controls\" class=\"teabag-clearfix\">\n  <div id=\"teabag-toggles\">\n    <button id=\"teabag-use-catch\" title=\"Toggle using try/catch wrappers when possible\">Try/Catch</button>\n    <button id=\"teabag-build-full-report\" title=\"Toggle building the full report\">Full Report</button>\n    <button id=\"teabag-display-progress\" title=\"Toggle displaying progress as tests run\">Progress</button>\n  </div>\n  <div id=\"teabag-suites\"></div>\n</div>\n\n<hr/>\n\n<div id=\"teabag-filter\">\n  <h1>Filtering</h1>\n  <ul id=\"teabag-filter-list\"></ul>\n</div>\n\n<div id=\"teabag-report\">\n  <ol id=\"teabag-report-failures\"></ol>\n  <ol id=\"teabag-report-all\"></ol>\n</div>";
 
 }).call(this);
 (function() {
@@ -3518,7 +3520,7 @@ jasmine.version_= {
     Console.prototype.reportRunnerStarting = function(runner) {
       return this.log({
         type: "runner",
-        total: runner.total || runner.specs().length,
+        total: runner.total || (typeof runner.specs === "function" ? runner.specs().length : void 0) || 0,
         start: JSON.parse(JSON.stringify(this.start))
       });
     };
@@ -3602,7 +3604,8 @@ jasmine.version_= {
     Console.prototype.reportRunnerResults = function() {
       this.log({
         type: "result",
-        elapsed: ((new Teabag.Date().getTime() - this.start.getTime()) / 1000).toFixed(5)
+        elapsed: ((new Teabag.Date().getTime() - this.start.getTime()) / 1000).toFixed(5),
+        coverage: window.__coverage__
       });
       return Teabag.finished = true;
     };

data/app/assets/javascripts/teabag-mocha.js

@@ -5360,8 +5360,6 @@
 
     Teabag.location = window.location;
 
-    Teabag.console = window.console;
-
     Teabag.messages = [];
 
     Teabag.execute = function() {
@@ -5379,7 +5377,7 @@
         all = [];
       }
       deps = [];
-      if ((paths = window.location.search.match(/[\?&]file(\[\])?=[^&\?]*/gi)) === null) {
+      if ((paths = this.location.search.match(/[\?&]file(\[\])?=[^&\?]*/gi)) === null) {
         return all;
       }
       for (_i = 0, _len = paths.length; _i < _len; _i++) {
@@ -5400,9 +5398,12 @@
     };
 
     Teabag.log = function() {
-      var _ref;
       this.messages.push(arguments[0]);
-      return (_ref = this.console).log.apply(_ref, arguments);
+      try {
+        return console.log.apply(console, arguments);
+      } catch (e) {
+        throw new Error("Unable to use console.log for logging");
+      }
     };
 
     Teabag.getMessages = function() {
@@ -5773,8 +5774,9 @@
     HTML.prototype.buildLayout = function() {
       var el;
       el = this.createEl("div");
-      document.body.appendChild(el);
-      return el.innerHTML = Teabag.Reporters.HTML.template;
+      el.id = "teabag-interface";
+      el.innerHTML = Teabag.Reporters.HTML.template;
+      return document.body.appendChild(el);
     };
 
     HTML.prototype.buildSuiteSelect = function() {
@@ -5804,7 +5806,7 @@
     };
 
     HTML.prototype.reportRunnerStarting = function(runner) {
-      this.total.exist = runner.total || runner.specs().length;
+      this.total.exist = runner.total || (typeof runner.specs === "function" ? runner.specs().length : void 0) || 0;
       if (this.total.exist) {
         return this.setText("stats-duration", "...");
       }
@@ -6239,7 +6241,7 @@
 }).call(this);
 (function() {
 
-  Teabag.Reporters.HTML.template = "<div id=\"teabag-interface\">\n  <div class=\"teabag-clearfix\">\n    <div id=\"teabag-title\">\n      <h1>Teabag</h1>\n      <ul>\n        <li>version: <b id=\"teabag-version\"></b></li>\n        <li id=\"teabag-env-info\"></li>\n      </ul>\n    </div>\n    <div id=\"teabag-progress\"></div>\n    <ul id=\"teabag-stats\">\n      <li>passes: <b id=\"teabag-stats-passes\">0</b></li>\n      <li>failures: <b id=\"teabag-stats-failures\">0</b></li>\n      <li>skipped: <b id=\"teabag-stats-skipped\">0</b></li>\n      <li>duration: <b id=\"teabag-stats-duration\">&infin;</b></li>\n    </ul>\n  </div>\n\n  <div id=\"teabag-controls\" class=\"teabag-clearfix\">\n    <div id=\"teabag-toggles\">\n      <button id=\"teabag-use-catch\" title=\"Toggle using try/catch wrappers when possible\">Try/Catch</button>\n      <button id=\"teabag-build-full-report\" title=\"Toggle building the full report\">Full Report</button>\n      <button id=\"teabag-display-progress\" title=\"Toggle displaying progress as tests run\">Progress</button>\n    </div>\n    <div id=\"teabag-suites\"></div>\n  </div>\n\n  <hr/>\n\n  <div id=\"teabag-filter\">\n    <h1>Filtering</h1>\n    <ul id=\"teabag-filter-list\"></ul>\n  </div>\n\n  <div id=\"teabag-report\">\n    <ol id=\"teabag-report-failures\"></ol>\n    <ol id=\"teabag-report-all\"></ol>\n  </div>\n</div>";
+  Teabag.Reporters.HTML.template = "<div class=\"teabag-clearfix\">\n  <div id=\"teabag-title\">\n    <h1>Teabag</h1>\n    <ul>\n      <li>version: <b id=\"teabag-version\"></b></li>\n      <li id=\"teabag-env-info\"></li>\n    </ul>\n  </div>\n  <div id=\"teabag-progress\"></div>\n  <ul id=\"teabag-stats\">\n    <li>passes: <b id=\"teabag-stats-passes\">0</b></li>\n    <li>failures: <b id=\"teabag-stats-failures\">0</b></li>\n    <li>skipped: <b id=\"teabag-stats-skipped\">0</b></li>\n    <li>duration: <b id=\"teabag-stats-duration\">&infin;</b></li>\n  </ul>\n</div>\n\n<div id=\"teabag-controls\" class=\"teabag-clearfix\">\n  <div id=\"teabag-toggles\">\n    <button id=\"teabag-use-catch\" title=\"Toggle using try/catch wrappers when possible\">Try/Catch</button>\n    <button id=\"teabag-build-full-report\" title=\"Toggle building the full report\">Full Report</button>\n    <button id=\"teabag-display-progress\" title=\"Toggle displaying progress as tests run\">Progress</button>\n  </div>\n  <div id=\"teabag-suites\"></div>\n</div>\n\n<hr/>\n\n<div id=\"teabag-filter\">\n  <h1>Filtering</h1>\n  <ul id=\"teabag-filter-list\"></ul>\n</div>\n\n<div id=\"teabag-report\">\n  <ol id=\"teabag-report-failures\"></ol>\n  <ol id=\"teabag-report-all\"></ol>\n</div>";
 
 }).call(this);
 (function() {
@@ -6256,7 +6258,7 @@
     Console.prototype.reportRunnerStarting = function(runner) {
       return this.log({
         type: "runner",
-        total: runner.total || runner.specs().length,
+        total: runner.total || (typeof runner.specs === "function" ? runner.specs().length : void 0) || 0,
         start: JSON.parse(JSON.stringify(this.start))
       });
     };
@@ -6340,7 +6342,8 @@
     Console.prototype.reportRunnerResults = function() {
       this.log({
         type: "result",
-        elapsed: ((new Teabag.Date().getTime() - this.start.getTime()) / 1000).toFixed(5)
+        elapsed: ((new Teabag.Date().getTime() - this.start.getTime()) / 1000).toFixed(5),
+        coverage: window.__coverage__
       });
       return Teabag.finished = true;
     };
@@ -6379,6 +6382,9 @@
     Console.prototype.reportSpecResults = function(spec, err) {
       if (err) {
         spec.err = err;
+        if (spec.type === "hook") {
+          this.reportSpecResults(spec);
+        }
         return;
       }
       return Console.__super__.reportSpecResults.apply(this, arguments);
@@ -6410,6 +6416,9 @@
     HTML.prototype.reportSpecResults = function(spec, err) {
       if (err) {
         spec.err = err;
+        if (spec.type === "hook") {
+          this.reportSpecResults(spec);
+        }
         return;
       }
       this.reportSpecStarting(spec);
@@ -6417,7 +6426,7 @@
     };
 
     HTML.prototype.envInfo = function() {
-      return "mocha 1.7.4";
+      return "mocha 1.8.1";
     };
 
     return HTML;

data/app/assets/javascripts/teabag-qunit.js

@@ -1998,8 +1998,6 @@
 
     Teabag.location = window.location;
 
-    Teabag.console = window.console;
-
     Teabag.messages = [];
 
     Teabag.execute = function() {
@@ -2017,7 +2015,7 @@
         all = [];
       }
       deps = [];
-      if ((paths = window.location.search.match(/[\?&]file(\[\])?=[^&\?]*/gi)) === null) {
+      if ((paths = this.location.search.match(/[\?&]file(\[\])?=[^&\?]*/gi)) === null) {
         return all;
       }
       for (_i = 0, _len = paths.length; _i < _len; _i++) {
@@ -2038,9 +2036,12 @@
     };
 
     Teabag.log = function() {
-      var _ref;
       this.messages.push(arguments[0]);
-      return (_ref = this.console).log.apply(_ref, arguments);
+      try {
+        return console.log.apply(console, arguments);
+      } catch (e) {
+        throw new Error("Unable to use console.log for logging");
+      }
     };
 
     Teabag.getMessages = function() {
@@ -2411,8 +2412,9 @@
     HTML.prototype.buildLayout = function() {
       var el;
       el = this.createEl("div");
-      document.body.appendChild(el);
-      return el.innerHTML = Teabag.Reporters.HTML.template;
+      el.id = "teabag-interface";
+      el.innerHTML = Teabag.Reporters.HTML.template;
+      return document.body.appendChild(el);
     };
 
     HTML.prototype.buildSuiteSelect = function() {
@@ -2442,7 +2444,7 @@
     };
 
     HTML.prototype.reportRunnerStarting = function(runner) {
-      this.total.exist = runner.total || runner.specs().length;
+      this.total.exist = runner.total || (typeof runner.specs === "function" ? runner.specs().length : void 0) || 0;
       if (this.total.exist) {
         return this.setText("stats-duration", "...");
       }
@@ -2877,7 +2879,7 @@
 }).call(this);
 (function() {
 
-  Teabag.Reporters.HTML.template = "<div id=\"teabag-interface\">\n  <div class=\"teabag-clearfix\">\n    <div id=\"teabag-title\">\n      <h1>Teabag</h1>\n      <ul>\n        <li>version: <b id=\"teabag-version\"></b></li>\n        <li id=\"teabag-env-info\"></li>\n      </ul>\n    </div>\n    <div id=\"teabag-progress\"></div>\n    <ul id=\"teabag-stats\">\n      <li>passes: <b id=\"teabag-stats-passes\">0</b></li>\n      <li>failures: <b id=\"teabag-stats-failures\">0</b></li>\n      <li>skipped: <b id=\"teabag-stats-skipped\">0</b></li>\n      <li>duration: <b id=\"teabag-stats-duration\">&infin;</b></li>\n    </ul>\n  </div>\n\n  <div id=\"teabag-controls\" class=\"teabag-clearfix\">\n    <div id=\"teabag-toggles\">\n      <button id=\"teabag-use-catch\" title=\"Toggle using try/catch wrappers when possible\">Try/Catch</button>\n      <button id=\"teabag-build-full-report\" title=\"Toggle building the full report\">Full Report</button>\n      <button id=\"teabag-display-progress\" title=\"Toggle displaying progress as tests run\">Progress</button>\n    </div>\n    <div id=\"teabag-suites\"></div>\n  </div>\n\n  <hr/>\n\n  <div id=\"teabag-filter\">\n    <h1>Filtering</h1>\n    <ul id=\"teabag-filter-list\"></ul>\n  </div>\n\n  <div id=\"teabag-report\">\n    <ol id=\"teabag-report-failures\"></ol>\n    <ol id=\"teabag-report-all\"></ol>\n  </div>\n</div>";
+  Teabag.Reporters.HTML.template = "<div class=\"teabag-clearfix\">\n  <div id=\"teabag-title\">\n    <h1>Teabag</h1>\n    <ul>\n      <li>version: <b id=\"teabag-version\"></b></li>\n      <li id=\"teabag-env-info\"></li>\n    </ul>\n  </div>\n  <div id=\"teabag-progress\"></div>\n  <ul id=\"teabag-stats\">\n    <li>passes: <b id=\"teabag-stats-passes\">0</b></li>\n    <li>failures: <b id=\"teabag-stats-failures\">0</b></li>\n    <li>skipped: <b id=\"teabag-stats-skipped\">0</b></li>\n    <li>duration: <b id=\"teabag-stats-duration\">&infin;</b></li>\n  </ul>\n</div>\n\n<div id=\"teabag-controls\" class=\"teabag-clearfix\">\n  <div id=\"teabag-toggles\">\n    <button id=\"teabag-use-catch\" title=\"Toggle using try/catch wrappers when possible\">Try/Catch</button>\n    <button id=\"teabag-build-full-report\" title=\"Toggle building the full report\">Full Report</button>\n    <button id=\"teabag-display-progress\" title=\"Toggle displaying progress as tests run\">Progress</button>\n  </div>\n  <div id=\"teabag-suites\"></div>\n</div>\n\n<hr/>\n\n<div id=\"teabag-filter\">\n  <h1>Filtering</h1>\n  <ul id=\"teabag-filter-list\"></ul>\n</div>\n\n<div id=\"teabag-report\">\n  <ol id=\"teabag-report-failures\"></ol>\n  <ol id=\"teabag-report-all\"></ol>\n</div>";
 
 }).call(this);
 (function() {
@@ -2894,7 +2896,7 @@
     Console.prototype.reportRunnerStarting = function(runner) {
       return this.log({
         type: "runner",
-        total: runner.total || runner.specs().length,
+        total: runner.total || (typeof runner.specs === "function" ? runner.specs().length : void 0) || 0,
         start: JSON.parse(JSON.stringify(this.start))
       });
     };
@@ -2978,7 +2980,8 @@
     Console.prototype.reportRunnerResults = function() {
       this.log({
         type: "result",
-        elapsed: ((new Teabag.Date().getTime() - this.start.getTime()) / 1000).toFixed(5)
+        elapsed: ((new Teabag.Date().getTime() - this.start.getTime()) / 1000).toFixed(5),
+        coverage: window.__coverage__
       });
       return Teabag.finished = true;
     };

data/app/assets/javascripts/teabag/base/reporters/console.coffee

@@ -8,7 +8,7 @@ class Teabag.Reporters.Console
   reportRunnerStarting: (runner) ->
     @log
       type:  "runner"
-      total: runner.total || runner.specs().length
+      total: runner.total || runner.specs?().length || 0
       start: JSON.parse(JSON.stringify(@start))
 
 
@@ -67,6 +67,7 @@ class Teabag.Reporters.Console
     @log
       type:    "result"
       elapsed: ((new Teabag.Date().getTime() - @start.getTime()) / 1000).toFixed(5)
+      coverage: window.__coverage__
     Teabag.finished = true
 
 

data/app/assets/javascripts/teabag/base/reporters/html.coffee

@@ -62,7 +62,7 @@ class Teabag.Reporters.HTML extends Teabag.Reporters.BaseView
 
 
   reportRunnerStarting: (runner) ->
-    @total.exist = runner.total || runner.specs().length
+    @total.exist = runner.total || runner.specs?().length || 0
     @setText("stats-duration", "...") if @total.exist
 
 

data/app/assets/javascripts/teabag/base/teabag.coffee

@@ -13,7 +13,6 @@ class @Teabag
   @Reporters: {}
   @Date:      Date
   @location:  window.location
-  @console:   window.console
   @messages:  []
 
   @execute: ->
@@ -27,7 +26,7 @@ class @Teabag
   # provides interface for AMD usage -- pass all dependencies in as an array, and params will be checked for matches
   @resolveDependenciesFromParams: (all = []) ->
     deps = []
-    return all if (paths = window.location.search.match(/[\?&]file(\[\])?=[^&\?]*/gi)) == null
+    return all if (paths = @location.search.match(/[\?&]file(\[\])?=[^&\?]*/gi)) == null
 
     for path in paths
       parts = decodeURIComponent(path.replace(/\+/g, " ")).match(/\/(.+)\.(js|js.coffee|coffee)$/i)
@@ -40,7 +39,9 @@ class @Teabag
   # logging methods -- used by selenium / phantomJS to get information back to ruby
   @log: ->
     @messages.push(arguments[0])
-    @console.log(arguments...)
+    try console.log(arguments...)
+    catch e
+      throw new Error("Unable to use console.log for logging")
 
 
   @getMessages: ->

data/app/assets/javascripts/teabag/mocha/reporters/console.coffee

@@ -11,5 +11,6 @@ class Teabag.Reporters.Console extends Teabag.Reporters.Console
   reportSpecResults: (spec, err) =>
     if err
       spec.err = err
+      @reportSpecResults(spec) if spec.type == "hook"
       return
     super

data/app/assets/javascripts/teabag/mocha/reporters/html.coffee

@@ -11,13 +11,14 @@ class Teabag.Reporters.HTML extends Teabag.Reporters.HTML
   reportSpecResults: (spec, err) =>
     if err
       spec.err = err
+      @reportSpecResults(spec) if spec.type == "hook"
       return
     @reportSpecStarting(spec)
     super
 
 
   envInfo: ->
-    "mocha 1.7.4"
+    "mocha 1.8.1"
 
 
 class Teabag.Reporters.HTML.SpecView extends Teabag.Reporters.HTML.SpecView

data/app/controllers/teabag/spec_controller.rb

@@ -12,6 +12,8 @@ class Teabag::SpecController < ActionController::Base
   end
 
   def runner
+    @javascript_options = {}
+    @javascript_options[:instrument] = Teabag.configuration.coverage || params[:coverage] == "true"
     @suite = Teabag::Suite.new(params)
   end