X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Findex.html;h=6409ee121172746f5861d7a33551ff98d999dedd;hb=25885e07b2683601a20481d614d282ded419793e;hp=2b0b685fccd47f8529e2307ef250d1e991a07e06;hpb=0a755f6ab38d36ffda02f9ff5a6d606c24a94baa;p=jquery.git

diff --git a/test/index.html b/test/index.html
index 2b0b685..6409ee1 100644
--- a/test/index.html
+++ b/test/index.html
@@ -3,11 +3,19 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title>jQuery Test Suite</title>
-	<link rel="Stylesheet" media="screen" href="data/testsuite.css" />
-	<script>var jQuery = "jQuery", $ = "$"; // For testing .noConflict()</script>
+	<link rel="Stylesheet" media="screen" href="qunit/testsuite.css" />
+	<!-- Includes -->
+	<script type="text/javascript">
+		var jQuery = this.jQuery || "jQuery", // For testing .noConflict()
+			$ = this.$ || "$",
+			originaljQuery = jQuery,
+			original$ = $;
+	</script>
 	<script type="text/javascript" src="../dist/jquery.js"></script>
+	<script type="text/javascript" src="qunit/testrunner.js"></script>
 	<script type="text/javascript" src="data/testrunner.js"></script>
 	<script type="text/javascript" src="unit/core.js"></script>
+	<script type="text/javascript" src="unit/dimensions.js"></script>
 	<script type="text/javascript" src="unit/selector.js"></script>
 	<script type="text/javascript" src="unit/event.js"></script>
 	<script type="text/javascript" src="unit/ajax.js"></script>
@@ -20,7 +28,11 @@
 	<h2 id="userAgent"></h2>
 	
 	<!-- Test HTML -->
-	<div id="nothiddendiv" style="height:1px;background:white;"></div>
+	<div id="nothiddendiv" style="height:1px;background:white;">
+		<div id="nothiddendivchild"></div>
+	</div>
+	<!-- this iframe is outside the #main so it won't reload constantly wasting time, but it means the tests must be "safe" and clean up after themselves -->
+	<iframe id="loadediframe" name="loadediframe" style="display:none;" src="data/iframe.html"></iframe>
 	<dl id="dl" style="display:none;">
 	<div id="main" style="display: none;">
 		<p id="firstp">See <a id="simon1" href="http://simon.incutio.com/archive/2003/03/25/#getElementsBySelector" rel="bookmark">this blog entry</a> for more information.</p>
@@ -59,22 +71,23 @@
 			<textarea id="area1" maxlength="30">foobar</textarea>
 			
 			<select name="select1" id="select1">
-				<option id="option1a" value="">Nothing</option>
+				<option id="option1a" class="emptyopt" value="">Nothing</option>
 				<option id="option1b" value="1">1</option>
 				<option id="option1c" value="2">2</option>
 				<option id="option1d" value="3">3</option>
 			</select>
 			<select name="select2" id="select2">
-				<option id="option2a" value="">Nothing</option>
+				<option id="option2a" class="emptyopt" value="">Nothing</option>
 				<option id="option2b" value="1">1</option>
 				<option id="option2c" value="2">2</option>
 				<option id="option2d" selected="selected" value="3">3</option>
 			</select>
 			<select name="select3" id="select3" multiple="multiple">
-				<option id="option3a" value="">Nothing</option>
+				<option id="option3a" class="emptyopt" value="">Nothing</option>
 				<option id="option3b" selected="selected" value="1">1</option>
 				<option id="option3c" selected="selected" value="2">2</option>
 				<option id="option3d" value="3">3</option>
+				<option id="option3e">no value</option>
 			</select>
 			
 			<object id="object1" codebase="stupid">
@@ -151,7 +164,7 @@ Z</textarea>
 			</select>
 			<input type="submit" name="sub1" value="NO" />
 			<input type="submit" name="sub2" value="NO" />
-			<input type="image" name="sub3" value="NO" src="submit.gif" />
+			<input type="image" name="sub3" value="NO" />
 			<button name="sub4" type="submit" value="NO">NO</button>
 			<input name="D1" type="text" value="NO" disabled="disabled" />
 			<input type="checkbox" checked="checked" disabled="disabled" name="D2" value="NO" />
@@ -169,6 +182,10 @@ Z</textarea>
 					<input type="checkbox" name="checkedtestcheckboxes" />
 				</div>
 			</form>
+			<div id="nonnodes"><span>hi</span> there <!-- mon ami --></div>
+			<div id="t2037">
+				<div><div class="hidden">hidden</div></div>
+			</div>
 		</div>
 	</div>
 	</dl>
