From e664186f93838ca1fb1b2e4277f7c18264f81d92 Mon Sep 17 00:00:00 2001
From: Andres Ornelas
Date: Tue, 29 Jun 2010 15:43:02 -0700
Subject: initial concept

---
 src/scenario/Future.js | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 src/scenario/Future.js

(limited to 'src/scenario')

diff --git a/src/scenario/Future.js b/src/scenario/Future.js
new file mode 100644
index 00000000..057b89db
--- /dev/null
+++ b/src/scenario/Future.js
@@ -0,0 +1,57 @@
+function Future(name, behavior) {
+  this.value = undefined;
+  this.name = name;
+  this.behavior = behavior;
+  this.fulfilled = false;
+}
+
+Future.prototype = {
+  fulfill: function(value){
+    this.fulfilled = true;
+    this.value = value;
+  }
+};
+
+function future(name, behavior) {
+  return new Future(name, behavior);
+};
+
+function repeater(selector) {
+  var repeaterFuture = future('repeater ' + selector, function(done) {
+    done($(selector));
+  });
+
+  repeaterFuture.count =  function(){
+    return future(repeaterFuture.name + ' count', function(done) {
+      done(repeaterFuture.value.size());
+    });
+  };
+
+  return repeaterFuture;
+}
+
+function Matcher(future, logger) {
+  var self = this;
+  this.logger = logger;
+  this.future = future;
+}
+
+Matcher.addMatcher = function(name, matcher){
+  Matcher.prototype[name] = function(expected) {
+    var future = this.future;
+    $scenario.addFuture(
+      'expect ' + future.name + ' ' + name + ' ' + expected,
+      function(done){
+        if (matcher(future.value, expected))
+          throw "Expected " + expected + ' but was ' + future.value;
+        done();
+      }
+    );
+  };
+};
+
+Matcher.addMatcher('toEqual', function(a,b){ return a == b; });
+
+function expect(future) {
+  return new Matcher(future, window.alert);
+}
-- 
cgit v1.2.3


From 9d8646b0d1bee2ca60bbb7b494b63ab83e243072 Mon Sep 17 00:00:00 2001
From: Andres Ornelas
Date: Wed, 30 Jun 2010 09:51:54 -0700
Subject: all tests passing with new futures concept

---
 src/scenario/DSL.js    |  8 ++++----
 src/scenario/Future.js | 45 ++++++++++++++++++++++++---------------------
 src/scenario/Runner.js | 39 ++++++++++++++++++++++-----------------
 3 files changed, 50 insertions(+), 42 deletions(-)

(limited to 'src/scenario')

