mirror of
https://github.com/Hopiu/angular.js.git
synced 2026-05-09 07:14:44 +00:00
add beforeEach and afterEach to scenario DSL
This commit is contained in:
parent
f6a405c283
commit
85fac4d78c
2 changed files with 52 additions and 3 deletions
|
|
@ -8,23 +8,34 @@ angular.scenario.Runner = function(scope, jQuery){
|
||||||
|
|
||||||
var specs = this.specs = {};
|
var specs = this.specs = {};
|
||||||
var path = [];
|
var path = [];
|
||||||
this.scope.describe = function describe(name, body){
|
this.scope.describe = function(name, body){
|
||||||
path.push(name);
|
path.push(name);
|
||||||
body();
|
body();
|
||||||
path.pop();
|
path.pop();
|
||||||
};
|
};
|
||||||
this.scope.it = function it(name, body) {
|
var beforeEach = noop;
|
||||||
|
var afterEach = noop;
|
||||||
|
this.scope.beforeEach = function(body) {
|
||||||
|
beforeEach = body;
|
||||||
|
};
|
||||||
|
this.scope.afterEach = function(body) {
|
||||||
|
afterEach = body;
|
||||||
|
};
|
||||||
|
this.scope.it = function(name, body) {
|
||||||
var specName = path.join(' ') + ': it ' + name;
|
var specName = path.join(' ') + ': it ' + name;
|
||||||
self.currentSpec = specs[specName] = {
|
self.currentSpec = specs[specName] = {
|
||||||
name: specName,
|
name: specName,
|
||||||
steps:[]
|
steps:[]
|
||||||
};
|
};
|
||||||
try {
|
try {
|
||||||
|
beforeEach();
|
||||||
body();
|
body();
|
||||||
} catch(err) {
|
} catch(err) {
|
||||||
self.addStep(err.message || 'ERROR', function(){
|
self.addStep(err.message || 'ERROR', function(){
|
||||||
throw err;
|
throw err;
|
||||||
});
|
});
|
||||||
|
} finally {
|
||||||
|
afterEach();
|
||||||
}
|
}
|
||||||
self.currentSpec = null;
|
self.currentSpec = null;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,8 @@ describe('Runner', function(){
|
||||||
body = _jQuery('<div></div>');
|
body = _jQuery('<div></div>');
|
||||||
runner = new angular.scenario.Runner(scenario, _jQuery);
|
runner = new angular.scenario.Runner(scenario, _jQuery);
|
||||||
Describe = scenario.describe;
|
Describe = scenario.describe;
|
||||||
|
BeforeEach = scenario.beforeEach;
|
||||||
|
AfterEach = scenario.afterEach;
|
||||||
It = scenario.it;
|
It = scenario.it;
|
||||||
$scenario = scenario.$scenario;
|
$scenario = scenario.$scenario;
|
||||||
});
|
});
|
||||||
|
|
@ -36,7 +38,10 @@ describe('Runner', function(){
|
||||||
expect(spec.name).toEqual('describe name: it should text');
|
expect(spec.name).toEqual('describe name: it should text');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should complain on duplicate it', angular.noop);
|
it('should complain on duplicate it', function() {
|
||||||
|
// WRITE ME!!!!
|
||||||
|
});
|
||||||
|
|
||||||
it('should create a failing step if there is a javascript error', function(){
|
it('should create a failing step if there is a javascript error', function(){
|
||||||
var spec;
|
var spec;
|
||||||
Describe('D1', function(){
|
Describe('D1', function(){
|
||||||
|
|
@ -55,6 +60,39 @@ describe('Runner', function(){
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('beforeEach', function() {
|
||||||
|
it('should execute beforeEach before every it', function() {
|
||||||
|
Describe('describe name', function(){
|
||||||
|
BeforeEach(logger('before;'));
|
||||||
|
It('should text', logger('body;'));
|
||||||
|
It('should text2', logger('body2;'));
|
||||||
|
});
|
||||||
|
expect(log).toEqual('before;body;before;body2;');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
describe('afterEach', function() {
|
||||||
|
it('should execute afterEach after every it', function() {
|
||||||
|
Describe('describe name', function(){
|
||||||
|
AfterEach(logger('after;'));
|
||||||
|
It('should text', logger('body;'));
|
||||||
|
It('should text2', logger('body2;'));
|
||||||
|
});
|
||||||
|
expect(log).toEqual('body;after;body2;after;');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should always execute afterEach after every it', function() {
|
||||||
|
Describe('describe name', function(){
|
||||||
|
AfterEach(logger('after;'));
|
||||||
|
It('should text', function() {
|
||||||
|
log = 'body;';
|
||||||
|
throw "MyError";
|
||||||
|
});
|
||||||
|
It('should text2', logger('body2;'));
|
||||||
|
});
|
||||||
|
expect(log).toEqual('body;after;body2;after;');
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('steps building', function(){
|
describe('steps building', function(){
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue