From 643b43ffe5bd481b129484828fb35e2ab71a7d4c Mon Sep 17 00:00:00 2001 From: Andres Ornelas Date: Thu, 5 Aug 2010 15:44:54 -0700 Subject: Added new files to Rakefile and consistently used .addFuture --- src/scenario/DSL.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src') 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()); }); } -- cgit v1.2.3