Significantly clean up the way the scenario DSL works and implement many more DSL statements.

- "this" always means the current chain scope inside a DSL

- addFutureAction callbacks now take ($window, $document, done)

- $document has a special method elements() that uses the currently selected nodes in the document as defined by using() statements.

- $document.elements() allows placeholder insertion into selectors to make them more readable.
  ex. $document.elements('input[name="$1"]', myVar) will substitute the value of myVar for $1 in the selector. Subsequent arguments are $2 and so on.

- $document.elements() results have a special method trigger(event) which should be used to events. This method implements some hacks to make sure browser UI controls update and the correct angular events fire.

- futures now allow custom formatting. By default any chain that results in a future can use toJson() or fromJson() to convert the future value to and from json. A custom parser can be provided with parsedWith(fn) where fn is a callback(value) that must return the parsed result.

Note: The entire widgets.html UI is now able to be controlled and asserted through DSL statements!!! Victory! :)

1 files changed, 4 insertions, 13 deletions

diff --git a/test/scenario/SpecRunnerSpec.js b/test/scenario/SpecRunnerSpec.js
index 0926c3f8..e62bb392 100644
--- a/test/scenario/SpecRunnerSpec.js
+++ b/test/scenario/SpecRunnerSpec.js
@@ -42,7 +42,7 @@ function ApplicationMock($window) {
 }
 ApplicationMock.prototype = {
   executeAction: function(callback) {
-    callback.call(this.$window);
+    callback.call(this.$window, _jQuery(this.$window.document), this.$window);
   }
 };
 
@@ -59,15 +59,15 @@ describe('angular.scenario.SpecRunner', function() {
 
   it('should bind futures to the spec', function() {
     runner.addFuture('test future', function(done) {
-      this.application.value = 10;
+      this.value = 10;
       done();
     });
     runner.futures[0].execute(angular.noop);
-    expect(runner.application.value).toEqual(10);
+    expect(runner.value).toEqual(10);
   });
 
   it('should pass done to future action behavior', function() {
-    runner.addFutureAction('test future', function(done) {
+    runner.addFutureAction('test future', function($window, $document, done) {
       expect(angular.isFunction(done)).toBeTruthy();
       done(10, 20);
     });
@@ -77,15 +77,6 @@ describe('angular.scenario.SpecRunner', function() {
     });
   });
 
-  it('should pass execute future action on the $window', function() {
-    runner.addFutureAction('test future', function(done) {
-      this.test = 'test value';
-      done();
-    });
-    runner.futures[0].execute(angular.noop);
-    expect($window.test).toEqual('test value');
-  });
-
   it('should execute spec function and notify UI', function() {
     var finished = false;
     var ui = new UIMock();