diff options
| author | Elliott Sprehn | 2010-10-24 14:14:45 -0700 |
|---|---|---|
| committer | Igor Minar | 2010-10-26 15:17:57 -0700 |
| commit | 40d7e66f408eaaa66efd8d7934ab2eb3324236a1 (patch) | |
| tree | daf88d70df9037416598307784eb83df93df4fed /src/scenario/SpecRunner.js | |
| parent | 1d52349440d40de527b5d7f3849070f525c1b79b (diff) | |
| download | angular.js-40d7e66f408eaaa66efd8d7934ab2eb3324236a1.tar.bz2 | |
Lots of bug fixes in the scenario runner and a bunch of new features.
- By default the runner now creates multiple output formats as it runs. Nodes are created in the DOM with ids: json, xml, and html.
ex. $('#json').html() => json output of the runner
ex. $('#xml').html() => json output of the runner
$result is also an object tree result.
The permitted formats are html,json,xml,object.
If you don't want certain formats you can select specific ones with the new ng:scenario-output attribute on the script tag.
<script src="angular-scenario.js" ng:scenario-output="xml,json">
- Added element(...).count() that returns the number of matching elements for the selector.
- repeater(...).count() now returns 0 if no elements matched which can be used to check if a repeater is empty.
- Added toBe() matcher that does strict equality with ===
- Implement iit and ddescribe. If iit() is used instead of it() then only that test will run. If ddescribe() is used instead of describe() them only it() statements inside of it will run. Several iit/ddescribe() blocks can be used to run isolated tests.
- Implement new event based model for SpecRunner. You can now listen for events in the runner. This is useful for writing your own UI or connecting a remote process (ex. WebDriver). Event callbacks execute on the Runner instance.
Events, if fired, will always be in the below order. All events always happen
except for Failure and Error events which only happen in error conditions.
Events:
RunnerBegin
SpecBegin(spec)
StepBegin(spec, step)
StepError(spec, step, error)
StepFailure(spec, step, error)
StepEnd(spec, step)
SpecError(spec, step, error)
SpecEnd(spec)
RunnerEnd
- Only allow the browser to repaint every 10 steps. Cuts 700ms off Firefox in benchmark, 200ms off Chrome.
- Bug Fix: Manually navigate anchors on click since trigger wont work in Firefox.
Diffstat (limited to 'src/scenario/SpecRunner.js')
| -rw-r--r-- | src/scenario/SpecRunner.js | 57 |
1 files changed, 35 insertions, 22 deletions
diff --git a/src/scenario/SpecRunner.js b/src/scenario/SpecRunner.js index 98ce4b53..fb7d5c02 100644 --- a/src/scenario/SpecRunner.js +++ b/src/scenario/SpecRunner.js @@ -15,14 +15,16 @@ angular.scenario.SpecRunner = function() { * Executes a spec which is an it block with associated before/after functions * based on the describe nesting. * - * @param {Object} An angular.scenario.UI implementation - * @param {Object} A spec object - * @param {Object} An angular.scenario.Application instance + * @param {Object} spec A spec object + * @param {Object} specDone An angular.scenario.Application instance * @param {Function} Callback function that is called when the spec finshes. */ -angular.scenario.SpecRunner.prototype.run = function(ui, spec, specDone) { +angular.scenario.SpecRunner.prototype.run = function(spec, specDone) { var self = this; - var specUI = ui.addSpec(spec); + var count = 0; + this.spec = spec; + + this.emit('SpecBegin', spec); try { spec.before.call(this); @@ -30,7 +32,8 @@ angular.scenario.SpecRunner.prototype.run = function(ui, spec, specDone) { this.afterIndex = this.futures.length; spec.after.call(this); } catch (e) { - specUI.error(e); + this.emit('SpecError', spec, e); + this.emit('SpecEnd', spec); specDone(); return; } @@ -42,32 +45,40 @@ angular.scenario.SpecRunner.prototype.run = function(ui, spec, specDone) { self.error = true; done(null, self.afterIndex); }; - - var spec = this; + asyncForEach( this.futures, function(future, futureDone) { - var stepUI = specUI.addStep(future.name, future.line); + self.step = future; + self.emit('StepBegin', spec, future); try { future.execute(function(error) { - stepUI.finish(error); if (error) { + self.emit('StepFailure', spec, future, error); + self.emit('StepEnd', spec, future); return handleError(error, futureDone); } - spec.$window.setTimeout( function() { futureDone(); }, 0); + self.emit('StepEnd', spec, future); + if ((count++) % 10 === 0) { + self.$window.setTimeout(function() { futureDone(); }, 0); + } else { + futureDone(); + } }); } catch (e) { - stepUI.error(e); + self.emit('StepError', spec, future, e); + self.emit('StepEnd', spec, future); handleError(e, futureDone); } }, function(e) { if (e) { - specUI.error(e); - } else { - specUI.finish(); + self.emit('SpecError', spec, e); } - specDone(); + self.emit('SpecEnd', spec); + // Call done in a timeout so exceptions don't recursively + // call this function + self.$window.setTimeout(function() { specDone(); }, 0); } ); }; @@ -77,9 +88,9 @@ angular.scenario.SpecRunner.prototype.run = function(ui, spec, specDone) { * * Note: Do not pass line manually. It happens automatically. * - * @param {String} Name of the future - * @param {Function} Behavior of the future - * @param {Function} fn() that returns file/line number + * @param {string} name Name of the future + * @param {Function} behavior Behavior of the future + * @param {Function} line fn() that returns file/line number */ angular.scenario.SpecRunner.prototype.addFuture = function(name, behavior, line) { var future = new angular.scenario.Future(name, angular.bind(this, behavior), line); @@ -92,14 +103,16 @@ angular.scenario.SpecRunner.prototype.addFuture = function(name, behavior, line) * * Note: Do not pass line manually. It happens automatically. * - * @param {String} Name of the future - * @param {Function} Behavior of the future - * @param {Function} fn() that returns file/line number + * @param {string} name Name of the future + * @param {Function} behavior Behavior of the future + * @param {Function} line fn() that returns file/line number */ angular.scenario.SpecRunner.prototype.addFutureAction = function(name, behavior, line) { var self = this; return this.addFuture(name, function(done) { this.application.executeAction(function($window, $document) { + + //TODO(esprehn): Refactor this so it doesn't need to be in here. $document.elements = function(selector) { var args = Array.prototype.slice.call(arguments, 1); if (self.selector) { |
