1 files changed, 88 insertions, 25 deletions

diff --git a/test/scenario/DSLSpec.js b/test/scenario/DSLSpec.js
index 5aac9752..374f49c8 100644
--- a/test/scenario/DSLSpec.js
+++ b/test/scenario/DSLSpec.js
@@ -1,39 +1,37 @@
 describe("DSL", function() {
 
-  var lastStep, executeStep, lastDocument;
+  var lastDocument, executeFuture, Expect;
 
   beforeEach(function() {
-    lastStep = null;
-    $scenario = {
-      addStep: function(name, stepFunction) {
-        lastStep = { name:name, fn: stepFunction};
-      }
-    };
-    executeStep = function(step, html, callback) {
-      lastDocument =_jQuery('<div>' + html + '</div>');
+    setUpContext();
+    executeFuture = function(future, html, callback) {
+      lastDocument = _jQuery('<div>' + html + '</div>');
       _jQuery(document.body).append(lastDocument);
       var specThis = {
         testWindow: window,
-        testDocument: lastDocument
+        testDocument: lastDocument,
+        jQuery: _jQuery
       };
-      step.fn.call(specThis, callback || noop);
+      future.behavior.call(specThis, callback || noop);
     };
+    Expect = _window.expect;
   });
 
   describe("input", function() {
 
     var input = angular.scenario.dsl.input;
+
     it('should enter', function() {
-      input('name').enter('John');
-      expect(lastStep.name).toEqual("Set input text of 'name' to 'John'");
-      executeStep(lastStep, '<input type="text" name="name" />');
+      var future = input('name').enter('John');
+      expect(future.name).toEqual("input 'name' enter 'John'");
+      executeFuture(future, '<input type="text" name="name" />');
       expect(lastDocument.find('input').val()).toEqual('John');
     });
 
     it('should select', function() {
-      input('gender').select('female');
-      expect(lastStep.name).toEqual("Select radio 'gender' to 'female'");
-      executeStep(lastStep,
+      var future = input('gender').select('female');
+      expect(future.name).toEqual("input 'gender' select 'female'");
+      executeFuture(future,
         '<input type="radio" name="0@gender" value="male" checked/>' +
         '<input type="radio" name="0@gender" value="female"/>');
       expect(lastDocument.find(':radio:checked').length).toEqual(1);
@@ -41,15 +39,80 @@ describe("DSL", function() {
     });
   });
 
-  describe('expect', function() {
-    var dslExpect = angular.scenario.dsl.expect;
-    describe('repeater', function() {
-      it('should check the count of repeated elements', function() {
-        dslExpect.repeater('.repeater-row').count.toEqual(2);
-        expect(lastStep.name).toEqual("Expect that there are 2 items in Repeater with selector '.repeater-row'");
-        var html = "<div class='repeater-row'>a</div><div class='repeater-row'>b</div>";
-        executeStep(lastStep, html);
+  describe('repeater', function() {
+
+    var repeater = angular.scenario.dsl.repeater;
+    it('should count', function() {
+      var future = repeater('.repeater-row').count();
+      expect(future.name).toEqual("repeater '.repeater-row' count");
+      executeFuture(future,
+        "<div class='repeater-row'>a</div>" +
+        "<div class='repeater-row'>b</div>",
+        function(value) {
+          future.fulfill(value);
+      });
+      expect(future.fulfilled).toBeTruthy();
+      expect(future.value).toEqual(2);
+    });
+
+    it('should collect', function() {
+      var future = repeater('.epic').collect();
+      expect(future.name).toEqual("repeater '.epic' collect");
+      executeFuture(future,
+        "<table>" +
+        "<tr class='epic'>" +
+          "<td ng:bind='hero'>John Marston</td>" +
+          "<td ng:bind='game'>Red Dead Redemption</td>" +
+        "</tr>" +
+        "<tr class='epic'>" +
+          "<td ng:bind='hero'>Nathan Drake</td>" +
+          "<td ng:bind='game'>Uncharted 2</td>" +
+        "</tr>" +
+        "</table>",
+        function(value) {
+          future.fulfill(value);
       });
+      expect(future.fulfilled).toBeTruthy();
+      expect(future.value[0].boundTo('hero')).toEqual('John Marston');
+      expect(future.value[0].boundTo('game')).toEqual('Red Dead Redemption');
+      expect(future.value[1].boundTo('hero')).toEqual('Nathan Drake');
+      expect(future.value[1].boundTo('game')).toEqual('Uncharted 2');
+    });
+  });
+
+  describe('element', function() {
+    var element = angular.scenario.dsl.element;
+    var html;
+    beforeEach(function() {
+      html = '<div class="container">' +
+          '<table class="reports-detail">' +
+            '<span class="desc">Description : ' +
+              '<span ng:bind="report.description">Details...</span>' +
+            '</span>' +
+            '<span>Date created: ' +
+              '<span ng:bind="report.creationDate">01/01/01</span>' +
+            '</span>' +
+          '</table>' +
+        '</div>';
+    });
+    it('should find elements on the page and provide jquery api', function() {
+      var future = element('.reports-detail');
+      expect(future.name).toEqual("Find element '.reports-detail'");
+      executeFuture(future, html, function(value) { future.fulfill(value); });
+      expect(future.fulfilled).toBeTruthy();
+      expect(future.value.text()).
+        toEqual('Description : Details...Date created: 01/01/01');
+      expect(future.value.find('.desc').text()).
+        toEqual('Description : Details...');
+    });
+    it('should know how to find ng:bind elements on page', function() {
+      var future = element('.reports-detail');
+      expect(future.name).toEqual("Find element '.reports-detail'");
+      executeFuture(future, html, function(value) { future.fulfill(value); });
+      expect(future.fulfilled).toBeTruthy();
+      expect(future.value.boundTo('report.description')).toEqual('Details...');
+      expect(future.value.boundTo('report.creationDate')).toEqual('01/01/01');
+      expect(future.value.boundTo('doesnotexist')).not.toBeDefined();
     });
   });
 });