diff --git a/README.markdown b/README.markdown index 1d479318..3d39065b 100644 --- a/README.markdown +++ b/README.markdown @@ -196,12 +196,15 @@ Your contributions are welcome. Please submit tests with your pull request. * [Rajan Agaskar](rajan@pivotallabs.com), Pivotal Labs ## Acknowledgments -A big shout out to the various JavaScript test framework authors, especially TJ for [JSpec](http://github.com/visionmedia/jspec/tree/master) - we played with it a bit before deciding that we really needed to roll our own. +* A big shout out to the various JavaScript test framework authors, especially TJ for [JSpec](http://github.com/visionmedia/jspec/tree/master) - we played with it a bit before deciding that we really needed to roll our own. +* Thanks to Pivot [Jessica Miller](http://www.jessicamillerworks.com/) for our fancy pass/fail/pending icons ## TODO List In no particular order: -* add a description to runs() - - +* Maybe add a description to `runs()` that gets incorporated in the message somehow? +* Empty specs - calls to `it()` without a function - should be considered Pending specs and have their numbers rolled up for reporting. +* Exception catching doesn't work after a call to `waits()` +* Add it `xit()` convention for disabled specs +* Pending & Disabled counts should be included in results diff --git a/images/fail-16.png b/images/fail-16.png old mode 100644 new mode 100755 index 293ee565..6ebbf329 Binary files a/images/fail-16.png and b/images/fail-16.png differ diff --git a/images/fail.png b/images/fail.png old mode 100644 new mode 100755 index 6724ca69..edd92046 Binary files a/images/fail.png and b/images/fail.png differ diff --git a/images/pending-16.png b/images/pending-16.png new file mode 100755 index 00000000..7fcd7429 Binary files /dev/null and b/images/pending-16.png differ diff --git a/images/pending.png b/images/pending.png new file mode 100755 index 00000000..666e31a2 Binary files /dev/null and b/images/pending.png differ diff --git a/images/question-bk.png b/images/question-bk.png new file mode 100755 index 00000000..7538ebd4 Binary files /dev/null and b/images/question-bk.png differ diff --git a/images/questionbk-16.png b/images/questionbk-16.png new file mode 100755 index 00000000..a20d316e Binary files /dev/null and b/images/questionbk-16.png differ diff --git a/jasmine.iws b/jasmine.iws index 30aa88a8..dc05fff1 100644 --- a/jasmine.iws +++ b/jasmine.iws @@ -101,7 +101,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -305,12 +305,17 @@ - - - - - - - - - - - - - - - - - - - - - - + - - - - - @@ -557,14 +533,38 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + - +