From 2767d7773f2e480552e9968eded31bd2b08bec71 Mon Sep 17 00:00:00 2001 From: Shyam Seshadri Date: Fri, 13 Aug 2010 09:45:56 -0700 Subject: Revert click dsl, since what is returned by element is a jquery object --- src/scenario/DSL.js | 35 ++++++++++++----------------------- test/scenario/DSLSpec.js | 7 ------- 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? - }); }); }); -- cgit v1.2.3