diff --git a/src/scenario/DSL.js b/src/scenario/DSL.js
index 194a28d6..bcf2b6c5 100644
--- a/src/scenario/DSL.js
+++ b/src/scenario/DSL.js
@@ -1,6 +1,6 @@
 angular.scenario.dsl.browser = {
   navigateTo: function(url){
-    $scenario.addStep('Navigate to: ' + url, function(done){
+    $scenario.addFuture('Navigate to: ' + url, function(done){
       var self = this;
       this.testFrame.load(function(){
         self.testFrame.unbind();
@@ -22,7 +22,7 @@ angular.scenario.dsl.browser = {
 angular.scenario.dsl.input = function(selector) {
   return {
     enter: function(value){
-      $scenario.addStep("Set input text of '" + selector + "' to '" +
+      $scenario.addFuture("Set input text of '" + selector + "' to '" +
         value + "'", function(done){
           var input = this.testDocument.find('input[name=' + selector + ']');
           input.val(value);
@@ -31,7 +31,7 @@ angular.scenario.dsl.input = function(selector) {
       });
     },
     select: function(value){
-      $scenario.addStep("Select radio '" + selector + "' to '" +
+      $scenario.addFuture("Select radio '" + selector + "' to '" +
               value + "'", function(done){
         var input = this.testDocument.
           find(':radio[name$=@' + selector + '][value=' + value + ']');
@@ -49,7 +49,7 @@ angular.scenario.dsl.expect = {
     return {
       count: {
         toEqual: function(number) {
-          $scenario.addStep("Expect that there are " + number + " items in Repeater with selector '" + selector + "'", function(done) {
+          $scenario.addFuture("Expect that there are " + number + " items in Repeater with selector '" + selector + "'", function(done) {
             var items = this.testDocument.find(selector);
             if (items.length != number) {
               this.result.fail("Expected " + number + " but was " + items.length);
diff --git a/src/scenario/Future.js b/src/scenario/Future.js
index 057b89db..c718bba2 100644
--- a/src/scenario/Future.js
+++ b/src/scenario/Future.js
@@ -1,8 +1,8 @@
 function Future(name, behavior) {
-  this.value = undefined;
   this.name = name;
   this.behavior = behavior;
   this.fulfilled = false;
+  this.value = undefined;
 }
 
 Future.prototype = {
@@ -11,25 +11,6 @@ Future.prototype = {
     this.value = value;
   }
 };
-
-function future(name, behavior) {
-  return new Future(name, behavior);
-};
-
-function repeater(selector) {
-  var repeaterFuture = future('repeater ' + selector, function(done) {
-    done($(selector));
-  });
-
-  repeaterFuture.count =  function(){
-    return future(repeaterFuture.name + ' count', function(done) {
-      done(repeaterFuture.value.size());
-    });
-  };
-
-  return repeaterFuture;
-}
-
 function Matcher(future, logger) {
   var self = this;
   this.logger = logger;
@@ -52,6 +33,28 @@ Matcher.addMatcher = function(name, matcher){
 
 Matcher.addMatcher('toEqual', function(a,b){ return a == b; });
 
-function expect(future) {
+/*
+
+function future(name, behavior) {
+  return new Future(name, behavior);
+};
+
+function repeater(selector) {
+  var repeaterFuture = future('repeater ' + selector, function(done) {
+    done($(selector));
+  });
+
+  repeaterFuture.count =  function(){
+    return future(repeaterFuture.name + ' count', function(done) {
+      done(repeaterFuture.value.size());
+    });
+  };
+
+  return repeaterFuture;
+}
+
+function expectX(future) {
   return new Matcher(future, window.alert);
 }
+
+ */
\ No newline at end of file
diff --git a/src/scenario/Runner.js b/src/scenario/Runner.js
index 13ba5af0..c77239cc 100644
--- a/src/scenario/Runner.js
+++ b/src/scenario/Runner.js
@@ -26,13 +26,13 @@ angular.scenario.Runner = function(scope, jQuery){
     var specName = path.join(' ') + ': it ' + name;
     self.currentSpec = specs[specName] = {
         name: specName,
-        steps:[]
+        futures: []
      };
     try {
       beforeEach();
       body();
     } catch(err) {
-      self.addStep(err.message || 'ERROR', function(){
+      self.addFuture(err.message || 'ERROR', function(){
         throw err;
       });
     } finally {
@@ -107,14 +107,16 @@ angular.scenario.Runner.prototype = {
     callback();
   },
 
-  addStep: function(name, step) {
-    this.currentSpec.steps.push({name:name, fn:step});
+  addFuture: function(name, behavior) {
+    var future = new Future(name, behavior);
+    this.currentSpec.futures.push(future);
+    return future;
   },
 
   execute: function(name, callback) {
    var spec = this.specs[name],
        self = this,
-       stepsDone = [],
+       futuresFulfilled = [],
        result = {
          passed: false,
          failed: false,
@@ -132,29 +134,32 @@ angular.scenario.Runner.prototype = {
          testWindow: this.testWindow
        }, angularService, {});
    this.self = specThis;
-   var stepLogger = this.logger('spec', name);
-   spec.nextStepIndex = 0;
+   var futureLogger = this.logger('spec', name);
+   spec.nextFutureIndex = 0;
    function done() {
      result.finished = true;
-     stepLogger.close();
+     futureLogger.close();
      self.self = null;
      (callback||noop).call(specThis);
    }
-   function next(){
-     var step = spec.steps[spec.nextStepIndex];
+   function next(value){
+     if (spec.nextFutureIndex > 0) {
+       spec.futures[spec.nextFutureIndex - 1].fulfill(value);
+     }
+     var future = spec.futures[spec.nextFutureIndex];
      (result.log || {close:noop}).close();
      result.log = null;
-     if (step) {
-       spec.nextStepIndex ++;
-       result.log = stepLogger('step', step.name);
-       stepsDone.push(step.name);
+     if (future) {
+       spec.nextFutureIndex ++;
+       result.log = futureLogger('future', future.name);
+       futuresFulfilled.push(future.name);
        try {
-         step.fn.call(specThis, next);
+         future.behavior.call(specThis, next);
        } catch (e) {
          console.error(e);
          result.fail(e);
          self.scope.$testrun.results.push(
-           {name: name, passed: false, error: e, steps: stepsDone});
+           {name: name, passed: false, error: e, steps: futuresFulfilled});
          done();
        }
      } else {
@@ -163,7 +168,7 @@ angular.scenario.Runner.prototype = {
          name: name,
          passed: !result.failed,
          error: result.error,
-         steps: stepsDone});
+         steps: futuresFulfilled});
        done();
      }
    };
-- 
cgit v1.2.3


From da95010350882d9e13b5e461fb4a1e05bc7d065c Mon Sep 17 00:00:00 2001
From: Andres Ornelas
Date: Tue, 27 Jul 2010 15:43:14 -0700
Subject: stable before refactoring

---
 src/scenario/DSL.js     | 53 +++++++++++++++++++++++--------------------------
 src/scenario/Future.js  | 29 ++-------------------------
 src/scenario/Matcher.js | 21 ++++++++++++++++++++
 src/scenario/Runner.js  |  3 +++
 4 files changed, 51 insertions(+), 55 deletions(-)
 create mode 100644 src/scenario/Matcher.js

(limited to 'src/scenario')

diff --git a/src/scenario/DSL.js b/src/scenario/DSL.js
index fcadd3ca..ef2f5553 100644
--- a/src/scenario/DSL.js
+++ b/src/scenario/DSL.js
@@ -7,7 +7,8 @@ angular.scenario.dsl.browser = {
         self.testWindow = self.testFrame[0].contentWindow;
         self.testDocument = jQuery(self.testWindow.document);
         self.$browser = self.testWindow.angular.service.$browser();
-        self.notifyWhenNoOutstandingRequests = bind(self.$browser, self.$browser.notifyWhenNoOutstandingRequests);
+        self.notifyWhenNoOutstandingRequests =
+          bind(self.$browser, self.$browser.notifyWhenNoOutstandingRequests);
         self.notifyWhenNoOutstandingRequests(done);
       });
       if (this.testFrame.attr('src') == url) {
@@ -19,20 +20,23 @@ 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){
-      $scenario.addFuture("Set input text of '" + selector + "' to '" +
-        value + "'", function(done){
-          var input = this.testDocument.find('input[name=' + selector + ']');
-          input.val(value);
-          this.testWindow.angular.element(input[0]).trigger('change');
-          done();
+    enter: function(value) {
+      return future(namePrefix + " enter '" + value + "'", function(done) {
+        var input = this.testDocument.find('input[name=' + selector + ']');
+        input.val(value);
+        this.testWindow.angular.element(input[0]).trigger('change');
+        done();
       });
     },
-    select: function(value){
-      $scenario.addFuture("Select radio '" + selector + "' to '" +
-              value + "'", function(done){
+    select: function(value) {
+      return future(namePrefix + " select '" + value + "'", function(done) {
         var input = this.testDocument.
           find(':radio[name$=@' + selector + '][value=' + value + ']');
         jqLiteWrap(input[0]).trigger('click');
@@ -41,22 +45,15 @@ angular.scenario.dsl.input = function(selector) {
       });
     }
   };
-};
+},
 
-angular.scenario.dsl.expect = {
-  repeater: function(selector) {
-    return {
-      count: {
-        toEqual: function(number) {
-          $scenario.addFuture("Expect that there are " + number + " items in Repeater with selector '" + selector + "'", function(done) {
-            var items = this.testDocument.find(selector);
-            if (items.length != number) {
-              this.result.fail("Expected " + number + " but was " + items.length);
-            }
-            done();
-          });
-        }
-      }
-    };
-  }
+angular.scenario.dsl.repeater = function(selector) {
+  var namePrefix = "repeater '" + selector + "'";
+  return {
+    count: function() {
+      return future(namePrefix + ' count', function(done) {
+          done(this.testDocument.find(selector).size());
+      });
+    }
+  };
 };
diff --git a/src/scenario/Future.js b/src/scenario/Future.js
index c718bba2..6c90df9d 100644
--- a/src/scenario/Future.js
+++ b/src/scenario/Future.js
@@ -6,11 +6,12 @@ function Future(name, behavior) {
 }
 
 Future.prototype = {
-  fulfill: function(value){
+  fulfill: function(value) {
     this.fulfilled = true;
     this.value = value;
   }
 };
+
 function Matcher(future, logger) {
   var self = this;
   this.logger = logger;
@@ -32,29 +33,3 @@ Matcher.addMatcher = function(name, matcher){
 };
 
 Matcher.addMatcher('toEqual', function(a,b){ return a == b; });
-
-/*
-
-function future(name, behavior) {
-  return new Future(name, behavior);
-};
-
-function repeater(selector) {
-  var repeaterFuture = future('repeater ' + selector, function(done) {
-    done($(selector));
-  });
-
-  repeaterFuture.count =  function(){
-    return future(repeaterFuture.name + ' count', function(done) {
-      done(repeaterFuture.value.size());
-    });
-  };
-
-  return repeaterFuture;
-}
-
-function expectX(future) {
-  return new Matcher(future, window.alert);
-}
-
- */
\ No newline at end of file
diff --git a/src/scenario/Matcher.js b/src/scenario/Matcher.js
new file mode 100644
index 00000000..dd7b7ee6
--- /dev/null
+++ b/src/scenario/Matcher.js
@@ -0,0 +1,21 @@
+//function Matcher(future, logger) {
+//  var self = this;
+//  this.logger = logger;
+//  this.future = future;
+//}
+//
+//Matcher.addMatcher = function(name, matcher){
+//  Matcher.prototype[name] = function(expected) {
+//    var future = this.future;
+//    $scenario.addFuture(
+//      'expect ' + future.name + ' ' + name + ' ' + expected,
+//      function(done){
+//        if (matcher(future.value, expected))
+//          throw "Expected " + expected + ' but was ' + future.value;
+//        done();
+//      }
+//    );
+//  };
+//};
+//
+//Matcher.addMatcher('toEqual', function(a,b){ return a == b; });
diff --git a/src/scenario/Runner.js b/src/scenario/Runner.js
index c77239cc..3fc1c614 100644
--- a/src/scenario/Runner.js
+++ b/src/scenario/Runner.js
@@ -22,6 +22,9 @@ angular.scenario.Runner = function(scope, jQuery){
   this.scope.afterEach = function(body) {
     afterEach = body;
   };
+//  this.scope.expect = function(future) {
+//    return new Matcher(future, self.logger);
+//  };
   this.scope.it = function(name, body) {
     var specName = path.join(' ') + ': it ' + name;
     self.currentSpec = specs[specName] = {
-- 
cgit v1.2.3


From 32c4aee1cdb601550e948b52a3fa7b4824cfbf1f Mon Sep 17 00:00:00 2001
From: Andres Ornelas
Date: Tue, 27 Jul 2010 15:53:55 -0700
Subject: before pulling testcontext out

---
 src/scenario/Future.js  | 22 ----------------------
 src/scenario/Matcher.js | 42 +++++++++++++++++++++---------------------
 src/scenario/Runner.js  |  6 +++---
 3 files changed, 24 insertions(+), 46 deletions(-)

(limited to 'src/scenario')

diff --git a/src/scenario/Future.js b/src/scenario/Future.js
index 6c90df9d..d70e8e6e 100644
--- a/src/scenario/Future.js
+++ b/src/scenario/Future.js
@@ -11,25 +11,3 @@ Future.prototype = {
     this.value = value;
   }
 };
-
-function Matcher(future, logger) {
-  var self = this;
-  this.logger = logger;
-  this.future = future;
-}
-
-Matcher.addMatcher = function(name, matcher){
-  Matcher.prototype[name] = function(expected) {
-    var future = this.future;
-    $scenario.addFuture(
-      'expect ' + future.name + ' ' + name + ' ' + expected,
-      function(done){
-        if (matcher(future.value, expected))
-          throw "Expected " + expected + ' but was ' + future.value;
-        done();
-      }
-    );
-  };
-};
-
-Matcher.addMatcher('toEqual', function(a,b){ return a == b; });
diff --git a/src/scenario/Matcher.js b/src/scenario/Matcher.js
index dd7b7ee6..a4a13285 100644
--- a/src/scenario/Matcher.js
+++ b/src/scenario/Matcher.js
@@ -1,21 +1,21 @@
-//function Matcher(future, logger) {
-//  var self = this;
-//  this.logger = logger;
-//  this.future = future;
-//}
-//
-//Matcher.addMatcher = function(name, matcher){
-//  Matcher.prototype[name] = function(expected) {
-//    var future = this.future;
-//    $scenario.addFuture(
-//      'expect ' + future.name + ' ' + name + ' ' + expected,
-//      function(done){
-//        if (matcher(future.value, expected))
-//          throw "Expected " + expected + ' but was ' + future.value;
-//        done();
-//      }
-//    );
-//  };
-//};
-//
-//Matcher.addMatcher('toEqual', function(a,b){ return a == b; });
+function Matcher(future, logger) {
+  var self = this;
+  this.logger = logger;
+  this.future = future;
+}
+
+Matcher.addMatcher = function(name, matcher){
+  Matcher.prototype[name] = function(expected) {
+    var future = this.future;
+    $scenario.addFuture(
+      'expect ' + future.name + ' ' + name + ' ' + expected,
+      function(done){
+        if (matcher(future.value, expected))
+          throw "Expected " + expected + ' but was ' + future.value;
+        done();
+      }
+    );
+  };
+};
+
+Matcher.addMatcher('toEqual', function(a,b){ return a == b; });
diff --git a/src/scenario/Runner.js b/src/scenario/Runner.js
index 3fc1c614..4e5d0f01 100644
--- a/src/scenario/Runner.js
+++ b/src/scenario/Runner.js
@@ -22,9 +22,9 @@ angular.scenario.Runner = function(scope, jQuery){
   this.scope.afterEach = function(body) {
     afterEach = body;
   };
-//  this.scope.expect = function(future) {
-//    return new Matcher(future, self.logger);
-//  };
+  this.scope.expect = function(future) {
+    return new Matcher(future, self.logger);
+  };
   this.scope.it = function(name, body) {
     var specName = path.join(' ') + ': it ' + name;
     self.currentSpec = specs[specName] = {
-- 
cgit v1.2.3


From ef88eb9a71ee7666029c4fb5eb731ce2e986cecc Mon Sep 17 00:00:00 2001
From: Andres Ornelas
Date: Tue, 27 Jul 2010 17:04:37 -0700
Subject: refactoring done but Expect not working

---
 src/scenario/Matcher.js | 8 ++++----
 src/scenario/Runner.js  | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/scenario')

diff --git a/src/scenario/Matcher.js b/src/scenario/Matcher.js
index a4a13285..b9787050 100644
--- a/src/scenario/Matcher.js
+++ b/src/scenario/Matcher.js
@@ -1,10 +1,10 @@
-function Matcher(future, logger) {
-  var self = this;
+function Matcher(scope, future, logger) {
+  var self = scope.$scenario = this;
   this.logger = logger;
   this.future = future;
 }
 
-Matcher.addMatcher = function(name, matcher){
+Matcher.addMatcher = function(name, matcher) {
   Matcher.prototype[name] = function(expected) {
     var future = this.future;
     $scenario.addFuture(
@@ -18,4 +18,4 @@ Matcher.addMatcher = function(name, matcher){
   };
 };
 
-Matcher.addMatcher('toEqual', function(a,b){ return a == b; });
+Matcher.addMatcher('toEqual', function(a,b) { return a == b; });
diff --git a/src/scenario/Runner.js b/src/scenario/Runner.js
index 4e5d0f01..13dfbe7d 100644
--- a/src/scenario/Runner.js
+++ b/src/scenario/Runner.js
@@ -8,6 +8,7 @@ angular.scenario.Runner = function(scope, jQuery){
   this.scope.$testrun = {done: false, results: []};
 
   var specs = this.specs = {};
+  this.currentSpec = {name: '', futures: []};
   var path = [];
   this.scope.describe = function(name, body){
     path.push(name);
@@ -23,7 +24,7 @@ angular.scenario.Runner = function(scope, jQuery){
     afterEach = body;
   };
   this.scope.expect = function(future) {
-    return new Matcher(future, self.logger);
+    return new Matcher(self, future, self.logger);
   };
   this.scope.it = function(name, body) {
     var specName = path.join(' ') + ': it ' + name;
-- 
cgit v1.2.3


From 26ed747588d2e7bceddcb4ccd9bacd5f51b9fec8 Mon Sep 17 00:00:00 2001
From: Andres Ornelas
Date: Wed, 4 Aug 2010 11:47:10 -0700
Subject: test passing with repeater.count

---
 src/scenario/Matcher.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/scenario')

diff --git a/src/scenario/Matcher.js b/src/scenario/Matcher.js
index b9787050..326bb948 100644
--- a/src/scenario/Matcher.js
+++ b/src/scenario/Matcher.js
@@ -10,11 +10,12 @@ Matcher.addMatcher = function(name, matcher) {
     $scenario.addFuture(
       'expect ' + future.name + ' ' + name + ' ' + expected,
       function(done){
-        if (matcher(future.value, expected))
+        if (!matcher(future.value, expected))
           throw "Expected " + expected + ' but was ' + future.value;
         done();
       }
     );
+    dump('future added');
   };
 };
 
-- 
cgit v1.2.3


From 6d0eeda1e231d0fbe515ce4cea8bf6245e1b72d3 Mon Sep 17 00:00:00 2001
From: Andres Ornelas
Date: Wed, 4 Aug 2010 12:36:53 -0700
Subject: added MatcherSpec

---
 src/scenario/Matcher.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/scenario')

diff --git a/src/scenario/Matcher.js b/src/scenario/Matcher.js
index 326bb948..62f094c8 100644
--- a/src/scenario/Matcher.js
+++ b/src/scenario/Matcher.js
@@ -15,7 +15,6 @@ Matcher.addMatcher = function(name, matcher) {
         done();
       }
     );
-    dump('future added');
   };
 };
 
-- 
cgit v1.2.3


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/scenario')

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


From 989cffb43502744ab05baa741420c2082f137d69 Mon Sep 17 00:00:00 2001
From: Andres Ornelas
Date: Thu, 5 Aug 2010 16:03:47 -0700
Subject: fix build breakage by returning the added futures in the DSL

---
 src/scenario/DSL.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/scenario')

diff --git a/src/scenario/DSL.js b/src/scenario/DSL.js
index 944ca6f5..26157059 100644
--- a/src/scenario/DSL.js
+++ b/src/scenario/DSL.js
@@ -1,6 +1,6 @@
 angular.scenario.dsl.browser = {
   navigateTo: function(url){
-    $scenario.addFuture('Navigate to: ' + url, function(done){
+    return $scenario.addFuture('Navigate to: ' + url, function(done){
       var self = this;
       this.testFrame.load(function(){
         self.testFrame.unbind();
@@ -24,7 +24,7 @@ angular.scenario.dsl.input = function(selector) {
   var namePrefix = "input '" + selector + "'";
   return {
     enter: function(value) {
-    $scenario.addFuture(namePrefix + " enter '" + value + "'", function(done) {
+      return $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');
@@ -32,7 +32,7 @@ angular.scenario.dsl.input = function(selector) {
       });
     },
     select: function(value) {
-      $scenario.addFuture(namePrefix + " select '" + value + "'", function(done) {
+      return $scenario.addFuture(namePrefix + " select '" + value + "'", function(done) {
         var input = this.testDocument.
           find(':radio[name$=@' + selector + '][value=' + value + ']');
         jqLiteWrap(input[0]).trigger('click');
@@ -47,7 +47,7 @@ angular.scenario.dsl.repeater = function(selector) {
   var namePrefix = "repeater '" + selector + "'";
   return {
     count: function() {
-    $scenario.addFuture(namePrefix + ' count', function(done) {
+      return $scenario.addFuture(namePrefix + ' count', function(done) {
           done(this.testDocument.find(selector).size());
       });
     }
-- 
cgit v1.2.3


From de8d0984c85ae3078fd72a9c7f010b0fd4397150 Mon Sep 17 00:00:00 2001
From: Andres Ornelas
Date: Fri, 6 Aug 2010 17:28:47 -0700
Subject: added repeater.collect to E2E DSL

---
 src/scenario/DSL.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'src/scenario')

diff --git a/src/scenario/DSL.js b/src/scenario/DSL.js
index 26157059..13576824 100644
--- a/src/scenario/DSL.js
+++ b/src/scenario/DSL.js
@@ -50,6 +50,26 @@ angular.scenario.dsl.repeater = function(selector) {
       return $scenario.addFuture(namePrefix + ' count', function(done) {
           done(this.testDocument.find(selector).size());
       });
+    },
+    collect: function() {
+      return $scenario.addFuture(namePrefix + ' collect', function(done) {
+        var doCollect = bind(this, function() {
+          var repeaterArray = [];
+          this.testDocument.find(selector).each(function(index) {
+            var element = angular.extend(_jQuery(this),
+                {bindings: [],
+                 boundTo: function(name) { return this.bindings[name]; }}
+            );
+            element.find('*').each(function(index) {
+              var bindName = _jQuery(this).attr('ng:bind');
+              element.bindings[bindName] = _jQuery(this).text();
+            });
+            repeaterArray[index] = element;
+          });
+          return repeaterArray;
+        });
+        done(doCollect());
+      });
     }
   };
 };
-- 
cgit v1.2.3


From 21d2b43e6c81b7b6b55599f0274495d25411b4f0 Mon Sep 17 00:00:00 2001
From: Shyam Seshadri
Date: Mon, 9 Aug 2010 17:55:01 -0700
Subject: Add element DSL, to find an element. Has knowledge of finding ng:bind
 elements and grabbing their contents.

---
 src/scenario/DSL.js | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'src/scenario')

diff --git a/src/scenario/DSL.js b/src/scenario/DSL.js
index 13576824..fe834835 100644
--- a/src/scenario/DSL.js
+++ b/src/scenario/DSL.js
@@ -62,7 +62,9 @@ angular.scenario.dsl.repeater = function(selector) {
             );
             element.find('*').each(function(index) {
               var bindName = _jQuery(this).attr('ng:bind');
-              element.bindings[bindName] = _jQuery(this).text();
+              if (bindName) {
+                element.bindings[bindName] = _jQuery(this).text();
+              }
             });
             repeaterArray[index] = element;
           });
@@ -73,3 +75,20 @@ angular.scenario.dsl.repeater = function(selector) {
     }
   };
 };
+
+angular.scenario.dsl.element = function(selector) {
+  var nameSuffix = "element '" + selector + "'";
+  return $scenario.addFuture('Find ' + nameSuffix, function(done) {
+    var element = angular.extend(this.testDocument.find(selector), {
+      bindings: [],
+      boundTo: function(name) { return this.bindings[name]; }
+    });
+    element.find('*').each(function(index) {
+      var bindName = _jQuery(this).attr('ng:bind');
+      if (bindName) {
+        element.bindings[bindName] = _jQuery(this).text();
+      }
+    });
+    done(element);
+  });
+};
-- 
cgit v1.2.3


From 86c2ef87d5069f0836079e171c0f33efcf2b5d24 Mon Sep 17 00:00:00 2001
From: Shyam Seshadri
Date: Tue, 10 Aug 2010 10:48:31 -0700
Subject: Inject jquery into future scope, and rename outer scenario to
 _window, which is what it is

---
 src/scenario/DSL.js    | 14 ++++++++------
 src/scenario/Runner.js |  1 +
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/scenario')

diff --git a/src/scenario/DSL.js b/src/scenario/DSL.js
index fe834835..d57a61df 100644
--- a/src/scenario/DSL.js
+++ b/src/scenario/DSL.js
@@ -5,7 +5,7 @@ angular.scenario.dsl.browser = {
       this.testFrame.load(function(){
         self.testFrame.unbind();
         self.testWindow = self.testFrame[0].contentWindow;
-        self.testDocument = jQuery(self.testWindow.document);
+        self.testDocument = self.jQuery(self.testWindow.document);
         self.$browser = self.testWindow.angular.service.$browser();
         self.notifyWhenNoOutstandingRequests =
           bind(self.$browser, self.$browser.notifyWhenNoOutstandingRequests);
@@ -53,17 +53,18 @@ angular.scenario.dsl.repeater = function(selector) {
     },
     collect: function() {
       return $scenario.addFuture(namePrefix + ' collect', function(done) {
+        var self = this;
         var doCollect = bind(this, function() {
           var repeaterArray = [];
           this.testDocument.find(selector).each(function(index) {
-            var element = angular.extend(_jQuery(this),
+            var element = angular.extend(self.jQuery(this),
                 {bindings: [],
                  boundTo: function(name) { return this.bindings[name]; }}
             );
             element.find('*').each(function(index) {
-              var bindName = _jQuery(this).attr('ng:bind');
+              var bindName = self.jQuery(this).attr('ng:bind');
               if (bindName) {
-                element.bindings[bindName] = _jQuery(this).text();
+                element.bindings[bindName] = self.jQuery(this).text();
               }
             });
             repeaterArray[index] = element;
@@ -79,14 +80,15 @@ angular.scenario.dsl.repeater = function(selector) {
 angular.scenario.dsl.element = function(selector) {
   var nameSuffix = "element '" + selector + "'";
   return $scenario.addFuture('Find ' + nameSuffix, function(done) {
+    var self = this;
     var element = angular.extend(this.testDocument.find(selector), {
       bindings: [],
       boundTo: function(name) { return this.bindings[name]; }
     });
     element.find('*').each(function(index) {
-      var bindName = _jQuery(this).attr('ng:bind');
+      var bindName = self.jQuery(this).attr('ng:bind');
       if (bindName) {
-        element.bindings[bindName] = _jQuery(this).text();
+        element.bindings[bindName] = self.jQuery(this).text();
       }
     });
     done(element);
diff --git a/src/scenario/Runner.js b/src/scenario/Runner.js
index 13dfbe7d..ac32559c 100644
--- a/src/scenario/Runner.js
+++ b/src/scenario/Runner.js
@@ -134,6 +134,7 @@ angular.scenario.Runner.prototype = {
        },
        specThis = createScope({
          result: result,
+         jQuery: this.jQuery,
          testFrame: this.testFrame,
          testWindow: this.testWindow
        }, angularService, {});
-- 
cgit v1.2.3