Added new files to Rakefile and consistently used .addFuture

2 files changed, 6 insertions, 8 deletions

diff --git a/Rakefile b/Rakefile
index 4eb22ade..bf37edce 100644
--- a/Rakefile
+++ b/Rakefile
@@ -45,8 +45,10 @@ task :compile_scenario do
       src/apis.js \
       src/services.js \
       src/AngularPublic.js \
-      src/scenario/Runner.js \
       src/scenario/DSL.js \
+      src/scenario/Future.js \
+      src/scenario/Matcher.js \
+      src/scenario/Runner.js \
       src/scenario/angular.suffix \
     )
   css = %x(cat css/angular-scenario.css)
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());
       });
     }