From e7e894a2e36e042be6d62af56b0f3126f4e4fc77 Mon Sep 17 00:00:00 2001
From: Elliott Sprehn
Date: Mon, 18 Oct 2010 14:02:18 -0700
Subject: 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! :)
---
 test/scenario/ApplicationSpec.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'test/scenario/ApplicationSpec.js')

diff --git a/test/scenario/ApplicationSpec.js b/test/scenario/ApplicationSpec.js
index 706fbc36..2fb9881f 100644
--- a/test/scenario/ApplicationSpec.js
+++ b/test/scenario/ApplicationSpec.js
@@ -18,20 +18,21 @@ describe('angular.scenario.Application', function() {
       testDocument = $document;
     });
     app.navigateTo('http://www.google.com/');
-    app.executeAction(function($document, $window) {
+    app.executeAction(function($window, $document) {
       expect($window).not.toEqual(testWindow);
       expect($document).not.toEqual(testDocument);
     });
   });
 
-  it('should execute callback on $window of frame', function() {
+  it('should execute callback with correct arguments', function() {
     var testWindow = {document: {}};
     app.getWindow = function() { 
       return testWindow; 
     };
-    app.executeAction(function($document, $window) {
-      expect(this).toEqual($window);
-      expect(this).toEqual(testWindow);
+    app.executeAction(function($window, $document) {
+      expect(this).toEqual(app);
+      expect($document).toEqual(_jQuery($window.document));
+      expect($window).toEqual(testWindow);
     });
   });
   
@@ -52,7 +53,7 @@ describe('angular.scenario.Application', function() {
   
   it('should call onload handler when frame loads', function() {
     var called;
-    app.getFrame = function() { 
+    app.getFrame = function() {
       // Mock a little jQuery
       var result = {
         remove: function() { 
-- 
cgit v1.2.3