diff --git a/README b/README
deleted file mode 100644
index f81ab5b..0000000
--- a/README
+++ /dev/null
@@ -1,20 +0,0 @@
-Jasmine
-=======
-**yet another JavaScript testing framework**
-
-The Problem
------------
-
-There are some situations when you want to test-drive JavaScript, but you don't want to be bothered with or even have an explicit document. You have no DOM to work with and so don't have HTML elements on which to hang events handlers. You may need to make asynchronous calls (say, to an AJAX API) and cannot mock/stub them.
-
-But you still need to write tests.
-
-What's an Agile Engineer to do?
-
-The Solution
-------------
-
-Enter Jasmine.
-
-Jasmine is yet another JavaScript testing framework. It's *heavily* influenced by [RSpec]() & [JSpec](http://github.com/visionmedia/jspec/tree/master),
-
diff --git a/README.markdown b/README.markdown
index b5ecaa3..29467fb 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,11 +1,11 @@
Jasmine
=======
-**yet another JavaScript testing framework**
+**YET ANOTHER JavaScript testing framework**
-Why another frickin' JS tdd/bdd framework?
+Why Another Frickin' JS TDD/BDD Framework?
-----------
-There are some situations when you want to test-drive JavaScript, but you don't want to be bothered with or even have an explicit document. You have no DOM to work with and so don't have HTML elements on which to hang events handlers. You may need to make asynchronous calls (say, to an AJAX API) and cannot mock/stub them.
+There are some situations when you want to test-drive JavaScript, but you don't want to be bothered with or even have an explicit document. You have no DOM to work with and thus lack HTML elements on which to hang event handlers. You may need to make asynchronous calls (say, to an AJAX API) and cannot mock/stub them.
But you still need to write tests.
@@ -14,56 +14,173 @@ What's an Agile Engineer to do?
Enter Jasmine
------------
-Jasmine is yet another JavaScript testing framework. It's *heavily* influenced by JSSpec, ScrewUnit & [JSpec](http://github.com/visionmedia/jspec/tree/master), which are all influenced by RSpec. But each of those was lacking in some way: JSSpec & ScrewUnit required a DOM. JSpec's DOM-less assumption was a great start, but it needed asynchronous support.
+Jasmine is yet another JavaScript testing framework. It's *heavily* influenced by JSSpec, ScrewUnit & [JSpec](http://github.com/visionmedia/jspec/tree/master), which are all influenced by RSpec. But each of those was lacking in some way: JSSpec & ScrewUnit require a DOM. JSpec's DOM-less assumption was a great start, but it needed asynchronous support.
So we started over. And TDD'd a whole new framework. Enjoy.
How To
------
-### Runner
-
-Jasmine()
-
-You don't need a DOM, but you do need a page on which to load & execute your JS.
-
-### Suites
-
-Group your specs via describe
+There is a nice example of how to use Jasmine in the /example directory. But here's more information.
### Specs
-call it() and provide a desc & a function
+Each spec is, naturally, a JavaScript function. You tell Jasmine about this spec with a call to `it()` with a name and the function. The string is a description that will be helpful to you when reading a report.
-call runs
+Your spec needs to call `runs()` with another function that is the actual spec. More on why in a moment. Here's an example:
-alias of runs to then
+ it('should be a test', function () {
+ runs(function () {
+ var foo = 0
+ foo++;
+ });
+ });
-#### Asynchronous support
+### Expectations
-call waits
+Within your spec you will want/need to make expectations. These are made like this:
-### Custom Matchers
+ it('should be a test', function () {
+ runs(function () {
+ var foo = 0
+ foo++;
+
+ this.expects_that(foo).should_equal(1);
+ });
+ });
-use Matchers.method('name', function ()). Write TESTS!
+Results of the expectations are logged for later for reporting.
+
+### Multiple Calls to `runs()` & Scope in Your Spec
+
+Your spec can call `runs()` multiple times if you need to break your spec up for any reason. Say, for async support (see next section). To allow you to share variables across your `runs()` functions, `this` is set to the spec itself. For example:
+
+ it('should be a test', function () {
+ runs(function () {
+ this.foo = 0
+ this.foo++;
+
+ this.expects_that(this.foo).should_equal(1);
+ });
+
+ runs(function () {
+ this.foo++;
+
+ this.expects_that(this.foo).should_equal(2);
+ })
+ });
+
+Functions defined with `runs()` are called in the order in which they are defined.
+
+### Asynchronous Specs
+
+You may be asking yourself, "Self, why would I ever need to break up my tests into pieces like this?" The answer is when dealing with asynchronous function calls.
+
+Say you need to make a call that is asynchronous - an AJAX API, or some other JavaScript library. That is, the call returns immediately, yet you want to make expectations 'at some point in the future' after some magic happens in the background.
+
+Jasmine allows you to do this by chaining calls to `runs()` with calls to `waits()`. You supply a time to wait before the next `runs()` function is executed. Such as:
+
+ it('should be a test', function () {
+ runs(function () {
+ this.foo = 0;
+ var that = this;
+ setTimeout(function () {}
+ that.foo++;
+ }, 250);
+ });
+
+ runs(function () {
+ this.expects_that(this.foo).should_equal(0);
+ });
+
+ waits(500);
+
+ runs(function () {
+ this.expects_that(this.foo).should_equal(1);
+ });
+ });
+
+What's happening here?
+
+* The first call to `runs()` sets call for 1/4 of a second in the future that increments `this.foo`.
+* The second `runs()` is executed immediately and then verifies that `this.foo` was indeed initialized to zero in the previous `runs()`.
+* Then we wait for half a second.
+* Then the last call to `runs()` expects that `this.foo` was incremented by the `setTimeout`.
+
+### Suites
+
+Specs are grouped in Suites. Suites are defined using the global `describe()` function:
+
+ describe('One suite', function () {
+ it('has a test', function () {
+ ...
+ });
+
+ it('has another test', function () {
+ ...
+ });
+ });
+
+The name is so that reporting is more descriptive.
+
+Suites are executed in the order in which `describe()` calls are made, usually in the order in which their script files are included.
+
+### Runner
+
+You don't need a DOM to run your tests, but you do need a page on which to load & execute your JS. Include the `jasmine.js` file in a script tag as well as the JS file with your specs. You can also use this page for reporting. More on that in a moment.
+
+// include example.html
### Reports
no reporting yet other than Runner.results, which is walkable
-### Tests
+#### JSON Reporter
+Coming soon.
-There is a VERY simple test reporter - it's not even a framework at all - that allows you to write tests.
+#### HTML Reporter
+Coming soon.
-Contributing
------------
+#### In-line HTML Reporter
+Coming soon.
-Contributions are welcome. Please submit tests with your pull request.
+### Custom Matchers
+
+Jasmine has a simple set of matchers - currently just should\_equal and should\_not\_equal. But Matchers can be extended simply to add new expectations. We use Douglas Crockford's Function.method() helper to define new Matchers.
+
+A Matcher has a method name, takes an expected value as it's only parameter, has access to the actual value in this, and then makes a call to this.report with true/false with a failure message. Here's the definition of should\_equal():
+
+ Matchers.method('should_equal', function (expected) {
+ return this.report((this.actual === expected),
+ 'Expected ' + expected + ' but got ' + this.actual + '.');
+ });
+
+Feel free to define your own matcher as needed in your code. If you'd like to add Matchers to Jasmine, please write tests.
+
+Contributing and Tests
+----------------------
+
+Sometimes it's hard to test a framework with the framework itself. Either the framework isn't mature enough or it just hurts your head. Jasmine is affected by both.
+
+So we made a little bootstrappy test reporter that lets us test Jasmine's pieces in isolation. See test/bootstrap.js. Feel free to use the bootstrap test suite to test your custom Matchers or extensions/changes to Jasmine.
+
+Your contributions are welcome. Please submit tests with your pull request.
+
+## Maintainers
+
+* [Davis W. Frank](dwfrank@pivotallabs.com), Pivotal Labs
+* [Rajan Akasgar](rajan@pivotallabs.com), Pivotal Labs
+
+## TODO List
+
+In no particular order:
-### TODO
* protect the global-ness of some variables & functions
+* Suite beforeAll and afterAll functions
+* add a description to runs()
* suite.beforeAll and suite.afterAll
* JSON reporter
+* HTML reporter
* HTML reporter (callback driven)
diff --git a/test/spinner.gif b/images/spinner.gif
similarity index 100%
rename from test/spinner.gif
rename to images/spinner.gif
diff --git a/jasmine.iws b/jasmine.iws
index d931cac..7f2f7c0 100644
--- a/jasmine.iws
+++ b/jasmine.iws
@@ -80,7 +80,7 @@
-
+
@@ -89,10 +89,10 @@
-
+
-
+
@@ -101,16 +101,16 @@
-
+
-
+
-
+
@@ -156,6 +156,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -189,52 +257,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -254,6 +276,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
@@ -305,16 +373,16 @@
-
+
-
+
-
-
+
+
@@ -391,9 +459,9 @@
-
+
-
+
@@ -401,64 +469,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
diff --git a/jspec b/jspec
deleted file mode 160000
index d1c67d1..0000000
--- a/jspec
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d1c67d1f23fc186b86d1a4472039e13a389c903b
diff --git a/lib/jasmine.js b/lib/jasmine.js
index 5e26b1c..564e275 100755
--- a/lib/jasmine.js
+++ b/lib/jasmine.js
@@ -18,6 +18,45 @@ if (typeof Function.method !== 'function') {
}
}
+/*
+ * object for holding results; allows for the results array to hold another nestedResults()
+ *
+ */
+
+var nestedResults = function() {
+ var that = {
+ totalCount: 0,
+ passedCount: 0,
+ failedCount: 0,
+ results: [],
+
+ rollupCounts: function (result) {
+ that.totalCount += result.totalCount;
+ that.passedCount += result.passedCount;
+ that.failedCount += result.failedCount;
+ },
+
+ push: function (result) {
+ if (result.results) {
+ that.rollupCounts(result);
+ } else {
+ that.totalCount++;
+ result.passed ? that.passedCount++ : that.failedCount++;
+ }
+ that.results.push(result);
+ }
+ }
+
+ return that;
+}
+
+
+/*
+ * base for Runner & Suite: allows for a queue of functions to get executed, allowing for
+ * any one action to complete, including asynchronous calls, before going to the next
+ * action.
+ *
+ **/
var actionCollection = function () {
var that = {
actions: [],
@@ -82,6 +121,7 @@ var actionCollection = function () {
/*
* Matchers methods; add your own with Matchers.method()
*/
+
Matchers = function (actual, results) {
this.actual = actual;
this.passing_message = 'Passed.'
@@ -101,7 +141,6 @@ Matchers.method('report', function (result, failing_message) {
Matchers.method('should_equal', function (expected) {
return this.report((this.actual === expected),
'Expected ' + expected + ' but got ' + this.actual + '.');
-
});
Matchers.method('should_not_equal', function (expected) {
@@ -134,34 +173,6 @@ var queuedFunction = function(func, timeout, spec) {
return that;
}
-var nestedResults = function() {
- var that = {
- totalCount: 0,
- passedCount: 0,
- failedCount: 0,
- results: [],
-
- push: function(result) {
- if (result.results) {
- that.totalCount += result.totalCount;
- that.passedCount += result.passedCount;
- that.failedCount += result.failedCount;
-
- } else {
- that.totalCount++;
- if (result.passed) {
- that.passedCount++;
- } else {
- that.failedCount++;
- }
- }
- that.results.push(result);
- }
- }
-
- return that;
-}
-
var it = function (description, func) {
var that = {
description: description,
@@ -211,7 +222,6 @@ var it = function (description, func) {
}
that.runs = addToQueue;
- that.then = addToQueue;
currentSuite.specs.push(that);
currentSpec = that;
@@ -228,8 +238,6 @@ var runs = function (func) {
currentSpec.runs(func);
}
-var then = runs;
-
var waits = function (timeout) {
currentSpec.waits(timeout);
}
@@ -249,7 +257,7 @@ var describe = function (description, spec_definitions) {
that.specs = that.actions;
currentSuite = that;
- currentRunner.suites.push(that);
+ Jasmine.suites.push(that);
spec_definitions();
@@ -258,19 +266,18 @@ var describe = function (description, spec_definitions) {
return that;
}
-var Jasmine = function () {
+var Runner = function () {
var that = actionCollection();
that.suites = that.actions;
that.results.description = 'All Jasmine Suites';
- currentRunner = that;
+ Jasmine = that;
return that;
}
-var currentRunner = Jasmine();
+var Jasmine = Runner();
var currentSuite = describe('default current suite', function() {});
-
var currentSpec;
/*
diff --git a/test/bootstrap.html b/test/bootstrap.html
index 8e42156..5175aec 100755
--- a/test/bootstrap.html
+++ b/test/bootstrap.html
@@ -14,7 +14,7 @@
-
-
-
-
diff --git a/test/test.js b/test/test.js
deleted file mode 100755
index 82c71d7..0000000
--- a/test/test.js
+++ /dev/null
@@ -1,126 +0,0 @@
-// NOTE: we're using JSpec to test-drive Jasmine. Any syntax
-// similarities should be ignored. THIS FILE uses JSpec
-
-with(JSpec('Jasmine expectation results')) {
-
- it('should compare actual and expected values that are equal', function () {
- var jasmine_result = expects(true).should_equal(true);
-
- expects_that(jasmine_result).should_equal(true).and_finish();
- });
-
- it('should compare actual and expected values that are NOT equal', function () {
- var jasmine_result = expects(false).should_equal(true);
-
- expects_that(jasmine_result).should_equal(false).and_finish();
- });
-
- it('should be able to store the results of assertions', function () {
- Jasmine = jasmine_init(); // re-clears out Jasmine
-
- expects(true).should_equal(true);
- expects(false).should_equal(true);
-
- expects_that(Jasmine.results.length).should_equal(2);
- expects_that(Jasmine.results[0].passed).should_equal(true);
- expects_that(Jasmine.results[1].passed).should_equal(false).and_finish();
- });
-
- it('should store a message with a failed expectation', function () {
- Jasmine = jasmine_init(); // re-clears out Jasmine
-
- expects(false).should_equal(true);
-
- var expected_message = 'Expected true but got false.';
- expects_that(Jasmine.results[0].message).should_equal(expected_message).and_finish();
- });
-
- it('should store a default message with a passed expectation', function () {
- Jasmine = jasmine_init();
-
- expects(true).should_equal(true);
-
- var expected_message = 'Passed.';
- expects_that(Jasmine.results[0].message).should_equal(expected_message).and_finish();
- });
-
- it('should support should_not_equal() passing', function () {
- Jasmine = jasmine_init();
-
- expects(true).should_not_equal(false);
-
- var expected_message = 'Passed.';
- expects_that(Jasmine.results[0].message).should_equal(expected_message).and_finish();
- });
-
- it('should support should_not_equal() message', function () {
- Jasmine = jasmine_init();
-
- expects(true).should_not_equal(true);
-
- var expected_message = 'Expected true to not equal true, but it does.';
- expects_that(Jasmine.results[0].message).should_equal(expected_message).and_finish();
- });
-
-}
-
-with(JSpec('Jasmine specs')){
-
- it('can have a description', function () {
- Jasmine = jasmine_init();
-
- var a_spec = spec('new spec');
- expects_that(a_spec.description).should_equal('new spec').and_finish();
- });
-
- it('can execute some statements & expectations', function () {
- Jasmine = jasmine_init();
-
- var a_spec = spec('new spec', function () {
- var foo = 'bar';
- expects(foo).should_equal('bar');
- });
-
- a_spec.execute();
-
- expects_that(Jasmine.results.length).should_equal(1)
- expects_that(Jasmine.results[0].passed).should_equal(true).and_finish();
- });
-
- it('can have multiple assertions', function () {
- Jasmine = jasmine_init();
-
- var a_spec = spec('new spec', function () {
- var foo = 'bar';
- var baz = 'quux'
-
- expects(foo).should_equal('bar');
- expects(baz).should_equal('quux');
- });
-
- a_spec.execute();
-
- expects_that(Jasmine.results.length).should_equal(2).and_finish();
- });
-
-// it('can evaluate expectations after an asynchronous set of execution steps', function () {
-// });
-
-}
-
-// should be able to run multiple specs in a suite in order
-
-//with(JSpec('Test runner')) {
-//
-// it('should run a test and collect a result', function () {
-//
-//
-//
-//
-// });
-//
-// expects_that(actual).should_equal(expected)u;
-//
-//
-//
-//}
\ No newline at end of file