aboutsummaryrefslogtreecommitdiffstats
path: root/src/scenario/DSL.js
diff options
context:
space:
mode:
authorAndres Ornelas2010-08-05 15:44:54 -0700
committerAndres Ornelas2010-08-05 15:44:54 -0700
commit643b43ffe5bd481b129484828fb35e2ab71a7d4c (patch)
treea7f190a22ff1a12fcce4a4412daf1310f8ca98f0 /src/scenario/DSL.js
parent6d0eeda1e231d0fbe515ce4cea8bf6245e1b72d3 (diff)
downloadangular.js-643b43ffe5bd481b129484828fb35e2ab71a7d4c.tar.bz2
Added new files to Rakefile and consistently used .addFuture
Diffstat (limited to 'src/scenario/DSL.js')
-rw-r--r--src/scenario/DSL.js10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/scenario/DSL.js b/src/scenario/DSL.js
index ef2f5553..944ca6f5 100644
--- a/src/scenario/DSL.js
+++ b/src/scenario/DSL.js
@@ -20,15 +20,11 @@ angular.scenario.dsl.browser = {
}
};
-function future(name, behavior) {
- return new Future(name, behavior);
-};
-
angular.scenario.dsl.input = function(selector) {
var namePrefix = "input '" + selector + "'";
return {
enter: function(value) {
- return future(namePrefix + " enter '" + value + "'", function(done) {
+ $scenario.addFuture(namePrefix + " enter '" + value + "'", function(done) {
var input = this.testDocument.find('input[name=' + selector + ']');
input.val(value);
this.testWindow.angular.element(input[0]).trigger('change');
@@ -36,7 +32,7 @@ angular.scenario.dsl.input = function(selector) {
});
},
select: function(value) {
- return future(namePrefix + " select '" + value + "'", function(done) {
+ $scenario.addFuture(namePrefix + " select '" + value + "'", function(done) {
var input = this.testDocument.
find(':radio[name$=@' + selector + '][value=' + value + ']');
jqLiteWrap(input[0]).trigger('click');
@@ -51,7 +47,7 @@ angular.scenario.dsl.repeater = function(selector) {
var namePrefix = "repeater '" + selector + "'";
return {
count: function() {
- return future(namePrefix + ' count', function(done) {
+ $scenario.addFuture(namePrefix + ' count', function(done) {
done(this.testDocument.find(selector).size());
});
}