diff --git a/doc/files.html b/doc/files.html index cdf93ee..e414f84 100644 --- a/doc/files.html +++ b/doc/files.html @@ -258,7 +258,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 18:56:18 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
\ No newline at end of file diff --git a/doc/index.html b/doc/index.html index 8c42d87..5f76f46 100644 --- a/doc/index.html +++ b/doc/index.html @@ -300,7 +300,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 18:56:18 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
\ No newline at end of file diff --git a/doc/symbols/_global_.html b/doc/symbols/_global_.html index be01800..804f25e 100644 --- a/doc/symbols/_global_.html +++ b/doc/symbols/_global_.html @@ -908,7 +908,7 @@ A convenience method that allows existing specs to be disabled temporarily durin
- Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 18:56:17 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.Block.html b/doc/symbols/jasmine.Block.html index 1288870..7bbb432 100644 --- a/doc/symbols/jasmine.Block.html +++ b/doc/symbols/jasmine.Block.html @@ -339,7 +339,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 18:56:17 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.Env.html b/doc/symbols/jasmine.Env.html index 5007a98..2a4c65a 100644 --- a/doc/symbols/jasmine.Env.html +++ b/doc/symbols/jasmine.Env.html @@ -507,7 +507,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 18:56:17 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.JsApiReporter.html b/doc/symbols/jasmine.JsApiReporter.html index 88f6187..b377e65 100644 --- a/doc/symbols/jasmine.JsApiReporter.html +++ b/doc/symbols/jasmine.JsApiReporter.html @@ -316,7 +316,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 18:56:17 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.MultiReporter.html b/doc/symbols/jasmine.MultiReporter.html index 8a223a4..3bd08e5 100644 --- a/doc/symbols/jasmine.MultiReporter.html +++ b/doc/symbols/jasmine.MultiReporter.html @@ -316,7 +316,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 18:56:17 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.NestedResults.html b/doc/symbols/jasmine.NestedResults.html index 33a4c8f..24f5547 100644 --- a/doc/symbols/jasmine.NestedResults.html +++ b/doc/symbols/jasmine.NestedResults.html @@ -700,7 +700,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 18:56:17 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.Reporter.html b/doc/symbols/jasmine.Reporter.html index 9934204..ea615fb 100644 --- a/doc/symbols/jasmine.Reporter.html +++ b/doc/symbols/jasmine.Reporter.html @@ -316,7 +316,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 18:56:17 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.Runner.html b/doc/symbols/jasmine.Runner.html index 8809683..35adb7a 100644 --- a/doc/symbols/jasmine.Runner.html +++ b/doc/symbols/jasmine.Runner.html @@ -418,7 +418,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 18:56:17 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.Spec.html b/doc/symbols/jasmine.Spec.html index 3175a60..1d0f210 100644 --- a/doc/symbols/jasmine.Spec.html +++ b/doc/symbols/jasmine.Spec.html @@ -396,7 +396,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 18:56:17 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.Spy.html b/doc/symbols/jasmine.Spy.html index 1fd20af..4cc7f9b 100644 --- a/doc/symbols/jasmine.Spy.html +++ b/doc/symbols/jasmine.Spy.html @@ -845,7 +845,7 @@ expect(foo.bar.callCount).toEqual(0);
- Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 18:56:17 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.Suite.html b/doc/symbols/jasmine.Suite.html index 5d6f34a..dcb7998 100644 --- a/doc/symbols/jasmine.Suite.html +++ b/doc/symbols/jasmine.Suite.html @@ -436,7 +436,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 18:56:17 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.html b/doc/symbols/jasmine.html index fb0a17c..262de77 100644 --- a/doc/symbols/jasmine.html +++ b/doc/symbols/jasmine.html @@ -728,7 +728,7 @@ Jasmine environment.
- Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 18:56:17 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
diff --git a/doc/symbols/jasmine.util.html b/doc/symbols/jasmine.util.html index e1b25d6..fb69424 100644 --- a/doc/symbols/jasmine.util.html +++ b/doc/symbols/jasmine.util.html @@ -316,7 +316,7 @@ ul.inheritsList
- Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 18:56:18 GMT-0700 (PDT) + Documentation generated by JsDoc Toolkit 2.1.0 on Thu Oct 15 2009 20:00:21 GMT-0700 (PDT)
diff --git a/doc/symbols/src/lib_TrivialReporter.js.html b/doc/symbols/src/lib_TrivialReporter.js.html index a3f7524..4f23e2c 100644 --- a/doc/symbols/src/lib_TrivialReporter.js.html +++ b/doc/symbols/src/lib_TrivialReporter.js.html @@ -26,115 +26,119 @@ 19 for (var attr in attrs) { 20 if (attr == 'className') { 21 el.setAttribute('class', attrs[attr]); - 22 } else { - 23 el[attr] = attrs[attr]; - 24 } - 25 } - 26 - 27 return el; - 28 }; - 29 - 30 jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) { - 31 var suites = runner.suites(); - 32 - 33 this.runnerDiv = this.createDom('div', { className: 'runner running' }, - 34 this.createDom('a', { className: 'runSpec', href: '?' }, "run all"), - 35 this.runnerMessageSpan = this.createDom('span', {}, "Running...")); - 36 this.document.body.appendChild(this.runnerDiv); - 37 - 38 for (var i = 0; i < suites.length; i++) { - 39 var suite = suites[i]; - 40 var suiteDiv = this.createDom('div', { className: 'suite' }, - 41 this.createDom('a', { className: 'runSpec', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, "run"), - 42 this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, suite.description)); - 43 this.suiteDivs[suite.getFullName()] = suiteDiv; - 44 var parentDiv = this.document.body; - 45 if (suite.parentSuite) { - 46 parentDiv = this.suiteDivs[suite.parentSuite.getFullName()]; - 47 } - 48 parentDiv.appendChild(suiteDiv); - 49 } - 50 - 51 this.startedAt = new Date(); - 52 }; - 53 - 54 jasmine.TrivialReporter.prototype.reportRunnerResults = function(runner) { - 55 var results = runner.results(); - 56 var className = (results.failedCount > 0) ? "runner failed" : "runner passed"; - 57 this.runnerDiv.setAttribute("class", className); - 58 var specs = runner.specs(); - 59 var specCount = 0; - 60 for (var i = 0; i < specs.length; i++) { - 61 if (this.specFilter(specs[i])) { - 62 specCount++; - 63 } - 64 } - 65 var message = "" + specCount + " spec" + (specCount == 1 ? "" : "s" ) + ", " + results.failedCount + " failure" + ((results.failedCount == 1) ? "" : "s"); - 66 message += " in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s"; - 67 this.runnerMessageSpan.replaceChild(this.createDom('a', { className: 'description', href: '?'}, message), this.runnerMessageSpan.firstChild); - 68 }; - 69 - 70 jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) { - 71 var results = suite.results(); - 72 var status = results.passed() ? 'passed' : 'failed'; - 73 if (results.totalCount == 0) { // todo: change this to check results.skipped - 74 status = 'skipped'; - 75 } - 76 this.suiteDivs[suite.getFullName()].className += " " + status; - 77 }; - 78 - 79 jasmine.TrivialReporter.prototype.reportSpecResults = function(spec) { - 80 var results = spec.results(); - 81 var status = results.passed() ? 'passed' : 'failed'; - 82 if (results.skipped) { - 83 status = 'skipped'; - 84 } - 85 var specDiv = this.createDom('div', { className: 'spec ' + status }, - 86 this.createDom('a', { className: 'runSpec', href: '?spec=' + encodeURIComponent(spec.getFullName()) }, "run"), - 87 this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(spec.getFullName()) }, spec.getFullName())); - 88 - 89 - 90 var resultItems = results.getItems(); - 91 for (var i = 0; i < resultItems.length; i++) { - 92 var result = resultItems[i]; - 93 if (result.passed && !result.passed()) { - 94 var resultMessageDiv = this.createDom('div', {className: 'resultMessage fail'}); - 95 resultMessageDiv.innerHTML = result.message; // todo: lame; mend - 96 specDiv.appendChild(resultMessageDiv); - 97 specDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack)); - 98 } - 99 } -100 -101 this.suiteDivs[spec.suite.getFullName()].appendChild(specDiv); -102 }; -103 -104 jasmine.TrivialReporter.prototype.log = function() { -105 console.log.apply(console, arguments); + 22 //twice for ie + 23 el.setAttribute('className', attrs[attr]); + 24 } else { + 25 el[attr] = attrs[attr]; + 26 } + 27 } + 28 + 29 return el; + 30 }; + 31 + 32 jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) { + 33 var suites = runner.suites(); + 34 + 35 this.runnerDiv = this.createDom('div', { className: 'runner running' }, + 36 this.createDom('a', { className: 'run_spec', href: '?' }, "run all"), + 37 this.runnerMessageSpan = this.createDom('span', {}, "Running...")); + 38 this.document.body.appendChild(this.runnerDiv); + 39 + 40 for (var i = 0; i < suites.length; i++) { + 41 var suite = suites[i]; + 42 var suiteDiv = this.createDom('div', { className: 'suite' }, + 43 this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, "run"), + 44 this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, suite.description)); + 45 this.suiteDivs[suite.getFullName()] = suiteDiv; + 46 var parentDiv = this.document.body; + 47 if (suite.parentSuite) { + 48 parentDiv = this.suiteDivs[suite.parentSuite.getFullName()]; + 49 } + 50 parentDiv.appendChild(suiteDiv); + 51 } + 52 + 53 this.startedAt = new Date(); + 54 }; + 55 + 56 jasmine.TrivialReporter.prototype.reportRunnerResults = function(runner) { + 57 var results = runner.results(); + 58 var className = (results.failedCount > 0) ? "runner failed" : "runner passed"; + 59 this.runnerDiv.setAttribute("class", className); + 60 //do it twice for IE + 61 this.runnerDiv.setAttribute("className", className); + 62 var specs = runner.specs(); + 63 var specCount = 0; + 64 for (var i = 0; i < specs.length; i++) { + 65 if (this.specFilter(specs[i])) { + 66 specCount++; + 67 } + 68 } + 69 var message = "" + specCount + " spec" + (specCount == 1 ? "" : "s" ) + ", " + results.failedCount + " failure" + ((results.failedCount == 1) ? "" : "s"); + 70 message += " in " + ((new Date().getTime() - this.startedAt.getTime()) / 1000) + "s"; + 71 this.runnerMessageSpan.replaceChild(this.createDom('a', { className: 'description', href: '?'}, message), this.runnerMessageSpan.firstChild); + 72 }; + 73 + 74 jasmine.TrivialReporter.prototype.reportSuiteResults = function(suite) { + 75 var results = suite.results(); + 76 var status = results.passed() ? 'passed' : 'failed'; + 77 if (results.totalCount == 0) { // todo: change this to check results.skipped + 78 status = 'skipped'; + 79 } + 80 this.suiteDivs[suite.getFullName()].className += " " + status; + 81 }; + 82 + 83 jasmine.TrivialReporter.prototype.reportSpecResults = function(spec) { + 84 var results = spec.results(); + 85 var status = results.passed() ? 'passed' : 'failed'; + 86 if (results.skipped) { + 87 status = 'skipped'; + 88 } + 89 var specDiv = this.createDom('div', { className: 'spec ' + status }, + 90 this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(spec.getFullName()) }, "run"), + 91 this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(spec.getFullName()) }, spec.getFullName())); + 92 + 93 + 94 var resultItems = results.getItems(); + 95 for (var i = 0; i < resultItems.length; i++) { + 96 var result = resultItems[i]; + 97 if (result.passed && !result.passed()) { + 98 var resultMessageDiv = this.createDom('div', {className: 'resultMessage fail'}); + 99 resultMessageDiv.innerHTML = result.message; // todo: lame; mend +100 specDiv.appendChild(resultMessageDiv); +101 specDiv.appendChild(this.createDom('div', {className: 'stackTrace'}, result.trace.stack)); +102 } +103 } +104 +105 this.suiteDivs[spec.suite.getFullName()].appendChild(specDiv); 106 }; 107 -108 jasmine.TrivialReporter.prototype.getLocation = function() { -109 return this.document.location; +108 jasmine.TrivialReporter.prototype.log = function() { +109 console.log.apply(console, arguments); 110 }; 111 -112 jasmine.TrivialReporter.prototype.specFilter = function(spec) { -113 var paramMap = {}; -114 var params = this.getLocation().search.substring(1).split('&'); -115 for (var i = 0; i < params.length; i++) { -116 var p = params[i].split('='); -117 paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]); -118 } -119 -120 if (!paramMap["spec"]) return true; -121 return spec.getFullName().indexOf(paramMap["spec"]) == 0; -122 }; +112 jasmine.TrivialReporter.prototype.getLocation = function() { +113 return this.document.location; +114 }; +115 +116 jasmine.TrivialReporter.prototype.specFilter = function(spec) { +117 var paramMap = {}; +118 var params = this.getLocation().search.substring(1).split('&'); +119 for (var i = 0; i < params.length; i++) { +120 var p = params[i].split('='); +121 paramMap[decodeURIComponent(p[0])] = decodeURIComponent(p[1]); +122 } 123 -124 //protect against console.log incidents -125 if (!("console" in window) || !("firebug" in console)) { -126 var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml", "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"]; -127 window.console = {}; -128 for (var i = 0, len = names.length; i < len; ++i) { -129 window.console[names[i]] = function() { -130 }; -131 } -132 } -133 \ No newline at end of file +124 if (!paramMap["spec"]) return true; +125 return spec.getFullName().indexOf(paramMap["spec"]) == 0; +126 }; +127 +128 //protect against console.log incidents +129 if (!("console" in window) || !("firebug" in console)) { +130 var names = ["log", "debug", "info", "warn", "error", "assert", "dir", "dirxml", "group", "groupEnd", "time", "timeEnd", "count", "trace", "profile", "profileEnd"]; +131 window.console = {}; +132 for (var i = 0, len = names.length; i < len; ++i) { +133 window.console[names[i]] = function() { +134 }; +135 } +136 } +137 \ No newline at end of file diff --git a/doc/symbols/src/lib_jasmine-0.9.0.js.html b/doc/symbols/src/lib_jasmine-0.9.0.js.html index cedc063..113d176 100644 --- a/doc/symbols/src/lib_jasmine-0.9.0.js.html +++ b/doc/symbols/src/lib_jasmine-0.9.0.js.html @@ -537,7 +537,7 @@ 530 "major": 0, 531 "minor": 9, 532 "build": 0, -533 "revision": 1255657888 +533 "revision": 1255658178 534 }; 535 /** 536 * @namespace diff --git a/lib/TrivialReporter.js b/lib/TrivialReporter.js index 81e3e79..dbc1795 100644 --- a/lib/TrivialReporter.js +++ b/lib/TrivialReporter.js @@ -19,6 +19,8 @@ jasmine.TrivialReporter.prototype.createDom = function(type, attrs, childrenVarA for (var attr in attrs) { if (attr == 'className') { el.setAttribute('class', attrs[attr]); + //twice for ie + el.setAttribute('className', attrs[attr]); } else { el[attr] = attrs[attr]; } @@ -31,14 +33,14 @@ jasmine.TrivialReporter.prototype.reportRunnerStarting = function(runner) { var suites = runner.suites(); this.runnerDiv = this.createDom('div', { className: 'runner running' }, - this.createDom('a', { className: 'runSpec', href: '?' }, "run all"), + 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: 'runSpec', href: '?spec=' + encodeURIComponent(suite.getFullName()) }, "run"), + 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; @@ -55,6 +57,8 @@ jasmine.TrivialReporter.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++) { @@ -83,7 +87,7 @@ jasmine.TrivialReporter.prototype.reportSpecResults = function(spec) { status = 'skipped'; } var specDiv = this.createDom('div', { className: 'spec ' + status }, - this.createDom('a', { className: 'runSpec', href: '?spec=' + encodeURIComponent(spec.getFullName()) }, "run"), + this.createDom('a', { className: 'run_spec', href: '?spec=' + encodeURIComponent(spec.getFullName()) }, "run"), this.createDom('a', { className: 'description', href: '?spec=' + encodeURIComponent(spec.getFullName()) }, spec.getFullName())); diff --git a/lib/jasmine-0.9.0.js b/lib/jasmine-0.9.0.js index e957838..e895a25 100644 --- a/lib/jasmine-0.9.0.js +++ b/lib/jasmine-0.9.0.js @@ -530,7 +530,7 @@ jasmine.version_= { "major": 0, "minor": 9, "build": 0, - "revision": 1255658178 + "revision": 1255662021 }; /** * @namespace diff --git a/lib/jasmine.css b/lib/jasmine.css index 71a8c96..7d8b3e2 100644 --- a/lib/jasmine.css +++ b/lib/jasmine.css @@ -1,39 +1,27 @@ body { - font: 14px "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif; + font-family: "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif; } -h1 { - padding-top: 20px; - font-weight: bold; - font: 24px; /* "Helvetica Neue Light", "Lucida Grande", "Calibri", "Arial", sans-serif; */ -} -p { - margin-top: 5px; - padding-left: 20px; -} - -.fail { - background: url( ../images/fail-16.png ) no-repeat; - padding-left: 20px; - color: red; -} - -.failInSummary { - color: red; -} - -.runner { - border: 1px outset gray; - margin: 5px; - padding-left: 1em; - padding-right: 1em; +body .run_spec { + float:right; } .runner.running { background-color: yellow; } + + +.runner { + border: 1px solid gray; + margin: 5px; + padding-left: 1em; + padding-right: 1em; +} + + + .suite { border: 1px outset gray; margin: 5px; @@ -54,11 +42,11 @@ p { } .passed { - background-color: lightgreen; + background-color: #cfc; } .failed { - background-color: pink; + background-color: #fdd; } .skipped { @@ -66,9 +54,9 @@ p { background-color: #eee; } -.resultMessage { - white-space: pre; -} +/*.resultMessage {*/ + /*white-space: pre;*/ +/*}*/ .stackTrace { white-space: pre; @@ -81,10 +69,6 @@ p { background: #eef; } -.runSpec { - margin-left: 5px; - float: right; -} #jasmine_content { position:fixed;