Merge pull request facebook#594 from spicyj/skip-spec

Allow running one spec/suite in the web interface
nagaozen · Nov 27, 2013 · 9886e40 · 9886e40
2 parents a7811fb + 3a75d70
commit 9886e40
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/test/lib/jasmine-execute.js b/test/lib/jasmine-execute.js
@@ -1,7 +1,12 @@
 document.write('<style> @import "../vendor/jasmine/jasmine.css?_=' + (+new Date).toString(36) + '"; </style>');
 
 ;(function(env){
-  env.addReporter(new jasmine.HtmlReporter);
+  var htmlReporter = new jasmine.HtmlReporter();
+  env.addReporter(htmlReporter);
+  env.specFilter = function(spec) {
+    return htmlReporter.specFilter(spec);
+  };
+
   // Clean up any nodes the previous test might have added.
   env.afterEach(function() {
     harness.removeNextSiblings(document.body);

diff --git a/vendor/jasmine-jsreporter/jasmine-jsreporter.js b/vendor/jasmine-jsreporter/jasmine-jsreporter.js
@@ -113,7 +113,8 @@
         reportSpecResults: function (spec) {
             // Finish timing this spec and calculate duration/delta (in sec)
             spec.finishedAt = new Date();
-            spec.durationSec = elapsedSec(spec.startedAt.getTime(), spec.finishedAt.getTime());
+            // If the spec was skipped, reportSpecStarting is never called and spec.startedAt is undefined
+            spec.durationSec = spec.startedAt ? elapsedSec(spec.startedAt.getTime(), spec.finishedAt.getTime()) : 0;
         },
 
         reportSuiteResults: function (suite) {