Skip to content

Commit

Permalink
Merge commit '5f10b2e623c6c21d1b692bde4a8a5c6d4015cd44'
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian Williams & Ian Fisher committed Apr 1, 2010
2 parents d8ed415 + 5f10b2e commit 2212d75
Show file tree
Hide file tree
Showing 6 changed files with 223 additions and 29 deletions.
73 changes: 64 additions & 9 deletions lib/TrivialReporter.js
View file
Expand Up @@ -17,7 +17,11 @@ jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarA
}

for (var attr in attrs) {
if (attr == "className") {
el[attr] = attrs[attr];
} else {
el.setAttribute(attr, attrs[attr]);
}
}

return el;
Expand All @@ -26,25 +30,61 @@ jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarA
jasmine.TrivialReporter.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);
var showPassed, showSkipped;

this.outerDiv = this.createDom('div', { className: 'jasmine_reporter' },
this.createDom('div', { className: 'banner' },
this.createDom('div', { className: 'logo' },
"Jasmine",
this.createDom('span', { className: 'version' }, runner.env.versionString())),
this.createDom('div', { className: 'options' },
"Show ",
showPassed = this.createDom('input', { id: "__jasmine_TrivialReporter_showPassed__", type: 'checkbox' }),
this.createDom('label', { "for": "__jasmine_TrivialReporter_showPassed__" }, " passed "),
showSkipped = this.createDom('input', { id: "__jasmine_TrivialReporter_showSkipped__", type: 'checkbox' }),
this.createDom('label', { "for": "__jasmine_TrivialReporter_showSkipped__" }, " skipped")
)
),

this.runnerDiv = this.createDom('div', { className: 'runner running' },
this.createDom('a', { className: 'run_spec', href: '?' }, "run all"),
this.runnerMessageSpan = this.createDom('span', {}, "Running..."),
this.finishedAtSpan = this.createDom('span', { className: 'finished-at' }, ""))
);

this.document.body.appendChild(this.outerDiv);

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;
var parentDiv = this.outerDiv;
if (suite.parentSuite) {
parentDiv = this.suiteDivs[suite.parentSuite.getFullName()];
}
parentDiv.appendChild(suiteDiv);
}

this.startedAt = new Date();

var self = this;
showPassed.onchange = function(evt) {
if (evt.target.checked) {
self.outerDiv.className += ' show-passed';
} else {
self.outerDiv.className = self.outerDiv.className.replace(/ show-passed/, '');
}
};

showSkipped.onchange = function(evt) {
if (evt.target.checked) {
self.outerDiv.className += ' show-skipped';
} else {
self.outerDiv.className = self.outerDiv.className.replace(/ show-skipped/, '');
}
};
};

jasmine.TrivialReporter.prototype.reportRunnerResults = function(runner) {
Expand All @@ -63,6 +103,8 @@ jasmine.TrivialReporter.prototype.reportRunnerResults = function(runner) {
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);

this.finishedAtSpan.appendChild(document.createTextNode("Finished at " + new Date().toString()));
};

jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) {
Expand All @@ -82,17 +124,30 @@ jasmine.TrivialReporter.prototype.reportSpecResults = function(spec) {
}
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()));
this.createDom('a', {
className: 'description',
href: '?spec=' + encodeURIComponent(spec.getFullName()),
title: spec.getFullName()
}, spec.description));


var resultItems = results.getItems();
var messagesDiv = this.createDom('div', { className: 'messages' });
for (var i = 0; i < resultItems.length; i++) {
var result = resultItems[i];
if (result.passed && !result.passed()) {
specDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message));
specDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack));
messagesDiv.appendChild(this.createDom('div', {className: 'resultMessage fail'}, result.message));

if (result.trace.stack) {
messagesDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack));
}
}
}

if (messagesDiv.childNodes.length > 0) {
specDiv.appendChild(messagesDiv);
}

this.suiteDivs[spec.suite.getFullName()].appendChild(specDiv);
};

Expand All @@ -114,4 +169,4 @@ jasmine.TrivialReporter.prototype.specFilter = function(spec) {

if (!paramMap["spec"]) return true;
return spec.getFullName().indexOf(paramMap["spec"]) == 0;
};
};
14 changes: 13 additions & 1 deletion lib/jasmine-0.10.2.js
View file
Expand Up @@ -690,6 +690,18 @@ jasmine.Env.prototype.version = function () {
}
};

