From 09f571986525dd353a80d9f205fb8969cf37edff Mon Sep 17 00:00:00 2001
From: John Bender <john.m.bender@gmail.com>
Date: Sun, 27 Feb 2011 00:00:14 -0800
Subject: [PATCH] moved checkbox tests under immediate function and simplified
 fixture html

---
 .../unit/checkboxradio/checkboxradio_core.js  | 44 ++++++++++---------
 tests/unit/checkboxradio/index.html           | 26 +----------
 2 files changed, 24 insertions(+), 46 deletions(-)

diff --git a/tests/unit/checkboxradio/checkboxradio_core.js b/tests/unit/checkboxradio/checkboxradio_core.js
index 222b70d1..490c55c7 100644
--- a/tests/unit/checkboxradio/checkboxradio_core.js
+++ b/tests/unit/checkboxradio/checkboxradio_core.js
@@ -1,27 +1,29 @@
 /*
  * mobile page unit tests
  */
-module('jquery.mobile.forms.checkboxradio.js');
+(function($){
+	module('jquery.mobile.forms.checkboxradio.js');
 
-test( "widget can be disabled and enabled", function(){
-	var input = $("#checkbox-1");
-	var button = input.parent().find(".ui-btn");
+	test( "widget can be disabled and enabled", function(){
+		var input = $("#checkbox-1");
+		var button = input.parent().find(".ui-btn");
 
-	input.checkboxradio("disable");
-	input.checkboxradio("enable");
-	ok(!input.attr("disabled"), "start input as enabled");
-	ok(!input.parent().hasClass("ui-disabled"), "no disabled styles");
-	ok(!input.attr("checked"), "not checked before click");
-	button.trigger("mouseup");
-	ok(input.attr("checked"), "checked after click");
-	ok(button.hasClass("ui-btn-active"), "active styles after click");
-	button.trigger("mouseup");
+		input.checkboxradio("disable");
+		input.checkboxradio("enable");
+		ok(!input.attr("disabled"), "start input as enabled");
+		ok(!input.parent().hasClass("ui-disabled"), "no disabled styles");
+		ok(!input.attr("checked"), "not checked before click");
+		button.trigger("mouseup");
+		ok(input.attr("checked"), "checked after click");
+		ok(button.hasClass("ui-btn-active"), "active styles after click");
+		button.trigger("mouseup");
 
-	input.checkboxradio("disable");
-	ok(input.attr("disabled"), "input disabled");
-	ok(input.parent().hasClass("ui-disabled"), "disabled styles");
-	ok(!input.attr("checked"), "not checked before click");
-	button.trigger("mouseup");
-	ok(!input.attr("checked"), "not checked after click");
-	ok(!button.hasClass("ui-btn-active"), "no active styles after click");
-});
+		input.checkboxradio("disable");
+		ok(input.attr("disabled"), "input disabled");
+		ok(input.parent().hasClass("ui-disabled"), "disabled styles");
+		ok(!input.attr("checked"), "not checked before click");
+		button.trigger("mouseup");
+		ok(!input.attr("checked"), "not checked after click");
+		ok(!button.hasClass("ui-btn-active"), "no active styles after click");
+	});
+})(jQuery);
\ No newline at end of file
diff --git a/tests/unit/checkboxradio/index.html b/tests/unit/checkboxradio/index.html
index 4226db16..3117aa6e 100644
--- a/tests/unit/checkboxradio/index.html
+++ b/tests/unit/checkboxradio/index.html
@@ -5,33 +5,9 @@
 	<title>jQuery Mobile Page Test Suite</title>
 
 	<script type="text/javascript" src="../../../js/jquery.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.ui.widget.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.widget.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.media.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.support.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.event.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.hashchange.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.core.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.navigation.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.page.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.fixHeaderFooter.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.forms.checkboxradio.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.forms.textinput.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.forms.select.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.buttonMarkup.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.forms.button.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.forms.slider.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.collapsible.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.controlGroup.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.fieldContain.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.listview.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.listview.filter.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.dialog.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.navbar.js"></script>
-	<script type="text/javascript" src="../../../js/jquery.mobile.grid.js"></script>
+	<script type="text/javascript" src="../../../js/"></script>
 	<script type="text/javascript" src="../../../tests/jquery.testHelper.js"></script>
 
-
 	<link rel="stylesheet" href="../../../external/qunit.css" type="text/css"/>
 	<script type="text/javascript" src="../../../external/qunit.js"></script>