Provide all jquery functions as futures

This commit is contained in:
Shyam Seshadri 2010-08-14 03:05:50 +08:00 committed by Shyam Seshadri
parent 9260f4867a
commit 60eeeb9f20
2 changed files with 42 additions and 23 deletions

View file

@ -102,18 +102,30 @@ angular.scenario.dsl.repeater = function(selector) {
}; };
angular.scenario.dsl.element = function(selector) { angular.scenario.dsl.element = function(selector) {
var nameSuffix = "element '" + selector + "'"; var namePrefix = "Element '" + selector + "'";
return $scenario.addFuture('Find ' + nameSuffix, function(done) { var futureJquery = {};
var self = this, repeaterArray = [], ngBindPattern; for (key in _jQuery.fn) {
var startIndex = selector.search(angular.scenario.dsl.NG_BIND_PATTERN); (function(){
if (startIndex >= 0) { var jqFnName = key;
ngBindPattern = selector.substring(startIndex + 2, selector.length - 2); var jqFn = _jQuery.fn[key];
var element = this.testDocument.find('*').filter(function() { futureJquery[key] = function() {
return self.jQuery(this).attr('ng:bind') == ngBindPattern; var jqArgs = arguments;
}); return $scenario.addFuture(namePrefix + "." + jqFnName + "()",
done(element); function(done) {
} else { var self = this, repeaterArray = [], ngBindPattern;
done(this.testDocument.find(selector)); 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(jqFn.apply(element, jqArgs));
} else {
done(jqFn.apply(this.testDocument.find(selector), jqArgs));
}
});
};
})();
}
return futureJquery;
}; };

View file

@ -159,20 +159,27 @@ describe("DSL", function() {
expect(future.fulfilled).toBeTruthy(); expect(future.fulfilled).toBeTruthy();
} }
it('should find elements on the page and provide jquery api', function() { it('should find elements on the page and provide jquery api', function() {
var future = element('.reports-detail'); var future = element('.reports-detail').text();
expect(future.name).toEqual("Find element '.reports-detail'"); expect(future.name).toEqual("Element '.reports-detail'.text()");
timeTravel(future); timeTravel(future);
expect(future.value.text()). expect(future.value).
toEqual('Description : Details...Date created: 01/01/01'); toEqual('Description : Details...Date created: 01/01/01');
expect(future.value.find('.desc').text()). // expect(future.value.find('.desc').text()).
toEqual('Description : Details...'); // toEqual('Description : Details...');
}); });
it('should find elements with angular syntax', function() { it('should find elements with angular syntax', function() {
var future = element('{{report.description}}'); var future = element('{{report.description}}').text();
expect(future.name).toEqual("Find element '{{report.description}}'"); expect(future.name).toEqual("Element '{{report.description}}'.text()");
timeTravel(future); timeTravel(future);
expect(future.value.text()).toEqual('Details...'); expect(future.value).toEqual('Details...');
expect(future.value.attr('ng:bind')).toEqual('report.description'); // 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("Element '.link-class'.click()");
executeFuture(future, html, function(value) { future.fulfill(value); });
expect(future.fulfilled).toBeTruthy();
// TODO(rajat): look for some side effect from click happening?
}); });
}); });
}); });