diff options
| author | Igor Minar | 2011-09-15 00:42:17 +0200 |
|---|---|---|
| committer | Igor Minar | 2011-09-16 02:44:31 +0200 |
| commit | f9b6b614683c14a0b636a21bafb6932ab4a8aca4 (patch) | |
| tree | e2bb9a614e7fbd8a0e202b776927136641bcc027 | |
| parent | 555f4152909e1c0bd5400737a62dc5d63ecd32d3 (diff) | |
| download | angular.js-f9b6b614683c14a0b636a21bafb6932ab4a8aca4.tar.bz2 | |
fix(scenario dsl): jQuery getters must have no value
jQuery now requires getter methods to have no value at all -
they do arguments.length check to identify getters vs setters.
| -rw-r--r-- | src/scenario/dsl.js | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/scenario/dsl.js b/src/scenario/dsl.js index 946f56d3..c51dbb74 100644 --- a/src/scenario/dsl.js +++ b/src/scenario/dsl.js @@ -343,26 +343,28 @@ angular.scenario.dsl('element', function() { angular.forEach(KEY_VALUE_METHODS, function(methodName) { chain[methodName] = function(name, value) { - var futureName = "element '" + this.label + "' get " + methodName + " '" + name + "'"; - if (angular.isDefined(value)) { - futureName = "element '" + this.label + "' set " + methodName + " '" + name + "' to " + "'" + value + "'"; - } + var args = arguments, + futureName = (args.length == 1) + ? "element '" + this.label + "' get " + methodName + " '" + name + "'" + : "element '" + this.label + "' set " + methodName + " '" + name + "' to " + "'" + value + "'"; + return this.addFutureAction(futureName, function($window, $document, done) { var element = $document.elements(); - done(null, element[methodName].call(element, name, value)); + done(null, element[methodName].apply(element, args)); }); }; }); angular.forEach(VALUE_METHODS, function(methodName) { chain[methodName] = function(value) { - var futureName = "element '" + this.label + "' " + methodName; - if (angular.isDefined(value)) { - futureName = "element '" + this.label + "' set " + methodName + " to '" + value + "'"; - } + var args = arguments, + futureName = (args.length == 0) + ? "element '" + this.label + "' " + methodName + : futureName = "element '" + this.label + "' set " + methodName + " to '" + value + "'"; + return this.addFutureAction(futureName, function($window, $document, done) { var element = $document.elements(); - done(null, element[methodName].call(element, value)); + done(null, element[methodName].apply(element, args)); }); }; }); |
