Changeset 13127

Timestamp:

03/18/08 04:26:50 (10 months ago)

Author:

bill

Message:

Workaround IE6's overzealous caching. It was caching URL's even though they had parameters (?delay=3000), thus throwing off the timing tests. Fixes #5992.

Files:

• dijit/trunk/tests/layout/ContentPane.html (modified) (4 diffs)

dijit/trunk/tests/layout/ContentPane.html

@@ -57 +57 @@
                                                 name: "clear_content",
                                                 setUp: function(t){
-                                                        pane2 = new dijit.layout.ContentPane({}, dojo.byId("pane2"));
+                                                        pane2 = new dijit.layout.ContentPane({
+                                                                preventCache: true
+                                                        }, dojo.byId("pane2"));
                                                         pane2.setContent();// pass undefined on purpose
                                                 },
@@ -263 +265 @@
                                                         return d;
 
-                                                }
-                                        },
-                                        {
-                                                name: "preventCache",
-                                                timeout:1800,
-                                                setUp: function(t){
-                                                        pane2.setContent();
-                                                },
-                                                runTest: function(t){
-                                                        var def = pane2.preventCache;
-                                                        t.assertFalse(def);
-
-                                                        pane2.preventCache = true;
-
-                                                        pane2.setHref("getResponse.php?bounceGetStr=1&message="+encodeURI('initial'));
-                                                        var d = new t.Deferred();
-                                                        setTimeout(d.getTestCallback(
-                                                                function(){
-                                                                        var getStr = dojo.byId('bouncedGetStr');
-                                                                        t.assertTrue(getStr.innerHTML.indexOf('preventCache=') > -1);
-                                                                }
-                                                        ), 1500);
-
-                                                        pane2.preventCache = def;
-                                                        return d;
-                                                },
-                                                tearDown: function(t){
-                                                        pane2.preventCache = false;
                                                 }
                                         },
@@ -483 +457 @@
 
                                                         st.addChild(new dijit.TestWidget());
-                                                        pane3 = new dijit.layout.ContentPane({href:'getResponse.php?delay=300&message=Loaded!'}, dojo.doc.createElement('div'));
+                                                        pane3 = new dijit.layout.ContentPane({
+                                                                href:'getResponse.php?delay=300&message=Loaded!',
+                                                                preventCache: true
+                                                        }, dojo.doc.createElement('div'));
                                                         st.addChild(pane3);
 
@@ -554 +531 @@
                                                 runTest: function(t){
                                                         var href = 'getResponse.php?message=Loaded!'
-                                                        var pane4 = new dijit.layout.ContentPane({href:href}, dojo.doc.createElement('div'));
+                                                        var pane4 = new dijit.layout.ContentPane({
+                                                                href:href,
+                                                                preventCache: true
+                                                        }, dojo.doc.createElement('div'));
 
                                                         dojo.place(pane4.domNode, pane3.domNode, 'after');