aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDi Peng2011-06-03 15:22:43 -0700
committerDi Peng2011-06-05 12:00:45 -0700
commit1eebb771e3940ddd6640ddc064d5fa6e539c536d (patch)
treee9dd762dcfd512837646ac95deacd334bc766ffc /test
parent9250fce19c39203c702f22fde43724e1a7a19544 (diff)
downloadangular.js-1eebb771e3940ddd6640ddc064d5fa6e539c536d.tar.bz2
renamed $pause to $sleep AND $wait to $pause
Closes #207
Diffstat (limited to 'test')
-rw-r--r--test/scenario/dslSpec.js16
-rw-r--r--test/scenario/output/HtmlSpec.js6
2 files changed, 11 insertions, 11 deletions
diff --git a/test/scenario/dslSpec.js b/test/scenario/dslSpec.js
index 4e0042d0..e1918ca7 100644
--- a/test/scenario/dslSpec.js
+++ b/test/scenario/dslSpec.js
@@ -46,20 +46,20 @@ describe("angular.scenario.dsl", function() {
SpecRunner.prototype.addFutureAction;
});
- describe('Wait', function() {
- it('should wait until resume to complete', function() {
+ describe('Pause', function() {
+ it('should pause until resume to complete', function() {
expect($window.resume).toBeUndefined();
- $root.dsl.wait();
+ $root.dsl.pause();
expect(angular.isFunction($window.resume)).toBeTruthy();
expect($root.futureLog).toEqual([]);
$window.resume();
expect($root.futureLog).
- toEqual(['waiting for you to resume']);
- expect(eventLog).toContain('InteractiveWait');
+ toEqual(['pausing for you to resume']);
+ expect(eventLog).toContain('InteractivePause');
});
});
- describe('Pause', function() {
+ describe('Sleep', function() {
beforeEach(function() {
$root.$window.setTimeout = function(fn, value) {
$root.timerValue = value;
@@ -67,8 +67,8 @@ describe("angular.scenario.dsl", function() {
};
});
- it('should pause for specified seconds', function() {
- $root.dsl.pause(10);
+ it('should sleep for specified seconds', function() {
+ $root.dsl.sleep(10);
expect($root.timerValue).toEqual(10000);
expect($root.futureResult).toEqual(10000);
});
diff --git a/test/scenario/output/HtmlSpec.js b/test/scenario/output/HtmlSpec.js
index 6694bb45..a1ebef39 100644
--- a/test/scenario/output/HtmlSpec.js
+++ b/test/scenario/output/HtmlSpec.js
@@ -38,15 +38,15 @@ describe('angular.scenario.output.html', function() {
toBeTruthy();
});
- it('should add link on InteractiveWait', function() {
+ it('should add link on InteractivePause', function() {
runner.emit('SpecBegin', spec);
runner.emit('StepBegin', spec, step);
runner.emit('StepEnd', 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(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.'
);
});