diff --git a/lib/jasmine.css b/lib/jasmine.css
index 6583fe7..a99d5d8 100644
--- a/lib/jasmine.css
+++ b/lib/jasmine.css
@@ -131,6 +131,36 @@ body {
color: black;
}
+.resultMessage > table {
+ width: 100%;
+ font-size: .8em;
+ padding: 0;
+ margin: 0;
+}
+
+.resultMessage > table > tr > th, .resultMessage > table > tr > td {
+ text-align: left;
+ width: 50%;
+ padding: 0;
+ margin: 0;
+}
+
+.resultMessage td {
+ vertical-align: top;
+ border: 1px inset;
+}
+
+.resultMessage pre {
+ margin: 0;
+}
+
+.resultMessage .object, .resultMessage .array {
+}
+
+.resultMessage .string {
+ font-style: italic;
+}
+
.stackTrace {
white-space: pre;
font-size: .8em;
diff --git a/spec/runner.html b/spec/runner.html
index 6ebd752..51e365c 100644
--- a/spec/runner.html
+++ b/spec/runner.html
@@ -29,6 +29,7 @@
+
@@ -59,12 +60,12 @@
var jasmineEnv = jasmine.getEnv();
jasmineEnv.updateInterval = 1000;
- var trivialReporter = new jasmine.TrivialReporter();
+ var reporter = new jasmine.FancyHtmlReporter();
- jasmineEnv.addReporter(trivialReporter);
+ jasmineEnv.addReporter(reporter);
jasmineEnv.specFilter = function(spec) {
- return trivialReporter.specFilter(spec);
+ return reporter.specFilter(spec);
};
window.onload = function() {
diff --git a/src/FancyHtmlReporter.js b/src/FancyHtmlReporter.js
new file mode 100644
index 0000000..c9b446f
--- /dev/null
+++ b/src/FancyHtmlReporter.js
@@ -0,0 +1,191 @@
+jasmine.FancyHtmlReporter = function(doc) {
+ this.document = doc || document;
+ this.suiteDivs = {};
+};
+
+jasmine.FancyHtmlReporter.prototype.createDom = function(type, attrs, childrenVarArgs) {
+ var el = document.createElement(type);
+
+ for (var i = 2; i < arguments.length; i++) {
+ var child = arguments[i];
+
+ if (typeof child === 'string') {
+ el.appendChild(document.createTextNode(child));
+ } else {
+ if (child) { el.appendChild(child); }
+ }
+ }
+
+ for (var attr in attrs) {
+ el[attr] = attrs[attr];
+ }
+
+ return el;
+};
+
+jasmine.FancyHtmlReporter.prototype.reportRunnerStarting = function(runner) {
+ var suites = runner.suites();
+
+ this.runnerDiv = this.createDom('div', { className: 'runner running' },
+ this.createDom('a', { className: 'run_spec', href: '?' }, "run all"),
+ this.runnerMessageSpan = this.createDom('span', {}, "Running..."));
+ this.document.body.appendChild(this.runnerDiv);
+
+ for (var i = 0; i < suites.length; i++) {
+ var suite = suites[i];
+ var suiteDiv = this.createDom('div', { className: 'suite' },
+ this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, "run"),
+ this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, suite.description));
+ this.suiteDivs[suite.getFullName()] = suiteDiv;
+ var parentDiv = this.document.body;
+ if (suite.parentSuite) {
+ parentDiv = this.suiteDivs[suite.parentSuite.getFullName()];
+ }
+ parentDiv.appendChild(suiteDiv);
+ }
+
+ this.startedAt = new Date();
+};
+
+jasmine.FancyHtmlReporter.prototype.reportRunnerResults = function(runner) {
+ var results = runner.results();
+ var className = (results.failedCount > 0) ? "runner failed" : "runner passed";
+ this.runnerDiv.setAttribute("class", className);
+ //do it twice for IE
+ this.runnerDiv.setAttribute("className", className);
+ var specs = runner.specs();
+ var specCount = 0;
+ for (var i = 0; i < specs.length; i++) {
+ if (this.specFilter(specs[i])) {
+ specCount++;
+ }
+ }
+ var message = "" + specCount + " spec" + (specCount == 1 ? "" : "s" ) + ", " + results.failedCount + " failure" + ((results.failedCount == 1) ? "" : "s");
+ message += " in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s";
+ this.runnerMessageSpan.replaceChild(this.createDom('a', { className: 'description', href: '?'}, message), this.runnerMessageSpan.firstChild);
+};
+
+jasmine.FancyHtmlReporter.prototype.reportSuiteResults = function(suite) {
+ var results = suite.results();
+ var status = results.passed() ? 'passed' : 'failed';
+ if (results.totalCount == 0) { // todo: change this to check results.skipped
+ status = 'skipped';
+ }
+ this.suiteDivs[suite.getFullName()].className += " " + status;
+};
+
+jasmine.FancyHtmlReporter.prototype.reportSpecResults = function(spec) {
+ var results = spec.results();
+ var status = results.passed() ? 'passed' : 'failed';
+ if (results.skipped) {
+ status = 'skipped';
+ }
+ var specDiv = this.createDom('div', { className: 'spec ' + status },
+ this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(spec.getFullName()) }, "run"),
+ this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(spec.getFullName()) }, spec.getFullName()));
+
+
+ var resultItems = results.getItems();
+ for (var i = 0; i < resultItems.length; i++) {
+ var result = resultItems[i];
+ if (result.passed && !result.passed()) {
+ var actualDiv, expectedDiv;
+
+ specDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'},
+ this.createDom('table', {},
+ this.createDom('tr', {},
+ this.createDom('th', {}, 'expect()'),
+ this.createDom('th', {}, result.matcherName + "()")),
+ this.createDom('tr', {},
+ actualDiv = this.createDom('td'),
+ expectedDiv = this.createDom('td'))
+ )
+ )
+ );
+
+ new jasmine.HtmlPrettyPrinter(actualDiv).format(result.actual);
+ new jasmine.HtmlPrettyPrinter(expectedDiv).format(result.expected);
+
+ specDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack));
+ }
+ }
+ this.suiteDivs[spec.suite.getFullName()].appendChild(specDiv);
+};
+
+jasmine.FancyHtmlReporter.prototype.log = function() {
+ console.log.apply(console, arguments);
+};
+
+jasmine.FancyHtmlReporter.prototype.getLocation = function() {
+ return this.document.location;
+};
+
+jasmine.FancyHtmlReporter.prototype.specFilter = function(spec) {
+ var paramMap = {};
+ var params = this.getLocation().search.substring(1).split('&');
+ for (var i = 0; i < params.length; i++) {
+ var p = params[i].split('=');
+ paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]);
+ }
+
+ if (!paramMap["spec"]) return true;
+ return spec.getFullName().indexOf(paramMap["spec"]) == 0;
+};
+
+jasmine.HtmlPrettyPrinter = function(el) {
+ jasmine.PrettyPrinter.call(this);
+ this.el = el;
+};
+
+jasmine.util.inherit(jasmine.HtmlPrettyPrinter, jasmine.PrettyPrinter);
+
+jasmine.HtmlPrettyPrinter.prototype.createDom = jasmine.FancyHtmlReporter.prototype.createDom;
+
+jasmine.HtmlPrettyPrinter.prototype.emitScalar = function(value) {
+ this.append(this.createDom('pre', {}, value));
+};
+
+jasmine.HtmlPrettyPrinter.prototype.emitString = function(value) {
+ this.append(this.createDom('pre', {className: 'string'}, value));
+};
+
+jasmine.HtmlPrettyPrinter.prototype.emitArray = function(array) {
+ var table = this.createDom('table', {className: 'array'});
+
+ for (var i = 0; i < array.length; i++) {
+ var oldEl = this.el;
+ this.el = this.createDom('td');
+ table.appendChild(this.createDom('tr', {}, this.el));
+ this.format(array[i]);
+ this.el = oldEl;
+ }
+ this.append(table);
+};
+
+jasmine.HtmlPrettyPrinter.prototype.emitObject = function(obj) {
+ var self = this;
+ var table = this.createDom('table', {className: 'object'});
+
+ this.iterateObject(obj, function(property, isGetter) {
+ var tr = self.createDom('tr');
+ table.appendChild(tr);
+
+ tr.appendChild(self.createDom('th', {}, property));
+
+ var oldEl = self.el;
+ self.el = self.createDom('td');
+ tr.appendChild(self.createDom('th', {}, self.el));
+ if (isGetter) {
+ self.el.appendChild(self.createDom('pre', {className: 'getter'}, ''));
+ } else {
+ self.format(obj[property]);
+ }
+ self.el = oldEl;
+ });
+
+ this.append(table);
+};
+
+jasmine.HtmlPrettyPrinter.prototype.append = function(element) {
+ this.el.appendChild(element);
+};