aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorjeresig <jeresig@gmail.com>2009-12-18 12:41:53 -0500
committerjeresig <jeresig@gmail.com>2009-12-18 12:41:53 -0500
commitd40083c866738727aa7ffd7f13d2955bc9575d5e (patch)
treebe83f2130432bc8f8e500813ef6f33f62f836823 /test
parent148fb7ba8e992dd70c64cdc6a1c6f643fd1ba160 (diff)
downloadjquery-d40083c866738727aa7ffd7f13d2955bc9575d5e.tar.gz
jquery-d40083c866738727aa7ffd7f13d2955bc9575d5e.zip
Disabled the passthrough .attr(method_name) functionality. You can now use it if you do: .attr({method_name: value}, true) OR as an easy initialization method: jQuery('<div/>', {html: '...', id: 'test'}).
Diffstat (limited to 'test')
-rw-r--r--test/unit/attributes.js12
-rw-r--r--test/unit/core.js18
2 files changed, 23 insertions, 7 deletions
diff --git a/test/unit/attributes.js b/test/unit/attributes.js
index cb489804d..2a3d1e1f2 100644
--- a/test/unit/attributes.js
+++ b/test/unit/attributes.js
@@ -5,7 +5,7 @@ var functionReturningObj = function(value) { return (function() { return value;
test("attr(String)", function() {
expect(28);
-
+
// This one sometimes fails randomly ?!
equals( jQuery('#text1').attr('value'), "Test", 'Check for value attribute' );
@@ -190,16 +190,16 @@ test("attr(jquery_method)", function(){
elem = $elem[0];
// one at a time
- $elem.attr('html', 'foo');
+ $elem.attr({'html': 'foo'}, true);
equals( elem.innerHTML, 'foo', 'attr(html)');
- $elem.attr('text', 'bar');
+ $elem.attr({'text': 'bar'}, true);
equals( elem.innerHTML, 'bar', 'attr(text)');
- $elem.attr('css', {color:'red'});
+ $elem.attr({'css': {color:'red'}}, true);
ok( /^(#ff0000|red)$/i.test(elem.style.color), 'attr(css)');
- $elem.attr('height', 10);
+ $elem.attr({'height': 10}, true);
equals( elem.style.height, '10px', 'attr(height)');
// Multiple attributes
@@ -207,7 +207,7 @@ test("attr(jquery_method)", function(){
$elem.attr({
width:10,
css:{ paddingLeft:1, paddingRight:1 }
- });
+ }, true);
equals( elem.style.width, '10px', 'attr({...})');
equals( elem.style.paddingLeft, '1px', 'attr({...})');
diff --git a/test/unit/core.js b/test/unit/core.js
index 1e03c96c0..1888e555a 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -12,7 +12,7 @@ test("Basic requirements", function() {
});
test("jQuery()", function() {
- expect(15);
+ expect(22);
// Basic constructor's behavior
@@ -62,6 +62,22 @@ test("jQuery()", function() {
equals( jQuery([1,2,3]).get(1), 2, "Test passing an array to the factory" );
equals( jQuery(document.body).get(0), jQuery('body').get(0), "Test passing an html node to the factory" );
+
+ var elem = jQuery("<div/>", {
+ width: 10,
+ css: { paddingLeft:1, paddingRight:1 },
+ text: "test",
+ "class": "test2",
+ id: "test3"
+ });
+
+ equals( elem[0].style.width, '10px', 'jQuery() quick setter width');
+ equals( elem[0].style.paddingLeft, '1px', 'jQuery quick setter css');
+ equals( elem[0].style.paddingRight, '1px', 'jQuery quick setter css');
+ equals( elem[0].childNodes.length, 1, 'jQuery quick setter text');
+ equals( elem[0].firstChild.nodeValue, "test", 'jQuery quick setter text');
+ equals( elem[0].className, "test2", 'jQuery() quick setter class');
+ equals( elem[0].id, "test3", 'jQuery() quick setter id');
});
test("selector state", function() {