Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-10 07:44:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

renamed $pause to $sleep AND $wait to $pause

Browse source 
Closes #207
This commit is contained in:
Di Peng 2011-06-03 15:22:43 -07:00
parent 9250fce19c
commit 1eebb771e3
5 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/scenario/dsl.js
View file

@ -4,12 +4,12 @@
/** /**
* Usage: * Usage:
* wait() waits until you call resume() in the console * pause() pauses until you call resume() in the console
*/ */
angular.scenario.dsl('wait', function() { angular.scenario.dsl('pause', function() {
return function() { return function() {
return this.addFuture('waiting for you to resume', function(done) { return this.addFuture('pausing for you to resume', function(done) {
this.emit('InteractiveWait', this.spec, this.step); this.emit('InteractivePause', this.spec, this.step);
this.$window.resume = function() { done(); }; this.$window.resume = function() { done(); };
}); });
}; };
@ -17,11 +17,11 @@ angular.scenario.dsl('wait', function() {
/** /**
* Usage: * Usage:
* pause(seconds) pauses the test for specified number of seconds * sleep(seconds) pauses the test for specified number of seconds
*/ */
angular.scenario.dsl('pause', function() { angular.scenario.dsl('sleep', function() {
return function(time) { return function(time) {
return this.addFuture('pause for ' + time + ' seconds', function(done) { return this.addFuture('sleep for ' + time + ' seconds', function(done) {
this.$window.setTimeout(function() { done(null, time * 1000); }, time * 1000); this.$window.setTimeout(function() { done(null, time * 1000); }, time * 1000);
}); });
}; };

4
src/scenario/output/Html.js
View file

@ -22,10 +22,10 @@ angular.scenario.output('html', function(context, runner, model) {
'</div>' '</div>'
); );
runner.on('InteractiveWait', function(spec, step) { runner.on('InteractivePause', function(spec, step) {
var ui = lastStepUiMap[spec.id]; var ui = lastStepUiMap[spec.id];
ui.find('.test-title'). ui.find('.test-title').
html('waiting for you to <a href="javascript:resume()">resume</a>.'); html('paused... <a href="javascript:resume()">resume</a> when ready.');
}); });
runner.on('SpecBegin', function(spec) { runner.on('SpecBegin', function(spec) {

2
src/validators.js
View file

@ -387,7 +387,7 @@ extend(angularValidator, {
expect(textBox.attr('className')).not().toMatch(/ng-validation-error/); expect(textBox.attr('className')).not().toMatch(/ng-validation-error/);
input('text').enter('X'); input('text').enter('X');
expect(textBox.attr('className')).toMatch(/ng-input-indicator-wait/); expect(textBox.attr('className')).toMatch(/ng-input-indicator-wait/);
pause(.6); sleep(.6);
expect(textBox.attr('className')).not().toMatch(/ng-input-indicator-wait/); expect(textBox.attr('className')).not().toMatch(/ng-input-indicator-wait/);
expect(textBox.attr('className')).toMatch(/ng-validation-error/); expect(textBox.attr('className')).toMatch(/ng-validation-error/);
}); });

16
test/scenario/dslSpec.js
View file

@ -46,20 +46,20 @@ describe("angular.scenario.dsl", function() {
SpecRunner.prototype.addFutureAction; SpecRunner.prototype.addFutureAction;
}); });
describe('Wait', function() { describe('Pause', function() {
it('should wait until resume to complete', function() { it('should pause until resume to complete', function() {
expect($window.resume).toBeUndefined(); expect($window.resume).toBeUndefined();
$root.dsl.wait(); $root.dsl.pause();
expect(angular.isFunction($window.resume)).toBeTruthy(); expect(angular.isFunction($window.resume)).toBeTruthy();
expect($root.futureLog).toEqual([]); expect($root.futureLog).toEqual([]);
$window.resume(); $window.resume();
expect($root.futureLog). expect($root.futureLog).
toEqual(['waiting for you to resume']); toEqual(['pausing for you to resume']);
expect(eventLog).toContain('InteractiveWait'); expect(eventLog).toContain('InteractivePause');
}); });
}); });
describe('Pause', function() { describe('Sleep', function() {
beforeEach(function() { beforeEach(function() {
$root.$window.setTimeout = function(fn, value) { $root.$window.setTimeout = function(fn, value) {
$root.timerValue = value; $root.timerValue = value;
@ -67,8 +67,8 @@ describe("angular.scenario.dsl", function() {
}; };
}); });
it('should pause for specified seconds', function() { it('should sleep for specified seconds', function() {
$root.dsl.pause(10); $root.dsl.sleep(10);
expect($root.timerValue).toEqual(10000); expect($root.timerValue).toEqual(10000);
expect($root.futureResult).toEqual(10000); expect($root.futureResult).toEqual(10000);
}); });

6
test/scenario/output/HtmlSpec.js
View file

@ -38,15 +38,15 @@ describe('angular.scenario.output.html', function() {
toBeTruthy(); toBeTruthy();
}); });
it('should add link on InteractiveWait', function() { it('should add link on InteractivePause', function() {
runner.emit('SpecBegin', spec); runner.emit('SpecBegin', spec);
runner.emit('StepBegin', spec, step); runner.emit('StepBegin', spec, step);
runner.emit('StepEnd', spec, step); runner.emit('StepEnd', spec, step);
runner.emit('StepBegin', spec, step); runner.emit('StepBegin', spec, step);
runner.emit('InteractiveWait', spec, step); runner.emit('InteractivePause', spec, step);
expect(context.find('.test-actions .test-title:first').text()).toEqual('some step'); expect(context.find('.test-actions .test-title:first').text()).toEqual('some step');
expect(lowercase(context.find('.test-actions .test-title:last').html())).toEqual( expect(lowercase(context.find('.test-actions .test-title:last').html())).toEqual(
'waiting for you to <a href="javascript:resume()">resume</a>.' 'paused... <a href="javascript:resume()">resume</a> when ready.'
); );
}); });