X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Feffects.js;h=aca9263840d92d2bdfd1a21be5c77944d7f85aad;hb=efaf375e56920c9699c3d4ef09fb9171352aa8bb;hp=6baa0f62d8025bada17888fa69d98e15e4ab0269;hpb=40aa95c32097b0bc669ea5b1e127717b54b0335a;p=jquery.git

diff --git a/test/unit/effects.js b/test/unit/effects.js
index 6baa0f6..aca9263 100644
--- a/test/unit/effects.js
+++ b/test/unit/effects.js
@@ -6,7 +6,32 @@ test("sanity check", function() {
 });
 
 test("show()", function() {
-	expect(23);
+	expect(28);
+
+	var hiddendiv = jQuery("div.hidden");
+
+	hiddendiv.hide().show();
+
+	equals( hiddendiv.css("display"), "block", "Make sure a pre-hidden div is visible." );
+
+	var div = jQuery("<div>").hide().appendTo("body").show();
+
+	equal( div.css("display"), "block", "Make sure pre-hidden divs show" );
+
+	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("#main div");
 	div.show().each(function(){
 		if ( this.style.display == "none" ) pass = false;
@@ -105,6 +130,41 @@ test("show(Number) - other displays", function() {
 	});
 });
 
+
+
+//  Supports #7397
+test("Persist correct display value", function() {
+  expect(4);
+	QUnit.reset();
+	stop();
+
+	// #show-tests * is set display: none in CSS
+	jQuery("#main").append('<div id="show-tests"><span style="position:absolute;"></span></div>');
+  
+	var $span = jQuery("#show-tests span"),  
+	  orig = $span.css("display"),
+		num = 0;
+		
+  equal(orig, "none", "Expecting to start at display: none");
+
+  $span.text('Saving...').fadeIn(100, function() {
+
+    equal($span.css("display"), "block", "Expecting display: block");
+
+    $span.text('Saved!').fadeOut(100, function () {
+  
+      equal($span.css("display"), "none", "Expecting display: none");
+      
+      $span.text('Saving...').fadeIn(100, function() {
+      
+        equal($span.css("display"), "block", "Expecting display: block");
+      
+        start();
+      });
+    });
+  });
+});
+
 test("animate(Hash, Object, Function)", function() {
 	expect(1);
 	stop();
@@ -729,6 +789,13 @@ test("Chain slideToggle out", function() {
 	jQuery('#slidetoggleout div').saveState(jQuery.support.shrinkWrapBlocks).slideToggle('fast').slideToggle('fast',jQuery.checkState);
 });
 
+test("Chain fadeToggle in", function() {
+	jQuery('#fadetogglein div').saveState().fadeToggle('fast').fadeToggle('fast',jQuery.checkState);
+});
+test("Chain fadeToggle out", function() {
+	jQuery('#fadetoggleout div').saveState().fadeToggle('fast').fadeToggle('fast',jQuery.checkState);
+});
+
 test("Chain fadeTo 0.5 1.0 with easing and callback)", function() {
 	jQuery('#fadeto div').saveState().fadeTo('fast',0.5).fadeTo('fast',1.0,'linear',jQuery.checkState);
 });