aboutsummaryrefslogtreecommitdiffstats
path: root/test/unit
diff options
context:
space:
mode:
authorRichard Gibson <richard.gibson@gmail.com>2012-05-28 22:25:04 -0400
committerDave Methvin <dave.methvin@gmail.com>2012-05-28 22:36:23 -0400
commit7f2cc46955b35dc3d5a0526d0cb038d4a50b936b (patch)
treee2a4e841e16f90c93118130ec93319013eb3f08f /test/unit
parent82d4c72fb15edd91869afa01a5bca3af678852fb (diff)
downloadjquery-7f2cc46955b35dc3d5a0526d0cb038d4a50b936b.tar.gz
jquery-7f2cc46955b35dc3d5a0526d0cb038d4a50b936b.zip
Fix #11767. Modularize build and unit tests for exluding effects.
Closes gh-785. To build a version of jQuery without effects, use `grunt build:*:*:-effects`. The unit tests feature-check for the interfaces and skip the unit tests for effects if they don't detect it.
Diffstat (limited to 'test/unit')
-rw-r--r--test/unit/css.js184
-rw-r--r--test/unit/effects.js108
-rw-r--r--test/unit/queue.js113
3 files changed, 249 insertions, 156 deletions
diff --git a/test/unit/css.js b/test/unit/css.js
index ac531f1e0..5e9e109bb 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -411,6 +411,179 @@ test("css(Object) where values are Functions with incoming values", function() {
jQuery("#cssFunctionTest").remove();
});
+test("show(); hide()", function() {
+ expect(22);
+
+ var hiddendiv = jQuery("div.hidden");
+ hiddendiv.hide();
+ equal( hiddendiv.css("display"), "none", "Non-detached div hidden" );
+ hiddendiv.show();
+ equal( hiddendiv.css("display"), "block", "Pre-hidden div shown" );
+
+ var div = jQuery("<div>").hide();
+ equal( div.css("display"), "none", "Detached div hidden" );
+ div.appendTo("#qunit-fixture").show();
+ equal( div.css("display"), "block", "Pre-hidden div shown" );
+
+ QUnit.reset();
+
+ hiddendiv = jQuery("div.hidden");
+
+ equal(jQuery.css( hiddendiv[0], "display"), "none", "hiddendiv is display: none");
+
+ hiddendiv.css("display", "block");
+ equal(jQuery.css( hiddendiv[0], "display"), "block", "hiddendiv is display: block");
+
+ hiddendiv.show();
+ equal(jQuery.css( hiddendiv[0], "display"), "block", "hiddendiv is display: block");
+
+ hiddendiv.css("display","");
+
+ var pass = true;
+ div = jQuery("#qunit-fixture div");
+ div.show().each(function(){
+ if ( this.style.display == "none" ) pass = false;
+ });
+ ok( pass, "Show" );
+
+ // #show-tests * is set display: none in CSS
+ jQuery("#qunit-fixture").append("<div id='show-tests'><div><p><a href='#'></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div><table id='test-table'></table>");
+
+ var old = jQuery("#test-table").show().css("display") !== "table";
+ jQuery("#test-table").remove();
+
+ var test = {
+ "div" : "block",
+ "p" : "block",
+ "a" : "inline",
+ "code" : "inline",
+ "pre" : "block",
+ "span" : "inline",
+ "table" : old ? "block" : "table",
+ "thead" : old ? "block" : "table-header-group",
+ "tbody" : old ? "block" : "table-row-group",
+ "tr" : old ? "block" : "table-row",
+ "th" : old ? "block" : "table-cell",
+ "td" : old ? "block" : "table-cell",
+ "ul" : "block",
+ "li" : old ? "block" : "list-item"
+ };
+
+ jQuery.each(test, function(selector, expected) {
+ var elem = jQuery(selector, "#show-tests").show();
+ equal( elem.css("display"), expected, "Show using correct display type for " + selector );
+ });
+
+ // Make sure that showing or hiding a text node doesn't cause an error
+ jQuery("<div>test</div> text <span>test</span>").show().remove();
+ jQuery("<div>test</div> text <span>test</span>").hide().remove();
+});
+
+test("show() resolves correct default display #8099", function() {
+ expect(7);
+ var tt8099 = jQuery("<tt/>").appendTo("body"),
+ dfn8099 = jQuery("<dfn/>", { html: "foo"}).appendTo("body");
+
+ equal( tt8099.css("display"), "none", "default display override for all tt" );
+ equal( tt8099.show().css("display"), "inline", "Correctly resolves display:inline" );
+
+ equal( jQuery("#foo").hide().show().css("display"), "block", "Correctly resolves display:block after hide/show" );
+
+ equal( tt8099.hide().css("display"), "none", "default display override for all tt" );
+ equal( tt8099.show().css("display"), "inline", "Correctly resolves display:inline" );
+
+ equal( dfn8099.css("display"), "none", "default display override for all dfn" );
+ equal( dfn8099.show().css("display"), "inline", "Correctly resolves display:inline" );
+
+ tt8099.remove();
+ dfn8099.remove();
+});
+
+test( "show() resolves correct default display, detached nodes (#10006)", function(){
+ // Tests originally contributed by Orkel in
+ // https://github.com/jquery/jquery/pull/458
+ expect( 11 );
+
+ var div, span;
+
+ div = jQuery("<div class='hidden'>");
+ div.show().appendTo("#qunit-fixture");
+ equal( div.css("display"), "block", "Make sure a detached, pre-hidden( through stylesheets ) div is visible." );
+
+ div = jQuery("<div style='display: none'>");
+ div.show().appendTo("#qunit-fixture");
+ equal( div.css("display"), "block", "Make sure a detached, pre-hidden( through inline style ) div is visible." );
+
+ span = jQuery("<span class='hidden'/>");
+ span.show().appendTo("#qunit-fixture");
+ equal( span.css("display"), "inline", "Make sure a detached, pre-hidden( through stylesheets ) span has default display." );
+
+ span = jQuery("<span style='display: inline'/>");
+ span.show().appendTo("#qunit-fixture");
+ equal( span.css("display"), "inline", "Make sure a detached, pre-hidden( through inline style ) span has default display." );
+
+ div = jQuery("<div><div class='hidden'></div></div>").children("div");
+ div.show().appendTo("#qunit-fixture");
+ equal( div.css("display"), "block", "Make sure a detached, pre-hidden( through stylesheets ) div inside another visible div is visible." );
+
+ div = jQuery("<div><div style='display: none'></div></div>").children("div");
+ div.show().appendTo("#qunit-fixture");
+ equal( div.css("display"), "block", "Make sure a detached, pre-hidden( through inline style ) div inside another visible div is visible." );
+
+ div = jQuery("div.hidden");
+ div.detach().show();
+ equal( div.css("display"), "block", "Make sure a detached( through detach() ), pre-hidden div is visible." );
+ div.remove();
+
+ span = jQuery("<span>");
+ span.appendTo("#qunit-fixture").detach().show().appendTo("#qunit-fixture" );
+ equal( span.css("display"), "inline", "Make sure a detached( through detach() ), pre-hidden span has default display." );
+ span.remove();
+
+ div = jQuery("<div>");
+ div.show().appendTo("#qunit-fixture");
+ ok( !!div.get( 0 ).style.display, "Make sure not hidden div has a inline style." );
+
+ div = jQuery( document.createElement("div") );
+ div.show().appendTo("#qunit-fixture");
+ equal( div.css("display"), "block", "Make sure a pre-created element has default display." );
+
+ div = jQuery("<div style='display: inline'/>");
+ div.show().appendTo("#qunit-fixture");
+ equal( div.css("display"), "inline", "Make sure that element has same display when it was created." );
+});
+
+test("toggle()", function() {
+ expect(6);
+ var x = jQuery("#foo");
+ ok( x.is(":visible"), "is visible" );
+ x.toggle();
+ ok( x.is(":hidden"), "is hidden" );
+ x.toggle();
+ ok( x.is(":visible"), "is visible again" );
+
+ x.toggle(true);
+ ok( x.is(":visible"), "is visible" );
+ x.toggle(false);
+ ok( x.is(":hidden"), "is hidden" );
+ x.toggle(true);
+ ok( x.is(":visible"), "is visible again" );
+});
+
+test("hide hidden elements (bug #7141)", function() {
+ expect(3);
+ QUnit.reset();
+
+ var div = jQuery("<div style='display:none'></div>").appendTo("#qunit-fixture");
+ equal( div.css("display"), "none", "Element is hidden by default" );
+ div.hide();
+ ok( !jQuery._data(div, "olddisplay"), "olddisplay is undefined after hiding an already-hidden element" );
+ div.show();
+ equal( div.css("display"), "block", "Show a double-hidden element" );
+
+ div.remove();
+});
+
test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", function () {
expect(4);
@@ -545,13 +718,8 @@ test("percentage position properties in IE<9 should not be incorrectly transform
});
test("Do not append px to 'fill-opacity' #9548", 1, function() {
-
- var $div = jQuery("<div>").appendTo("#qunit-fixture");
-
- $div.css("fill-opacity", 0).animate({ "fill-opacity": 1.0 }, 0, function () {
- equal( jQuery(this).css("fill-opacity"), 1, "Do not append px to 'fill-opacity'");
- });
-
+ var $div = jQuery("<div>").appendTo("#qunit-fixture").css("fill-opacity", 1);
+ equal( $div.css("fill-opacity"), 1, "Do not append px to 'fill-opacity'");
});
test("outerWidth(true) and css('margin') returning % instead of px in Webkit, see #10639", function() {
@@ -609,4 +777,4 @@ test( "cssHooks - expand", function() {
});
-}); \ No newline at end of file
+});
diff --git a/test/unit/effects.js b/test/unit/effects.js
index a2645b106..2b1cff3d3 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -1,3 +1,5 @@
+if ( jQuery.fx ) {
+
module("effects", { teardown: moduleTeardown });
test("sanity check", function() {
@@ -6,7 +8,7 @@ test("sanity check", function() {
});
test("show()", function() {
- expect(28);
+ expect(26);
var hiddendiv = jQuery("div.hidden");
@@ -42,7 +44,6 @@ test("show()", function() {
var speeds = {
"null speed": null,
"undefined speed": undefined,
- "empty string speed": "",
"false speed": false
};
@@ -167,82 +168,6 @@ test("Persist correct display value", function() {
});
});
-test("show() resolves correct default display #8099", function() {
- expect(7);
- var tt8099 = jQuery("<tt/>").appendTo("body"),
- dfn8099 = jQuery("<dfn/>", { html: "foo"}).appendTo("body");
-
- equal( tt8099.css("display"), "none", "default display override for all tt" );
- equal( tt8099.show().css("display"), "inline", "Correctly resolves display:inline" );
-
- equal( jQuery("#foo").hide().show().css("display"), "block", "Correctly resolves display:block after hide/show" );
-
- equal( tt8099.hide().css("display"), "none", "default display override for all tt" );
- equal( tt8099.show().css("display"), "inline", "Correctly resolves display:inline" );
-
- equal( dfn8099.css("display"), "none", "default display override for all dfn" );
- equal( dfn8099.show().css("display"), "inline", "Correctly resolves display:inline" );
-
- tt8099.remove();
- dfn8099.remove();
-
-});
-
-test( "show() resolves correct default display, detached nodes (#10006)", function(){
- // Tests originally contributed by Orkel in
- // https://github.com/jquery/jquery/pull/458
- expect( 11 );
-
- var div, span;
-
- div = jQuery("<div class='hidden'>");
- div.show().appendTo("#qunit-fixture");
- equal( div.css("display"), "block", "Make sure a detached, pre-hidden( through stylesheets ) div is visible." );
-
- div = jQuery("<div style='display: none'>");
- div.show().appendTo("#qunit-fixture");
- equal( div.css("display"), "block", "Make sure a detached, pre-hidden( through inline style ) div is visible." );
-
- span = jQuery("<span class='hidden'/>");
- span.show().appendTo("#qunit-fixture");
- equal( span.css("display"), "inline", "Make sure a detached, pre-hidden( through stylesheets ) span has default display." );
-
- span = jQuery("<span style='display: inline'/>");
- span.show().appendTo("#qunit-fixture");
- equal( span.css("display"), "inline", "Make sure a detached, pre-hidden( through inline style ) span has default display." );
-
- div = jQuery("<div><div class='hidden'></div></div>").children("div");
- div.show().appendTo("#qunit-fixture");
- equal( div.css("display"), "block", "Make sure a detached, pre-hidden( through stylesheets ) div inside another visible div is visible." );
-
- div = jQuery("<div><div style='display: none'></div></div>").children("div");
- div.show().appendTo("#qunit-fixture");
- equal( div.css("display"), "block", "Make sure a detached, pre-hidden( through inline style ) div inside another visible div is visible." );
-
- div = jQuery("div.hidden");
- div.detach().show();
- equal( div.css("display"), "block", "Make sure a detached( through detach() ), pre-hidden div is visible." );
- div.remove();
-
- span = jQuery("<span>");
- span.appendTo("#qunit-fixture").detach().show().appendTo("#qunit-fixture" );
- equal( span.css("display"), "inline", "Make sure a detached( through detach() ), pre-hidden span has default display." );
- span.remove();
-
- div = jQuery("<div>");
- div.show().appendTo("#qunit-fixture");
- ok( !!div.get( 0 ).style.display, "Make sure not hidden div has a inline style." );
-
- div = jQuery( document.createElement("div") );
- div.show().appendTo("#qunit-fixture");
- equal( div.css("display"), "block", "Make sure a pre-created element has default display." );
-
- div = jQuery("<div style='display: inline'/>");
- div.show().appendTo("#qunit-fixture");
- equal( div.css("display"), "inline", "Make sure that element has same display when it was created." );
-});
-
-
test("animate(Hash, Object, Function)", function() {
expect(1);
stop();
@@ -480,7 +405,6 @@ asyncTest( "animate option { queue: true }", function() {
notEqual( foo.queue().length, 0, "Default queue is not empty" );
});
-
asyncTest( "animate option { queue: 'name' }", function() {
expect( 5 );
var foo = jQuery( "#foo" ),
@@ -1295,20 +1219,6 @@ test("animate with CSS shorthand properties", function(){
});
});
-test("hide hidden elements (bug #7141)", function() {
- expect(3);
- QUnit.reset();
-
- var div = jQuery("<div style='display:none'></div>").appendTo("#qunit-fixture");
- equal( div.css("display"), "none", "Element is hidden by default" );
- div.hide();
- ok( !jQuery._data(div, "olddisplay"), "olddisplay is undefined after hiding an already-hidden element" );
- div.show();
- equal( div.css("display"), "block", "Show a double-hidden element" );
-
- div.remove();
-});
-
test("hide hidden elements, with animation (bug #7141)", function() {
expect(3);
QUnit.reset();
@@ -1437,6 +1347,14 @@ test("animate will scale margin properties individually", function() {
start();
});
+test("Do not append px to 'fill-opacity' #9548", 1, function() {
+ var $div = jQuery("<div>").appendTo("#qunit-fixture");
+
+ $div.css("fill-opacity", 0).animate({ "fill-opacity": 1.0 }, 0, function () {
+ equal( jQuery(this).css("fill-opacity"), 1, "Do not append px to 'fill-opacity'");
+ });
+});
+
// Start 1.8 Animation tests
asyncTest( "jQuery.Animation( object, props, opts )", 1, function() {
var testObject = {
@@ -1708,4 +1626,6 @@ asyncTest( "multiple unqueued and promise", 4, function() {
strictEqual( step++, 4, "Step 4" );
start();
});
-}); \ No newline at end of file
+});
+
+} // if ( jQuery.fx ) \ No newline at end of file
diff --git a/test/unit/queue.js b/test/unit/queue.js
index 6a614edb6..fac74f906 100644
--- a/test/unit/queue.js
+++ b/test/unit/queue.js
@@ -101,11 +101,13 @@ test("callbacks keep their place in the queue", function() {
div.queue(function( next ) {
equal( ++counter, 1, "Queue/callback order: first called" );
setTimeout( next, 200 );
- }).show(100, function() {
+ }).delay( 100 ).queue(function( next ) {
equal( ++counter, 2, "Queue/callback order: second called" );
- jQuery(this).hide(100, function() {
+ jQuery( this ).delay( 100 ).queue(function( next ) {
equal( ++counter, 4, "Queue/callback order: fourth called" );
+ next();
});
+ next();
}).queue(function( next ) {
equal( ++counter, 3, "Queue/callback order: third called" );
next();
@@ -133,44 +135,6 @@ test("delay()", function() {
equal( run, 0, "The delay delayed the next function from running." );
});
-test("delay() can be stopped", function() {
- expect( 3 );
- stop();
-
- var foo = jQuery({}), run = 0;
-
- foo
- .queue( "alternate", function( next ) {
- run++;
- ok( true, "This first function was dequeued" );
- next();
- })
- .delay( 1000, "alternate" )
- .queue( "alternate", function() {
- run++;
- ok( true, "The function was dequeued immediately, the delay was stopped" );
- })
- .dequeue( "alternate" )
-
- // stop( "alternate", false ) will NOT clear the queue, so it should automatically dequeue the next
- .stop( "alternate", false, false )
-
- // this test
- .delay( 1000 )
- .queue(function() {
- run++;
- ok( false, "This queue should never run" );
- })
-
- // stop( clearQueue ) should clear the queue
- .stop( true, false );
-
- equal( run, 2, "Queue ran the proper functions" );
-
- setTimeout( start, 2000 );
-});
-
-
test("clearQueue(name) clears the queue", function() {
expect(2);
@@ -265,22 +229,63 @@ test( ".promise(obj)", function() {
strictEqual( promise, obj, ".promise(type, obj) returns obj" );
});
-asyncTest( "queue stop hooks", 2, function() {
- var foo = jQuery( "#foo" );
- foo.queue( function( next, hooks ) {
- hooks.stop = function( gotoEnd ) {
- equal( !!gotoEnd, false, "Stopped without gotoEnd" );
- };
+if ( jQuery.fn.stop ) {
+ test("delay() can be stopped", function() {
+ expect( 3 );
+ stop();
+
+ var foo = jQuery({}), run = 0;
+
+ foo
+ .queue( "alternate", function( next ) {
+ run++;
+ ok( true, "This first function was dequeued" );
+ next();
+ })
+ .delay( 1000, "alternate" )
+ .queue( "alternate", function() {
+ run++;
+ ok( true, "The function was dequeued immediately, the delay was stopped" );
+ })
+ .dequeue( "alternate" )
+
+ // stop( "alternate", false ) will NOT clear the queue, so it should automatically dequeue the next
+ .stop( "alternate", false, false )
+
+ // this test
+ .delay( 1000 )
+ .queue(function() {
+ run++;
+ ok( false, "This queue should never run" );
+ })
+
+ // stop( clearQueue ) should clear the queue
+ .stop( true, false );
+
+ equal( run, 2, "Queue ran the proper functions" );
+
+ setTimeout( start, 2000 );
});
- foo.stop();
- foo.queue( function( next, hooks ) {
- hooks.stop = function( gotoEnd ) {
- equal( gotoEnd, true, "Stopped with gotoEnd" );
- start();
- };
+ asyncTest( "queue stop hooks", 2, function() {
+ var foo = jQuery( "#foo" );
+
+ foo.queue( function( next, hooks ) {
+ hooks.stop = function( gotoEnd ) {
+ equal( !!gotoEnd, false, "Stopped without gotoEnd" );
+ };
+ });
+ foo.stop();
+
+ foo.queue( function( next, hooks ) {
+ hooks.stop = function( gotoEnd ) {
+ equal( gotoEnd, true, "Stopped with gotoEnd" );
+ start();
+ };
+ });
+
+ foo.stop( false, true );
});
- foo.stop( false, true );
-});
+} // if ( jQuery.fn.stop ) \ No newline at end of file