From fe03ea0d1f8814817bee5a35d745db16858eb490 Mon Sep 17 00:00:00 2001
From: Andres Ornelas
Date: Wed, 9 Jun 2010 12:35:40 -0700
Subject: add repeater DSL and fix typo

---
 src/scenario/DSL.js | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'src/scenario')

diff --git a/src/scenario/DSL.js b/src/scenario/DSL.js
index b318e99c..a017f29d 100644
--- a/src/scenario/DSL.js
+++ b/src/scenario/DSL.js
@@ -44,17 +44,20 @@ angular.scenario.dsl.input = function(selector) {
   };
 };
 
-angular.scenario.dsl.expect = function(selector) {
-  return {
-    toEqual: function(expected) {
-      $scenario.addStep("Expect that " + selector + " equals '" + expected + "'", function(done){
-        var attrName = selector.substring(2, selector.length - 2);
-        var binding = this.testDocument.find('span[ng-bind=' + attrName + ']');
-        if (binding.text() != expected) {
-          this.result.fail("Expected '" + expected + "' but was '" + binding.text() + "'");
+angular.scenario.dsl.expect = {
+  repeater: function(selector) {
+    return {
+      count: {
+        toEqual: function(number) {
+          $scenario.addStep("Expect to see " + number + " items repeated 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();
+          });
         }
-        done();
-      });
-    }
-  };
+      }
+    };
+  }
 };
-- 
cgit v1.2.3


From f6a405c283ba1f2e0037e0bedb52e5cee618d4ff Mon Sep 17 00:00:00 2001
From: Andres Ornelas
Date: Wed, 9 Jun 2010 13:30:54 -0700
Subject: change repeater count expectation wording

---
 src/scenario/DSL.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/scenario')

diff --git a/src/scenario/DSL.js b/src/scenario/DSL.js
index a017f29d..feedcdcc 100644
--- a/src/scenario/DSL.js
+++ b/src/scenario/DSL.js
@@ -49,7 +49,7 @@ angular.scenario.dsl.expect = {
     return {
       count: {
         toEqual: function(number) {
-          $scenario.addStep("Expect to see " + number + " items repeated with selector '" + selector + "'", function(done) {
+          $scenario.addStep("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);
-- 
cgit v1.2.3


From 85fac4d78c131771d7fdd46d6ccd44bae92419cd Mon Sep 17 00:00:00 2001
From: Andres Ornelas
Date: Wed, 9 Jun 2010 14:12:54 -0700
Subject: add beforeEach and afterEach to scenario DSL

---
 src/scenario/Runner.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'src/scenario')

diff --git a/src/scenario/Runner.js b/src/scenario/Runner.js
index da6e2c39..8e0cc909 100644
--- a/src/scenario/Runner.js
+++ b/src/scenario/Runner.js
@@ -8,23 +8,34 @@ angular.scenario.Runner = function(scope, jQuery){
 
   var specs = this.specs = {};
   var path = [];
-  this.scope.describe = function describe(name, body){
+  this.scope.describe = function(name, body){
     path.push(name);
     body();
     path.pop();
   };
-  this.scope.it = function it(name, body) {
+  var beforeEach = noop;
+  var afterEach = noop;
+  this.scope.beforeEach = function(body) {
+    beforeEach = body;
+  };
+  this.scope.afterEach = function(body) {
+    afterEach = body;
+  };
+  this.scope.it = function(name, body) {
     var specName = path.join(' ') + ': it ' + name;
     self.currentSpec = specs[specName] = {
         name: specName,
         steps:[]
      };
     try {
+      beforeEach();
       body();
     } catch(err) {
       self.addStep(err.message || 'ERROR', function(){
         throw err;
       });
+    } finally {
+      afterEach();
     }
     self.currentSpec = null;
   };
-- 
cgit v1.2.3


From d0a468153d98c892323cb135b509cb46f67e44fd Mon Sep 17 00:00:00 2001
From: Andres Ornelas
Date: Wed, 9 Jun 2010 15:38:56 -0700
Subject: fixed undefined testWindow bug

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

(limited to 'src/scenario')

diff --git a/src/scenario/DSL.js b/src/scenario/DSL.js
index feedcdcc..194a28d6 100644
--- a/src/scenario/DSL.js
+++ b/src/scenario/DSL.js
@@ -2,7 +2,7 @@ angular.scenario.dsl.browser = {
   navigateTo: function(url){
     $scenario.addStep('Navigate to: ' + url, function(done){
       var self = this;
-      self.testFrame.load(function(){
+      this.testFrame.load(function(){
         self.testFrame.unbind();
         self.testWindow = self.testFrame[0].contentWindow;
         self.testDocument = jQuery(self.testWindow.document);
@@ -11,7 +11,7 @@ angular.scenario.dsl.browser = {
         self.notifyWhenNoOutstandingRequests(done);
       });
       if (this.testFrame.attr('src') == url) {
-        this.testWindow.location.reload();
+        this.testFrame[0].contentWindow.location.reload();
       } else {
         this.testFrame.attr('src', url);
       }
-- 
cgit v1.2.3