/**
* @returns string containing jasmine version build info, if set.
*/
jasmine.Env.prototype.versionString = function() {
if (jasmine.version_) {
var version = this.version();
return version.major + "." + version.minor + "." + version.build + " revision " + version.revision;
} else {
return "version unknown";
}
};

/**
* @returns a sequential integer starting at 0
*/
Expand Down Expand Up @@ -2314,5 +2326,5 @@ jasmine.version_= {
"major": 0,
"minor": 10,
"build": 2,
"revision": 1268969696
"revision": 1270162506
};
104 changes: 92 additions & 12 deletions lib/jasmine.css
View file
Expand Up @@ -3,33 +3,67 @@ body {
}


body .run_spec {
float:right;
.jasmine_reporter a:visited, .jasmine_reporter a {
color: #303;
}

.runner.running {
background-color: yellow;
.jasmine_reporter a:hover, .jasmine_reporter a:active {
color: blue;
}

.run_spec {
float:right;
padding-right: 5px;
font-size: .8em;
text-decoration: none;
}

.jasmine_reporter {
margin: 0 5px;
}

.runner {
border: 1px solid gray;
margin: 5px;
.banner {
color: #303;
background-color: #fef;
padding: 5px;
}

.logo {
float: left;
font-size: 1.1em;
padding-left: 5px;
}

.logo .version {
font-size: .6em;
padding-left: 1em;
padding-right: 1em;
}

.runner.running {
background-color: yellow;
}


.options {
text-align: right;
font-size: .8em;
}




.suite {
border: 1px outset gray;
margin: 5px;
margin: 5px 0;
padding-left: 1em;
}

.suite .suite {
margin: 5px;
}

.suite.passed {
background-color: #cfc;
background-color: #dfd;
}

.suite.failed {
Expand All @@ -38,22 +72,51 @@ body .run_spec {

.spec {
margin: 5px;
padding-left: 1em;
clear: both;
}

.spec.failed, .spec.passed, .spec.skipped {
padding-bottom: 5px;
border: 1px solid gray;
}

.spec.failed {
background-color: #fbb;
border-color: red;
}

.spec.passed {
background-color: #bfb;
border-color: green;
}

.spec.skipped {
background-color: #bbb;
}

.messages {
border-left: 1px dashed gray;
padding-left: 1em;
padding-right: 1em;
}

.passed {
background-color: #cfc;
display: none;
}

.failed {
background-color: #fdd;
background-color: #fbb;
}

.skipped {
color: #777;
background-color: #eee;
display: none;
}


/*.resultMessage {*/
/*white-space: pre;*/
/*}*/
Expand All @@ -72,15 +135,32 @@ body .run_spec {
white-space: pre;
font-size: .8em;
margin-left: 10px;
height: 5em;
max-height: 5em;
overflow: auto;
border: 1px inset red;
padding: 1em;
background: #eef;
}

.finished-at {
padding-left: 1em;
font-size: .6em;
}

.show-passed .passed,
.show-skipped .skipped {
display: block;
}


#jasmine_content {
position:fixed;
right: 100%;
}

.runner {
border: 1px solid gray;
display: block;
margin: 5px 0;
padding: 2px 0 2px 10px;
}
19 changes: 18 additions & 1 deletion spec/suites/EnvSpec.js
View file
Expand Up @@ -57,6 +57,23 @@ describe("jasmine.Env", function() {
"revision": 8
});
});

describe("versionString", function() {
it("should return a stringified version number", function() {
jasmine.version_ = {
"major": 1,
"minor": 9,
"build": 7,
"revision": 8
};
expect(env.versionString()).toEqual("1.9.7 revision 8");
});

it("should return a nice string when version is unknown", function() {
jasmine.version_ = null;
expect(env.versionString()).toEqual("version unknown");
});
});
});

it("should allow reporters to be registered", function() {
Expand Down Expand Up @@ -138,4 +155,4 @@ describe("jasmine.Env", function() {
});
});
});
});
});

0 comments on commit 2212d75

Please sign in to comment.