diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/scenario/DSL.js | 14 | ||||
| -rw-r--r-- | src/scenario/Runner.js | 1 |
2 files changed, 9 insertions, 6 deletions
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, {}); |
