aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShyam Seshadri2010-08-14 00:45:56 +0800
committerMisko Hevery2010-08-13 10:13:03 -0700
commit1f230bf3f55fc8541423dfa9fc0bc91f50c000a3 (patch)
tree4367aa6d53832db608a0de2df9d3b42a5ffc97db
parent669d8241b2ea61122aee3e45f67694e65596a2dd (diff)
downloadangular.js-1f230bf3f55fc8541423dfa9fc0bc91f50c000a3.tar.bz2
Revert click dsl, since what is returned by element is a jquery object
-rw-r--r--src/scenario/DSL.js35
-rw-r--r--test/scenario/DSLSpec.js7
2 files changed, 12 insertions, 30 deletions
diff --git a/src/scenario/DSL.js b/src/scenario/DSL.js
index ca944014..a64f8548 100644
--- a/src/scenario/DSL.js
+++ b/src/scenario/DSL.js
@@ -103,28 +103,17 @@ angular.scenario.dsl.repeater = function(selector) {
angular.scenario.dsl.element = function(selector) {
var nameSuffix = "element '" + selector + "'";
- return {
- find: function() {
- return $scenario.addFuture('Find ' + nameSuffix, function(done) {
- var self = this, repeaterArray = [], ngBindPattern;
- var startIndex = selector.search(angular.scenario.dsl.NG_BIND_PATTERN);
- if (startIndex >= 0) {
- ngBindPattern = selector.substring(startIndex + 2, selector.length - 2);
- var element = this.testDocument.find('*').filter(function() {
- return self.jQuery(this).attr('ng:bind') == ngBindPattern;
- });
- done(element);
- } else {
- done(this.testDocument.find(selector));
- }
- });
- },
- click: function() {
- var self = this;
- return $scenario.addFuture('Click ' + nameSuffix, function(done) {
- _jQuery(self).click();
- done();
- });
+ return $scenario.addFuture('Find ' + nameSuffix, function(done) {
+ var self = this, repeaterArray = [], ngBindPattern;
+ var startIndex = selector.search(angular.scenario.dsl.NG_BIND_PATTERN);
+ if (startIndex >= 0) {
+ ngBindPattern = selector.substring(startIndex + 2, selector.length - 2);
+ var element = this.testDocument.find('*').filter(function() {
+ return self.jQuery(this).attr('ng:bind') == ngBindPattern;
+ });
+ done(element);
+ } else {
+ done(this.testDocument.find(selector));
}
- };
+ });
};
diff --git a/test/scenario/DSLSpec.js b/test/scenario/DSLSpec.js
index 9bf6d31d..ccd9e32b 100644
--- a/test/scenario/DSLSpec.js
+++ b/test/scenario/DSLSpec.js
@@ -174,12 +174,5 @@ describe("DSL", function() {
expect(future.value.text()).toEqual('Details...');
expect(future.value.attr('ng:bind')).toEqual('report.description');
});
- it('should be able to click elements', function(){
- var future = element('.link-class').click();
- expect(future.name).toEqual("Click element '.link-class'");
- executeFuture(future, html, function(value) { future.fulfill(value); });
- expect(future.fulfilled).toBeTruthy();
- // TODO(rajat): look for some side effect from click happening?
- });
});
});