From 8d48c0b0041d79674a863c4b3f39b931aba35ca9 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Thu, 15 Jun 2017 15:10:32 -0400
Subject: [PATCH 01/31] (GH1972) fixes all eslint errors in checkbox-test in
 preparation for adding unit tests

---
 test/checkbox-test.js | 274 +++++++++++++++++++++---------------------
 1 file changed, 136 insertions(+), 138 deletions(-)

diff --git a/test/checkbox-test.js b/test/checkbox-test.js
index 4a25b87aa..ea799f82b 100644
--- a/test/checkbox-test.js
+++ b/test/checkbox-test.js
@@ -1,315 +1,313 @@
-/*global QUnit:false, module:false, test:false, asyncTest:false, expect:false*/
-/*global start:false, stop:false ok:false, equal:false, notEqual:false, deepEqual:false*/
-/*global notDeepEqual:false, strictEqual:false, notStrictEqual:false, raises:false*/
+/* global QUnit:false, module:false, test:false, asyncTest:false, expect:false */
+/* global start:false, stop:false ok:false, equal:false, notEqual:false, deepEqual:false */
+/* global notDeepEqual:false, strictEqual:false, notStrictEqual:false, raises:false */
 
-define( function ( require ) {
+define( function checkboxTest ( require ) {
 	var QUnit = require('qunit');
-	var $ = require( "jquery" );
-	var html = require( "text!test/markup/checkbox-markup.html!strip" );
+	var $ = require( 'jquery' );
+	var html = require( 'text!test/markup/checkbox-markup.html!strip' );
 	/* FOR DEV TESTING - uncomment to test against index.html */
 
-	//Html = require('text!index.html!strip');
-	html = $( "<div>" + html + "</div>" ).find( "#MyCheckboxContainer" );
+	// html = require('text!index.html!strip');
+	html = $( '<div>' + html + '</div>' ).find( '#MyCheckboxContainer' );
 
-	require( "bootstrap" );
-	require( "fuelux/checkbox" );
+	require( 'bootstrap' );
+	require( 'fuelux/checkbox' );
 
-	QUnit.module( "Fuel UX Checkbox" );
+	QUnit.module( 'Fuel UX Checkbox' );
 
-	QUnit.test( "should be defined on jquery object", function( assert ) {
-		assert.ok( $().checkbox, "checkbox method is defined" );
+	QUnit.test( 'should be defined on jquery object', function ( assert ) {
+		assert.ok( $().checkbox, 'checkbox method is defined' );
 	} );
 
-	QUnit.test( "should return element", function( assert ) {
-		var $chk1 = $( html ).find( "#Checkbox1" );
-		assert.ok( $chk1.checkbox() === $chk1, "checkbox should be initialized" );
+	QUnit.test( 'should return element', function ( assert ) {
+		var $chk1 = $( html ).find( '#Checkbox1' );
+		assert.ok( $chk1.checkbox() === $chk1, 'checkbox should be initialized' );
 	} );
 
-	QUnit.test( "should set initial state for checked/enabled", function( assert ) {
-		var $element = $( html ).find( "#CheckboxCheckedEnabled" ).clone();
+	QUnit.test( 'should set initial state for checked/enabled', function ( assert ) {
+		var $element = $( html ).find( '#CheckboxCheckedEnabled' ).clone();
 
 		// Initialize checkbox
-		$element.find( "label" ).checkbox();
+		$element.find( 'label' ).checkbox();
 
 		// Ensure label has checked class
-		var checked = $element.find( "label" ).hasClass( "checked" );
+		var checked = $element.find( 'label' ).hasClass( 'checked' );
 		assert.equal( checked, true, 'label has "checked" class when input is checked' );
 
 		// Ensure label does not have disabled class
-		var disabled = $element.find( "label" ).hasClass( "disabled" );
+		var disabled = $element.find( 'label' ).hasClass( 'disabled' );
 		assert.equal( disabled, false, 'label does not have "disabled" class when input is enabled' );
 	} );
 
-	QUnit.test( "should set initial state for checked/disabled", function( assert ) {
-		var $element = $( html ).find( "#CheckboxCheckedDisabled" ).clone();
+	QUnit.test( 'should set initial state for checked/disabled', function ( assert ) {
+		var $element = $( html ).find( '#CheckboxCheckedDisabled' ).clone();
 
 		// Initialize checkbox
-		$element.find( "label" ).checkbox();
+		$element.find( 'label' ).checkbox();
 
 		// Ensure label has checked class
-		var checked = $element.find( "label" ).hasClass( "checked" );
+		var checked = $element.find( 'label' ).hasClass( 'checked' );
 		assert.equal( checked, true, 'label has "checked" class when input is checked' );
 
 		// Ensure label has disabled class
-		var disabled = $element.find( "label" ).hasClass( "disabled" );
+		var disabled = $element.find( 'label' ).hasClass( 'disabled' );
 		assert.equal( disabled, true, 'label has "disabled" class when input is disabled' );
 	} );
 
-	QUnit.test( "should set initial state for unchecked/enabled", function( assert ) {
-		var $element = $( html ).find( "#CheckboxUncheckedEnabled" ).clone();
+	QUnit.test( 'should set initial state for unchecked/enabled', function ( assert ) {
+		var $element = $( html ).find( '#CheckboxUncheckedEnabled' ).clone();
 
 		// Initialize checkbox
-		$element.find( "label" ).checkbox();
+		$element.find( 'label' ).checkbox();
 
 		// Ensure label does not have checked class
-		var checked = $element.find( "label" ).hasClass( "checked" );
+		var checked = $element.find( 'label' ).hasClass( 'checked' );
 		assert.equal( checked, false, 'label does not have "checked" class when input is unchecked' );
 
 		// Ensure label does not have disabled class
-		var disabled = $element.find( "label" ).hasClass( "disabled" );
+		var disabled = $element.find( 'label' ).hasClass( 'disabled' );
 		assert.equal( disabled, false, 'label does not have "disabled" class when input is enabled' );
 	} );
 
-	QUnit.test( "should set initial state for unchecked/disabled", function( assert ) {
-		var $element = $( html ).find( "#CheckboxUncheckedDisabled" ).clone();
+	QUnit.test( 'should set initial state for unchecked/disabled', function ( assert ) {
+		var $element = $( html ).find( '#CheckboxUncheckedDisabled' ).clone();
 
 		// Initialize checkbox
-		$element.find( "label" ).checkbox();
+		$element.find( 'label' ).checkbox();
 
 		// Ensure label does not have checked class
-		var checked = $element.find( "label" ).hasClass( "checked" );
+		var checked = $element.find( 'label' ).hasClass( 'checked' );
 		assert.equal( checked, false, 'label does not have "checked" class when input is unchecked' );
 
 		// Ensure label has disabled class
-		var disabled = $element.find( "label" ).hasClass( "disabled" );
+		var disabled = $element.find( 'label' ).hasClass( 'disabled' );
 		assert.equal( disabled, true, 'label has "disabled" class when input is disabled' );
 	} );
 
-	QUnit.test( "should disable checkbox", function( assert ) {
-		var $element = $( html ).find( "#CheckboxUncheckedEnabled" ).clone();
+	QUnit.test( 'should disable checkbox', function ( assert ) {
+		var $element = $( html ).find( '#CheckboxUncheckedEnabled' ).clone();
 		var $input = $element.find( 'input[type="checkbox"]' );
 
 		// Initialize checkbox
-		var $chk = $element.find( "label" ).checkbox();
+		var $chk = $element.find( 'label' ).checkbox();
 
 		// Set disabled state
-		assert.equal( $input.prop( "disabled" ), false, "checkbox enabled initially" );
-		$chk.checkbox( "disable" );
-		assert.equal( $input.prop( "disabled" ), true, "checkbox disabled after calling disable method" );
+		assert.equal( $input.prop( 'disabled' ), false, 'checkbox enabled initially' );
+		$chk.checkbox( 'disable' );
+		assert.equal( $input.prop( 'disabled' ), true, 'checkbox disabled after calling disable method' );
 	} );
 
-	QUnit.test( "should enable checkbox", function( assert ) {
-		var $element = $( html ).find( "#CheckboxUncheckedDisabled" ).clone();
+	QUnit.test( 'should enable checkbox', function ( assert ) {
+		var $element = $( html ).find( '#CheckboxUncheckedDisabled' ).clone();
 		var $input = $element.find( 'input[type="checkbox"]' );
 
 		// Initialize checkbox
-		var $chk = $element.find( "label" ).checkbox();
+		var $chk = $element.find( 'label' ).checkbox();
 
 		// Set enabled state
-		assert.equal( $input.prop( "disabled" ), true, "checkbox disabled initially" );
-		$chk.checkbox( "enable" );
-		assert.equal( $input.prop( "disabled" ), false, "checkbox enabled after calling enable method" );
+		assert.equal( $input.prop( 'disabled' ), true, 'checkbox disabled initially' );
+		$chk.checkbox( 'enable' );
+		assert.equal( $input.prop( 'disabled' ), false, 'checkbox enabled after calling enable method' );
 	} );
 
-	QUnit.test( "should check checkbox", function( assert ) {
-		var $element = $( html ).find( "#CheckboxUncheckedEnabled" ).clone();
+	QUnit.test( 'should check checkbox', function ( assert ) {
+		var $element = $( html ).find( '#CheckboxUncheckedEnabled' ).clone();
 		var $input = $element.find( 'input[type="checkbox"]' );
 
 		// Initialize checkbox
-		var $chk = $element.find( "label" ).checkbox();
+		var $chk = $element.find( 'label' ).checkbox();
 
 		// Set checked state
-		assert.equal( $input.prop( "checked" ), false, "checkbox unchecked initially" );
-		$chk.checkbox( "check" );
-		assert.equal( $input.prop( "checked" ), true, "checkbox checked after calling check method" );
+		assert.equal( $input.prop( 'checked' ), false, 'checkbox unchecked initially' );
+		$chk.checkbox( 'check' );
+		assert.equal( $input.prop( 'checked' ), true, 'checkbox checked after calling check method' );
 	} );
 
-	QUnit.test( "should uncheck checkbox", function( assert ) {
-		var $element = $( html ).find( "#CheckboxCheckedEnabled" ).clone();
+	QUnit.test( 'should uncheck checkbox', function ( assert ) {
+		var $element = $( html ).find( '#CheckboxCheckedEnabled' ).clone();
 		var $input = $element.find( 'input[type="checkbox"]' );
 
 		// Initialize checkbox
-		var $chk = $element.find( "label" ).checkbox();
+		var $chk = $element.find( 'label' ).checkbox();
 
 		// Set checked state
-		assert.equal( $input.prop( "checked" ), true, "checkbox checked initially" );
-		$chk.checkbox( "uncheck" );
-		assert.equal( $input.prop( "checked" ), false, "checkbox unchecked after calling uncheck method" );
+		assert.equal( $input.prop( 'checked' ), true, 'checkbox checked initially' );
+		$chk.checkbox( 'uncheck' );
+		assert.equal( $input.prop( 'checked' ), false, 'checkbox unchecked after calling uncheck method' );
 	} );
 
-	QUnit.test( "should toggle checkbox", function( assert ) {
-		var $element = $( html ).find( "#CheckboxCheckedEnabled" ).clone();
+	QUnit.test( 'should toggle checkbox', function ( assert ) {
+		var $element = $( html ).find( '#CheckboxCheckedEnabled' ).clone();
 		var $input = $element.find( 'input[type="checkbox"]' );
 
 		// Initialize checkbox
-		var $chk = $element.find( "label" ).checkbox();
+		var $chk = $element.find( 'label' ).checkbox();
 
 		// Set checked state
-		assert.equal( $input.prop( "checked" ), true, "checkbox checked initially" );
-		$chk.checkbox( "toggle" );
-		assert.equal( $input.prop( "checked" ), false, "checkbox unchecked after calling toggle method" );
-		$chk.checkbox( "toggle" );
-		assert.equal( $input.prop( "checked" ), true, "checkbox checked after calling toggle method" );
-		$chk.checkbox( "toggle" );
-		assert.equal( $input.prop( "checked" ), false, "checkbox unchecked after calling toggle method" );
+		assert.equal( $input.prop( 'checked' ), true, 'checkbox checked initially' );
+		$chk.checkbox( 'toggle' );
+		assert.equal( $input.prop( 'checked' ), false, 'checkbox unchecked after calling toggle method' );
+		$chk.checkbox( 'toggle' );
+		assert.equal( $input.prop( 'checked' ), true, 'checkbox checked after calling toggle method' );
+		$chk.checkbox( 'toggle' );
+		assert.equal( $input.prop( 'checked' ), false, 'checkbox unchecked after calling toggle method' );
 	} );
 
-	QUnit.test( "should return checked state", function( assert ) {
-		var $element = $( html ).find( "#CheckboxCheckedEnabled" ).clone();
-		var $input = $element.find( 'input[type="checkbox"]' );
+	QUnit.test( 'should return checked state', function ( assert ) {
+		var $element = $( html ).find( '#CheckboxCheckedEnabled' ).clone();
 
 		// Initialize checkbox
-		var $chk = $element.find( "label" ).checkbox();
+		var $chk = $element.find( 'label' ).checkbox();
 
 		// Verify checked state changes with toggle method
-		assert.equal( $chk.checkbox( "isChecked" ), true, "checkbox state is checked" );
-		$chk.checkbox( "toggle" );
-		assert.equal( $chk.checkbox( "isChecked" ), false, "checkbox state is unchecked" );
-		$chk.checkbox( "toggle" );
-		assert.equal( $chk.checkbox( "isChecked" ), true, "checkbox state is checked" );
+		assert.equal( $chk.checkbox( 'isChecked' ), true, 'checkbox state is checked' );
+		$chk.checkbox( 'toggle' );
+		assert.equal( $chk.checkbox( 'isChecked' ), false, 'checkbox state is unchecked' );
+		$chk.checkbox( 'toggle' );
+		assert.equal( $chk.checkbox( 'isChecked' ), true, 'checkbox state is checked' );
 
 		// Verify checked state changes with uncheck method
-		$chk.checkbox( "uncheck" );
-		assert.equal( $chk.checkbox( "isChecked" ), false, "checkbox state is unchecked" );
+		$chk.checkbox( 'uncheck' );
+		assert.equal( $chk.checkbox( 'isChecked' ), false, 'checkbox state is unchecked' );
 
 		// Verify checked state changes with check method
-		$chk.checkbox( "check" );
-		assert.equal( $chk.checkbox( "isChecked" ), true, "checkbox state is checked" );
+		$chk.checkbox( 'check' );
+		assert.equal( $chk.checkbox( 'isChecked' ), true, 'checkbox state is checked' );
 	} );
 
-	QUnit.test( "should support getValue alias", function( assert ) {
-		var $element = $( html ).find( "#CheckboxCheckedEnabled" ).clone();
-		var $input = $element.find( 'input[type="checkbox"]' );
+	QUnit.test( 'should support getValue alias', function ( assert ) {
+		var $element = $( html ).find( '#CheckboxCheckedEnabled' ).clone();
 
 		// Initialize checkbox
-		var $chk = $element.find( "label" ).checkbox();
+		var $chk = $element.find( 'label' ).checkbox();
 
 		// Verify alias aliases
-		assert.equal( $chk.checkbox( "isChecked" ), $chk.checkbox( "getValue" ), "getValue alias matches isChecked" );
-		$chk.checkbox( "toggle" );
-		assert.equal( $chk.checkbox( "isChecked" ), $chk.checkbox( "getValue" ), "getValue alias matches isChecked" );
-		$chk.checkbox( "toggle" );
-		assert.equal( $chk.checkbox( "isChecked" ), $chk.checkbox( "getValue" ), "getValue alias matches isChecked" );
+		assert.equal( $chk.checkbox( 'isChecked' ), $chk.checkbox( 'getValue' ), 'getValue alias matches isChecked' );
+		$chk.checkbox( 'toggle' );
+		assert.equal( $chk.checkbox( 'isChecked' ), $chk.checkbox( 'getValue' ), 'getValue alias matches isChecked' );
+		$chk.checkbox( 'toggle' );
+		assert.equal( $chk.checkbox( 'isChecked' ), $chk.checkbox( 'getValue' ), 'getValue alias matches isChecked' );
 	} );
 
-	QUnit.test( "should trigger checked event when calling check method", function( assert ) {
-		var $element = $( html ).find( "#CheckboxUncheckedEnabled" ).clone();
+	QUnit.test( 'should trigger checked event when calling check method', function ( assert ) {
+		var $element = $( html ).find( '#CheckboxUncheckedEnabled' ).clone();
 
 		// Initialize checkbox
-		var $chk = $element.find( "label" ).checkbox();
+		var $chk = $element.find( 'label' ).checkbox();
 
 		var triggered = false;
-		$chk.on( "checked.fu.checkbox", function() {
+		$chk.on( 'checked.fu.checkbox', function () {
 			triggered = true;
 		} );
 
-		$chk.checkbox( "check" );
+		$chk.checkbox( 'check' );
 
-		assert.equal( triggered, true, "checked event triggered" );
+		assert.equal( triggered, true, 'checked event triggered' );
 	} );
 
-	QUnit.test( "should trigger unchecked event when calling uncheck method", function( assert ) {
-		var $element = $( html ).find( "#CheckboxCheckedEnabled" ).clone();
+	QUnit.test( 'should trigger unchecked event when calling uncheck method', function ( assert ) {
+		var $element = $( html ).find( '#CheckboxCheckedEnabled' ).clone();
 
 		// Initialize checkbox
-		var $chk = $element.find( "label" ).checkbox();
+		var $chk = $element.find( 'label' ).checkbox();
 
 		var triggered = false;
-		$chk.on( "unchecked.fu.checkbox", function() {
+		$chk.on( 'unchecked.fu.checkbox', function () {
 			triggered = true;
 		} );
 
-		$chk.checkbox( "uncheck" );
+		$chk.checkbox( 'uncheck' );
 
-		assert.equal( triggered, true, "unchecked event triggered" );
+		assert.equal( triggered, true, 'unchecked event triggered' );
 	} );
 
-	QUnit.test( "should trigger changed event when calling checked/unchecked method", function( assert ) {
-		var $element = $( html ).find( "#CheckboxCheckedEnabled" ).clone();
+	QUnit.test( 'should trigger changed event when calling checked/unchecked method', function ( assert ) {
+		var $element = $( html ).find( '#CheckboxCheckedEnabled' ).clone();
 
 		// Initialize checkbox
-		var $chk = $element.find( "label" ).checkbox();
+		var $chk = $element.find( 'label' ).checkbox();
 
 		var triggered = false;
 		var state = false;
-		$chk.on( "changed.fu.checkbox", function( evt, data ) {
+		$chk.on( 'changed.fu.checkbox', function ( evt, data ) {
 			triggered = true;
 			state = data;
 		} );
 
-		$chk.checkbox( "uncheck" );
+		$chk.checkbox( 'uncheck' );
 
-		assert.equal( triggered, true, "changed event triggered" );
-		assert.equal( state, false, "changed event triggered passing correct state" );
+		assert.equal( triggered, true, 'changed event triggered' );
+		assert.equal( state, false, 'changed event triggered passing correct state' );
 	} );
 
-	QUnit.test( "should trigger changed event when clicking on input element", function( assert ) {
-		var $element = $( html ).find( "#CheckboxUncheckedEnabled" ).clone();
+	QUnit.test( 'should trigger changed event when clicking on input element', function ( assert ) {
+		var $element = $( html ).find( '#CheckboxUncheckedEnabled' ).clone();
 		var $input = $element.find( 'input[type="checkbox"]' );
 		$element.appendTo( document.body ); // Append to body to capture clicks
 
 		// Initialize checkbox
-		var $chk = $element.find( "label" ).checkbox();
+		$element.find( 'label' ).checkbox();
 
 		var triggered = false;
-		$element.on( "changed.fu.checkbox", function() {
+		$element.on( 'changed.fu.checkbox', function () {
 			triggered = true;
 		} );
 
 		$input.click();
-		assert.equal( triggered, true, "changed event triggered" );
+		assert.equal( triggered, true, 'changed event triggered' );
 
 		$element.remove();
 	} );
 
-	QUnit.test( "should trigger changed event when clicking on input element", function( assert ) {
-		var $element = $( html ).find( "#CheckboxUncheckedEnabled" ).clone();
+	QUnit.test( 'should trigger changed event when clicking on input element', function ( assert ) {
+		var $element = $( html ).find( '#CheckboxUncheckedEnabled' ).clone();
 		var $input = $element.find( 'input[type="checkbox"]' );
 		$element.appendTo( document.body ); // Append to body to capture clicks
 
 		// Initialize checkbox
-		var $chk = $element.find( "label" ).checkbox();
+		$element.find( 'label' ).checkbox();
 
 		var triggered = false;
-		$element.on( "changed.fu.checkbox", function() {
+		$element.on( 'changed.fu.checkbox', function () {
 			triggered = true;
 		} );
 
 		$input.click();
-		assert.equal( triggered, true, "changed event triggered" );
+		assert.equal( triggered, true, 'changed event triggered' );
 
 		$element.remove();
 	} );
 
-	QUnit.test( "should toggle checkbox container visibility", function( assert ) {
-		var $element = $( html ).find( "#CheckboxToggle" ).clone();
-		var $container = $element.find( ".checkboxToggle" );
+	QUnit.test( 'should toggle checkbox container visibility', function ( assert ) {
+		var $element = $( html ).find( '#CheckboxToggle' ).clone();
+		var $container = $element.find( '.checkboxToggle' );
 		$element.appendTo( document.body ); // Append to body to check visibility
 
 		// Initialize checkbox
-		var $chk = $element.find( "label" ).checkbox();
+		var $chk = $element.find( 'label' ).checkbox();
 
-		assert.equal( $container.is( ":visible" ), false, "toggle container hidden by default" );
-		$chk.checkbox( "check" );
-		assert.equal( $container.is( ":visible" ), true, "toggle container visible after check" );
-		$chk.checkbox( "uncheck" );
-		assert.equal( $container.is( ":visible" ), false, "toggle container hidden after uncheck" );
+		assert.equal( $container.is( ':visible' ), false, 'toggle container hidden by default' );
+		$chk.checkbox( 'check' );
+		assert.equal( $container.is( ':visible' ), true, 'toggle container visible after check' );
+		$chk.checkbox( 'uncheck' );
+		assert.equal( $container.is( ':visible' ), false, 'toggle container hidden after uncheck' );
 
 		$element.remove();
 	} );
 
-	QUnit.test( "should destroy checkbox", function( assert ) {
-		var $element = $( html ).find( "#CheckboxCheckedEnabled" ).clone();
+	QUnit.test( 'should destroy checkbox', function ( assert ) {
+		var $element = $( html ).find( '#CheckboxCheckedEnabled' ).clone();
 
 		// Initialize checkbox
-		var $chk = $element.find( "label" ).checkbox();
-		var originalMarkup = $element.find( "label" )[ 0 ].outerHTML;
+		var $chk = $element.find( 'label' ).checkbox();
+		var originalMarkup = $element.find( 'label' )[ 0 ].outerHTML;
 
-		assert.equal( $element.find( "#Checkbox1" ).length, 1, "checkbox exists in DOM by default" );
+		assert.equal( $element.find( '#Checkbox1' ).length, 1, 'checkbox exists in DOM by default' );
 
-		var markup = $chk.checkbox( "destroy" );
+		var markup = $chk.checkbox( 'destroy' );
 
-		assert.equal( originalMarkup, markup, "returned original markup" );
-		assert.equal( $element.find( "#Checkbox1" ).length, 0, "checkbox removed from DOM" );
+		assert.equal( originalMarkup, markup, 'returned original markup' );
+		assert.equal( $element.find( '#Checkbox1' ).length, 0, 'checkbox removed from DOM' );
 	} );
 } );

From 86f31db2ac73b8e6a5cfa4b44712f7439798c796 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Thu, 15 Jun 2017 15:25:31 -0400
Subject: [PATCH 02/31] (GH1972) fixes html lint error

---
 test/markup/tree-markup.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/markup/tree-markup.html b/test/markup/tree-markup.html
index ce3ead9a3..1c028f244 100644
--- a/test/markup/tree-markup.html
+++ b/test/markup/tree-markup.html
@@ -6,7 +6,7 @@
 	<label class="control-label">Items selectable only</label>
 	<div class="form-group">
 
-		<ul class="tree" id="MyTree" role="tree" aria-activedescendant="" aria-label="My Tree" aria-multiselectable=false>
+		<ul class="tree" id="MyTree" role="tree" aria-activedescendant="" aria-label="My Tree" aria-multiselectable="false">
 			<li class="tree-branch hidden" data-template="treebranch" role="treeitem" aria-expanded="false" aria-selected="false">
 				<div class="tree-branch-header">
 					<button type="button" class="tree-branch-name" tabindex="-1">
@@ -33,7 +33,7 @@
 			<li class="tree-loader hidden"><span role="alert">Loading...</span></li>
 		</ul>
 
-		<ul class="tree" id="MyTree2" role="tree" aria-activedescendant="" aria-label="My Tree 2" aria-multiselectable=false>
+		<ul class="tree" id="MyTree2" role="tree" aria-activedescendant="" aria-label="My Tree 2" aria-multiselectable="false">
 			<li class="tree-branch hidden" data-template="treebranch" role="treeitem" aria-expanded="false" aria-selected="false">
 				<div class="tree-branch-header">
 					<button type="button" class="tree-branch-name" tabindex="-1">
@@ -67,7 +67,7 @@
 	<label class="control-label">Folders selectable</label>
 	<div class="form-group">
 
-		<ul id="MyTreeSelectableFolder" class="tree tree-folder-select" role="tree" aria-activedescendant="" aria-label="My Tree Selectable" aria-multiselectable=false>
+		<ul id="MyTreeSelectableFolder" class="tree tree-folder-select" role="tree" aria-activedescendant="" aria-label="My Tree Selectable" aria-multiselectable="false">
 			<li class="tree-branch hidden" data-template="treebranch" role="treeitem" aria-expanded="false" aria-selected="false">
 				<div class="tree-branch-header">
 					<button type="button" class="tree-branch-name" tabindex="-1">

From 6cd5feefc700ca50fbd83be3b562d5e8c224ea05 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Thu, 15 Jun 2017 15:26:20 -0400
Subject: [PATCH 03/31] (GH1972) adds checkbox html to qunit fixture and begins
 structuring tests 'more correctly'

---
 test/checkbox-test.js          | 498 ++++++++++++++++-----------------
 test/checkbox-tests/helpers.js |  17 ++
 test/tests.js                  |  34 +--
 3 files changed, 282 insertions(+), 267 deletions(-)
 create mode 100644 test/checkbox-tests/helpers.js

diff --git a/test/checkbox-test.js b/test/checkbox-test.js
index ea799f82b..2451a40ca 100644
--- a/test/checkbox-test.js
+++ b/test/checkbox-test.js
@@ -5,309 +5,307 @@
 define( function checkboxTest ( require ) {
 	var QUnit = require('qunit');
 	var $ = require( 'jquery' );
-	var html = require( 'text!test/markup/checkbox-markup.html!strip' );
-	/* FOR DEV TESTING - uncomment to test against index.html */
-
-	// html = require('text!index.html!strip');
-	html = $( '<div>' + html + '</div>' ).find( '#MyCheckboxContainer' );
 
 	require( 'bootstrap' );
 	require( 'fuelux/checkbox' );
 
-	QUnit.module( 'Fuel UX Checkbox' );
 
-	QUnit.test( 'should be defined on jquery object', function ( assert ) {
-		assert.ok( $().checkbox, 'checkbox method is defined' );
-	} );
+	QUnit.module('Fuel UX Checkbox', {
+		beforeEach: require('./checkbox-tests/helpers').setup
+	}, function runCheckboxTests () {
+		QUnit.test( 'should be defined on jquery object', function ( assert ) {
+			assert.ok( $().checkbox, 'checkbox method is defined' );
+		} );
 
-	QUnit.test( 'should return element', function ( assert ) {
-		var $chk1 = $( html ).find( '#Checkbox1' );
-		assert.ok( $chk1.checkbox() === $chk1, 'checkbox should be initialized' );
-	} );
+		QUnit.test( 'should return element', function ( assert ) {
+			var $chk1 = this.$html.find( '#Checkbox1' );
+			assert.ok( $chk1.checkbox() === $chk1, 'checkbox should be initialized' );
+		} );
 
-	QUnit.test( 'should set initial state for checked/enabled', function ( assert ) {
-		var $element = $( html ).find( '#CheckboxCheckedEnabled' ).clone();
+		QUnit.test( 'should set initial state for checked/enabled', function ( assert ) {
+			var $element = this.$html.find( '#CheckboxCheckedEnabled' ).clone();
 
-		// Initialize checkbox
-		$element.find( 'label' ).checkbox();
+			// Initialize checkbox
+			$element.find( 'label' ).checkbox();
 
-		// Ensure label has checked class
-		var checked = $element.find( 'label' ).hasClass( 'checked' );
-		assert.equal( checked, true, 'label has "checked" class when input is checked' );
+			// Ensure label has checked class
+			var checked = $element.find( 'label' ).hasClass( 'checked' );
+			assert.equal( checked, true, 'label has "checked" class when input is checked' );
 
-		// Ensure label does not have disabled class
-		var disabled = $element.find( 'label' ).hasClass( 'disabled' );
-		assert.equal( disabled, false, 'label does not have "disabled" class when input is enabled' );
-	} );
+			// Ensure label does not have disabled class
+			var disabled = $element.find( 'label' ).hasClass( 'disabled' );
+			assert.equal( disabled, false, 'label does not have "disabled" class when input is enabled' );
+		} );
 
-	QUnit.test( 'should set initial state for checked/disabled', function ( assert ) {
-		var $element = $( html ).find( '#CheckboxCheckedDisabled' ).clone();
+		QUnit.test( 'should set initial state for checked/disabled', function ( assert ) {
+			var $element = this.$html.find( '#CheckboxCheckedDisabled' ).clone();
 
-		// Initialize checkbox
-		$element.find( 'label' ).checkbox();
+			// Initialize checkbox
+			$element.find( 'label' ).checkbox();
 
-		// Ensure label has checked class
-		var checked = $element.find( 'label' ).hasClass( 'checked' );
-		assert.equal( checked, true, 'label has "checked" class when input is checked' );
+			// Ensure label has checked class
+			var checked = $element.find( 'label' ).hasClass( 'checked' );
+			assert.equal( checked, true, 'label has "checked" class when input is checked' );
 
-		// Ensure label has disabled class
-		var disabled = $element.find( 'label' ).hasClass( 'disabled' );
-		assert.equal( disabled, true, 'label has "disabled" class when input is disabled' );
-	} );
+			// Ensure label has disabled class
+			var disabled = $element.find( 'label' ).hasClass( 'disabled' );
+			assert.equal( disabled, true, 'label has "disabled" class when input is disabled' );
+		} );
 
-	QUnit.test( 'should set initial state for unchecked/enabled', function ( assert ) {
-		var $element = $( html ).find( '#CheckboxUncheckedEnabled' ).clone();
+		QUnit.test( 'should set initial state for unchecked/enabled', function ( assert ) {
+			var $element = this.$html.find( '#CheckboxUncheckedEnabled' ).clone();
 
-		// Initialize checkbox
-		$element.find( 'label' ).checkbox();
+			// Initialize checkbox
+			$element.find( 'label' ).checkbox();
 
-		// Ensure label does not have checked class
-		var checked = $element.find( 'label' ).hasClass( 'checked' );
-		assert.equal( checked, false, 'label does not have "checked" class when input is unchecked' );
-
-		// Ensure label does not have disabled class
-		var disabled = $element.find( 'label' ).hasClass( 'disabled' );
-		assert.equal( disabled, false, 'label does not have "disabled" class when input is enabled' );
-	} );
-
-	QUnit.test( 'should set initial state for unchecked/disabled', function ( assert ) {
-		var $element = $( html ).find( '#CheckboxUncheckedDisabled' ).clone();
-
-		// Initialize checkbox
-		$element.find( 'label' ).checkbox();
+			// Ensure label does not have checked class
+			var checked = $element.find( 'label' ).hasClass( 'checked' );
+			assert.equal( checked, false, 'label does not have "checked" class when input is unchecked' );
 
-		// Ensure label does not have checked class
-		var checked = $element.find( 'label' ).hasClass( 'checked' );
-		assert.equal( checked, false, 'label does not have "checked" class when input is unchecked' );
+			// Ensure label does not have disabled class
+			var disabled = $element.find( 'label' ).hasClass( 'disabled' );
+			assert.equal( disabled, false, 'label does not have "disabled" class when input is enabled' );
+		} );
 
-		// Ensure label has disabled class
-		var disabled = $element.find( 'label' ).hasClass( 'disabled' );
-		assert.equal( disabled, true, 'label has "disabled" class when input is disabled' );
-	} );
-
-	QUnit.test( 'should disable checkbox', function ( assert ) {
-		var $element = $( html ).find( '#CheckboxUncheckedEnabled' ).clone();
-		var $input = $element.find( 'input[type="checkbox"]' );
-
-		// Initialize checkbox
-		var $chk = $element.find( 'label' ).checkbox();
-
-		// Set disabled state
-		assert.equal( $input.prop( 'disabled' ), false, 'checkbox enabled initially' );
-		$chk.checkbox( 'disable' );
-		assert.equal( $input.prop( 'disabled' ), true, 'checkbox disabled after calling disable method' );
-	} );
-
-	QUnit.test( 'should enable checkbox', function ( assert ) {
-		var $element = $( html ).find( '#CheckboxUncheckedDisabled' ).clone();
-		var $input = $element.find( 'input[type="checkbox"]' );
-
-		// Initialize checkbox
-		var $chk = $element.find( 'label' ).checkbox();
-
-		// Set enabled state
-		assert.equal( $input.prop( 'disabled' ), true, 'checkbox disabled initially' );
-		$chk.checkbox( 'enable' );
-		assert.equal( $input.prop( 'disabled' ), false, 'checkbox enabled after calling enable method' );
-	} );
-
-	QUnit.test( 'should check checkbox', function ( assert ) {
-		var $element = $( html ).find( '#CheckboxUncheckedEnabled' ).clone();
-		var $input = $element.find( 'input[type="checkbox"]' );
-
-		// Initialize checkbox
-		var $chk = $element.find( 'label' ).checkbox();
-
-		// Set checked state
-		assert.equal( $input.prop( 'checked' ), false, 'checkbox unchecked initially' );
-		$chk.checkbox( 'check' );
-		assert.equal( $input.prop( 'checked' ), true, 'checkbox checked after calling check method' );
-	} );
-
-	QUnit.test( 'should uncheck checkbox', function ( assert ) {
-		var $element = $( html ).find( '#CheckboxCheckedEnabled' ).clone();
-		var $input = $element.find( 'input[type="checkbox"]' );
-
-		// Initialize checkbox
-		var $chk = $element.find( 'label' ).checkbox();
-
-		// Set checked state
-		assert.equal( $input.prop( 'checked' ), true, 'checkbox checked initially' );
-		$chk.checkbox( 'uncheck' );
-		assert.equal( $input.prop( 'checked' ), false, 'checkbox unchecked after calling uncheck method' );
-	} );
-
-	QUnit.test( 'should toggle checkbox', function ( assert ) {
-		var $element = $( html ).find( '#CheckboxCheckedEnabled' ).clone();
-		var $input = $element.find( 'input[type="checkbox"]' );
-
-		// Initialize checkbox
-		var $chk = $element.find( 'label' ).checkbox();
-
-		// Set checked state
-		assert.equal( $input.prop( 'checked' ), true, 'checkbox checked initially' );
-		$chk.checkbox( 'toggle' );
-		assert.equal( $input.prop( 'checked' ), false, 'checkbox unchecked after calling toggle method' );
-		$chk.checkbox( 'toggle' );
-		assert.equal( $input.prop( 'checked' ), true, 'checkbox checked after calling toggle method' );
-		$chk.checkbox( 'toggle' );
-		assert.equal( $input.prop( 'checked' ), false, 'checkbox unchecked after calling toggle method' );
-	} );
-
-	QUnit.test( 'should return checked state', function ( assert ) {
-		var $element = $( html ).find( '#CheckboxCheckedEnabled' ).clone();
-
-		// Initialize checkbox
-		var $chk = $element.find( 'label' ).checkbox();
-
-		// Verify checked state changes with toggle method
-		assert.equal( $chk.checkbox( 'isChecked' ), true, 'checkbox state is checked' );
-		$chk.checkbox( 'toggle' );
-		assert.equal( $chk.checkbox( 'isChecked' ), false, 'checkbox state is unchecked' );
-		$chk.checkbox( 'toggle' );
-		assert.equal( $chk.checkbox( 'isChecked' ), true, 'checkbox state is checked' );
-
-		// Verify checked state changes with uncheck method
-		$chk.checkbox( 'uncheck' );
-		assert.equal( $chk.checkbox( 'isChecked' ), false, 'checkbox state is unchecked' );
-
-		// Verify checked state changes with check method
-		$chk.checkbox( 'check' );
-		assert.equal( $chk.checkbox( 'isChecked' ), true, 'checkbox state is checked' );
-	} );
-
-	QUnit.test( 'should support getValue alias', function ( assert ) {
-		var $element = $( html ).find( '#CheckboxCheckedEnabled' ).clone();
-
-		// Initialize checkbox
-		var $chk = $element.find( 'label' ).checkbox();
-
-		// Verify alias aliases
-		assert.equal( $chk.checkbox( 'isChecked' ), $chk.checkbox( 'getValue' ), 'getValue alias matches isChecked' );
-		$chk.checkbox( 'toggle' );
-		assert.equal( $chk.checkbox( 'isChecked' ), $chk.checkbox( 'getValue' ), 'getValue alias matches isChecked' );
-		$chk.checkbox( 'toggle' );
-		assert.equal( $chk.checkbox( 'isChecked' ), $chk.checkbox( 'getValue' ), 'getValue alias matches isChecked' );
-	} );
-
-	QUnit.test( 'should trigger checked event when calling check method', function ( assert ) {
-		var $element = $( html ).find( '#CheckboxUncheckedEnabled' ).clone();
-
-		// Initialize checkbox
-		var $chk = $element.find( 'label' ).checkbox();
-
-		var triggered = false;
-		$chk.on( 'checked.fu.checkbox', function () {
-			triggered = true;
+		QUnit.test( 'should set initial state for unchecked/disabled', function ( assert ) {
+			var $element = this.$html.find( '#CheckboxUncheckedDisabled' ).clone();
+
+			// Initialize checkbox
+			$element.find( 'label' ).checkbox();
+
+			// Ensure label does not have checked class
+			var checked = $element.find( 'label' ).hasClass( 'checked' );
+			assert.equal( checked, false, 'label does not have "checked" class when input is unchecked' );
+
+			// Ensure label has disabled class
+			var disabled = $element.find( 'label' ).hasClass( 'disabled' );
+			assert.equal( disabled, true, 'label has "disabled" class when input is disabled' );
 		} );
 
-		$chk.checkbox( 'check' );
+		QUnit.test( 'should disable checkbox', function ( assert ) {
+			var $element = this.$html.find( '#CheckboxUncheckedEnabled' ).clone();
+			var $input = $element.find( 'input[type="checkbox"]' );
 
-		assert.equal( triggered, true, 'checked event triggered' );
-	} );
+			// Initialize checkbox
+			var $chk = $element.find( 'label' ).checkbox();
+
+			// Set disabled state
+			assert.equal( $input.prop( 'disabled' ), false, 'checkbox enabled initially' );
+			$chk.checkbox( 'disable' );
+			assert.equal( $input.prop( 'disabled' ), true, 'checkbox disabled after calling disable method' );
+		} );
 
-	QUnit.test( 'should trigger unchecked event when calling uncheck method', function ( assert ) {
-		var $element = $( html ).find( '#CheckboxCheckedEnabled' ).clone();
+		QUnit.test( 'should enable checkbox', function ( assert ) {
+			var $element = this.$html.find( '#CheckboxUncheckedDisabled' ).clone();
+			var $input = $element.find( 'input[type="checkbox"]' );
 
-		// Initialize checkbox
-		var $chk = $element.find( 'label' ).checkbox();
+			// Initialize checkbox
+			var $chk = $element.find( 'label' ).checkbox();
 
-		var triggered = false;
-		$chk.on( 'unchecked.fu.checkbox', function () {
-			triggered = true;
+			// Set enabled state
+			assert.equal( $input.prop( 'disabled' ), true, 'checkbox disabled initially' );
+			$chk.checkbox( 'enable' );
+			assert.equal( $input.prop( 'disabled' ), false, 'checkbox enabled after calling enable method' );
 		} );
 
-		$chk.checkbox( 'uncheck' );
+		QUnit.test( 'should check checkbox', function ( assert ) {
+			var $element = this.$html.find( '#CheckboxUncheckedEnabled' ).clone();
+			var $input = $element.find( 'input[type="checkbox"]' );
 
-		assert.equal( triggered, true, 'unchecked event triggered' );
-	} );
+			// Initialize checkbox
+			var $chk = $element.find( 'label' ).checkbox();
 
-	QUnit.test( 'should trigger changed event when calling checked/unchecked method', function ( assert ) {
-		var $element = $( html ).find( '#CheckboxCheckedEnabled' ).clone();
+			// Set checked state
+			assert.equal( $input.prop( 'checked' ), false, 'checkbox unchecked initially' );
+			$chk.checkbox( 'check' );
+			assert.equal( $input.prop( 'checked' ), true, 'checkbox checked after calling check method' );
+		} );
+
+		QUnit.test( 'should uncheck checkbox', function ( assert ) {
+			var $element = this.$html.find( '#CheckboxCheckedEnabled' ).clone();
+			var $input = $element.find( 'input[type="checkbox"]' );
+
+			// Initialize checkbox
+			var $chk = $element.find( 'label' ).checkbox();
 
-		// Initialize checkbox
-		var $chk = $element.find( 'label' ).checkbox();
+			// Set checked state
+			assert.equal( $input.prop( 'checked' ), true, 'checkbox checked initially' );
+			$chk.checkbox( 'uncheck' );
+			assert.equal( $input.prop( 'checked' ), false, 'checkbox unchecked after calling uncheck method' );
+		} );
 
-		var triggered = false;
-		var state = false;
-		$chk.on( 'changed.fu.checkbox', function ( evt, data ) {
-			triggered = true;
-			state = data;
+		QUnit.test( 'should toggle checkbox', function ( assert ) {
+			var $element = this.$html.find( '#CheckboxCheckedEnabled' ).clone();
+			var $input = $element.find( 'input[type="checkbox"]' );
+
+			// Initialize checkbox
+			var $chk = $element.find( 'label' ).checkbox();
+
+			// Set checked state
+			assert.equal( $input.prop( 'checked' ), true, 'checkbox checked initially' );
+			$chk.checkbox( 'toggle' );
+			assert.equal( $input.prop( 'checked' ), false, 'checkbox unchecked after calling toggle method' );
+			$chk.checkbox( 'toggle' );
+			assert.equal( $input.prop( 'checked' ), true, 'checkbox checked after calling toggle method' );
+			$chk.checkbox( 'toggle' );
+			assert.equal( $input.prop( 'checked' ), false, 'checkbox unchecked after calling toggle method' );
 		} );
 
-		$chk.checkbox( 'uncheck' );
+		QUnit.test( 'should return checked state', function ( assert ) {
+			var $element = this.$html.find( '#CheckboxCheckedEnabled' ).clone();
 
-		assert.equal( triggered, true, 'changed event triggered' );
-		assert.equal( state, false, 'changed event triggered passing correct state' );
-	} );
+			// Initialize checkbox
+			var $chk = $element.find( 'label' ).checkbox();
 
-	QUnit.test( 'should trigger changed event when clicking on input element', function ( assert ) {
-		var $element = $( html ).find( '#CheckboxUncheckedEnabled' ).clone();
-		var $input = $element.find( 'input[type="checkbox"]' );
-		$element.appendTo( document.body ); // Append to body to capture clicks
+			// Verify checked state changes with toggle method
+			assert.equal( $chk.checkbox( 'isChecked' ), true, 'checkbox state is checked' );
+			$chk.checkbox( 'toggle' );
+			assert.equal( $chk.checkbox( 'isChecked' ), false, 'checkbox state is unchecked' );
+			$chk.checkbox( 'toggle' );
+			assert.equal( $chk.checkbox( 'isChecked' ), true, 'checkbox state is checked' );
 
-		// Initialize checkbox
-		$element.find( 'label' ).checkbox();
+			// Verify checked state changes with uncheck method
+			$chk.checkbox( 'uncheck' );
+			assert.equal( $chk.checkbox( 'isChecked' ), false, 'checkbox state is unchecked' );
 
-		var triggered = false;
-		$element.on( 'changed.fu.checkbox', function () {
-			triggered = true;
+			// Verify checked state changes with check method
+			$chk.checkbox( 'check' );
+			assert.equal( $chk.checkbox( 'isChecked' ), true, 'checkbox state is checked' );
 		} );
 
-		$input.click();
-		assert.equal( triggered, true, 'changed event triggered' );
+		QUnit.test( 'should support getValue alias', function ( assert ) {
+			var $element = this.$html.find( '#CheckboxCheckedEnabled' ).clone();
+
+			// Initialize checkbox
+			var $chk = $element.find( 'label' ).checkbox();
 
-		$element.remove();
-	} );
+			// Verify alias aliases
+			assert.equal( $chk.checkbox( 'isChecked' ), $chk.checkbox( 'getValue' ), 'getValue alias matches isChecked' );
+			$chk.checkbox( 'toggle' );
+			assert.equal( $chk.checkbox( 'isChecked' ), $chk.checkbox( 'getValue' ), 'getValue alias matches isChecked' );
+			$chk.checkbox( 'toggle' );
+			assert.equal( $chk.checkbox( 'isChecked' ), $chk.checkbox( 'getValue' ), 'getValue alias matches isChecked' );
+		} );
 
-	QUnit.test( 'should trigger changed event when clicking on input element', function ( assert ) {
-		var $element = $( html ).find( '#CheckboxUncheckedEnabled' ).clone();
-		var $input = $element.find( 'input[type="checkbox"]' );
-		$element.appendTo( document.body ); // Append to body to capture clicks
+		QUnit.test( 'should trigger checked event when calling check method', function ( assert ) {
+			var $element = this.$html.find( '#CheckboxUncheckedEnabled' ).clone();
 
-		// Initialize checkbox
-		$element.find( 'label' ).checkbox();
+			// Initialize checkbox
+			var $chk = $element.find( 'label' ).checkbox();
 
-		var triggered = false;
-		$element.on( 'changed.fu.checkbox', function () {
-			triggered = true;
+			var triggered = false;
+			$chk.on( 'checked.fu.checkbox', function () {
+				triggered = true;
+			} );
+
+			$chk.checkbox( 'check' );
+
+			assert.equal( triggered, true, 'checked event triggered' );
 		} );
 
-		$input.click();
-		assert.equal( triggered, true, 'changed event triggered' );
+		QUnit.test( 'should trigger unchecked event when calling uncheck method', function ( assert ) {
+			var $element = this.$html.find( '#CheckboxCheckedEnabled' ).clone();
 
-		$element.remove();
-	} );
+			// Initialize checkbox
+			var $chk = $element.find( 'label' ).checkbox();
 
-	QUnit.test( 'should toggle checkbox container visibility', function ( assert ) {
-		var $element = $( html ).find( '#CheckboxToggle' ).clone();
-		var $container = $element.find( '.checkboxToggle' );
-		$element.appendTo( document.body ); // Append to body to check visibility
+			var triggered = false;
+			$chk.on( 'unchecked.fu.checkbox', function () {
+				triggered = true;
+			} );
 
-		// Initialize checkbox
-		var $chk = $element.find( 'label' ).checkbox();
+			$chk.checkbox( 'uncheck' );
 
-		assert.equal( $container.is( ':visible' ), false, 'toggle container hidden by default' );
-		$chk.checkbox( 'check' );
-		assert.equal( $container.is( ':visible' ), true, 'toggle container visible after check' );
-		$chk.checkbox( 'uncheck' );
-		assert.equal( $container.is( ':visible' ), false, 'toggle container hidden after uncheck' );
+			assert.equal( triggered, true, 'unchecked event triggered' );
+		} );
 
-		$element.remove();
-	} );
+		QUnit.test( 'should trigger changed event when calling checked/unchecked method', function ( assert ) {
+			var $element = this.$html.find( '#CheckboxCheckedEnabled' ).clone();
 
-	QUnit.test( 'should destroy checkbox', function ( assert ) {
-		var $element = $( html ).find( '#CheckboxCheckedEnabled' ).clone();
+			// Initialize checkbox
+			var $chk = $element.find( 'label' ).checkbox();
 
-		// Initialize checkbox
-		var $chk = $element.find( 'label' ).checkbox();
-		var originalMarkup = $element.find( 'label' )[ 0 ].outerHTML;
+			var triggered = false;
+			var state = false;
+			$chk.on( 'changed.fu.checkbox', function ( evt, data ) {
+				triggered = true;
+				state = data;
+			} );
 
-		assert.equal( $element.find( '#Checkbox1' ).length, 1, 'checkbox exists in DOM by default' );
+			$chk.checkbox( 'uncheck' );
+
+			assert.equal( triggered, true, 'changed event triggered' );
+			assert.equal( state, false, 'changed event triggered passing correct state' );
+		} );
 
-		var markup = $chk.checkbox( 'destroy' );
+		QUnit.test( 'should trigger changed event when clicking on input element', function ( assert ) {
+			var $element = this.$html.find( '#CheckboxUncheckedEnabled' ).clone();
+			var $input = $element.find( 'input[type="checkbox"]' );
+			$element.appendTo( document.body ); // Append to body to capture clicks
 
-		assert.equal( originalMarkup, markup, 'returned original markup' );
-		assert.equal( $element.find( '#Checkbox1' ).length, 0, 'checkbox removed from DOM' );
-	} );
+			// Initialize checkbox
+			$element.find( 'label' ).checkbox();
+
+			var triggered = false;
+			$element.on( 'changed.fu.checkbox', function () {
+				triggered = true;
+			} );
+
+			$input.click();
+			assert.equal( triggered, true, 'changed event triggered' );
+
+			$element.remove();
+		} );
+
+		QUnit.test( 'should trigger changed event when clicking on input element', function ( assert ) {
+			var $element = this.$html.find( '#CheckboxUncheckedEnabled' ).clone();
+			var $input = $element.find( 'input[type="checkbox"]' );
+			$element.appendTo( document.body ); // Append to body to capture clicks
+
+			// Initialize checkbox
+			$element.find( 'label' ).checkbox();
+
+			var triggered = false;
+			$element.on( 'changed.fu.checkbox', function () {
+				triggered = true;
+			} );
+
+			$input.click();
+			assert.equal( triggered, true, 'changed event triggered' );
+
+			$element.remove();
+		} );
+
+		QUnit.test( 'should toggle checkbox container visibility', function ( assert ) {
+			var $element = this.$html.find( '#CheckboxToggle' ).clone();
+			var $container = $element.find( '.checkboxToggle' );
+			$element.appendTo( document.body ); // Append to body to check visibility
+
+			// Initialize checkbox
+			var $chk = $element.find( 'label' ).checkbox();
+
+			assert.equal( $container.is( ':visible' ), false, 'toggle container hidden by default' );
+			$chk.checkbox( 'check' );
+			assert.equal( $container.is( ':visible' ), true, 'toggle container visible after check' );
+			$chk.checkbox( 'uncheck' );
+			assert.equal( $container.is( ':visible' ), false, 'toggle container hidden after uncheck' );
+
+			$element.remove();
+		} );
+
+		QUnit.test( 'should destroy checkbox', function ( assert ) {
+			var $element = this.$html.find( '#CheckboxCheckedEnabled' ).clone();
+
+			// Initialize checkbox
+			var $chk = $element.find( 'label' ).checkbox();
+			var originalMarkup = $element.find( 'label' )[ 0 ].outerHTML;
+
+			assert.equal( $element.find( '#Checkbox1' ).length, 1, 'checkbox exists in DOM by default' );
+
+			var markup = $chk.checkbox( 'destroy' );
+
+			assert.equal( originalMarkup, markup, 'returned original markup' );
+			assert.equal( $element.find( '#Checkbox1' ).length, 0, 'checkbox removed from DOM' );
+		} );
+	});
 } );
diff --git a/test/checkbox-tests/helpers.js b/test/checkbox-tests/helpers.js
new file mode 100644
index 000000000..5286d5a7c
--- /dev/null
+++ b/test/checkbox-tests/helpers.js
@@ -0,0 +1,17 @@
+/* global QUnit:false, module:false, test:false, asyncTest:false, expect:false */
+/* global start:false, stop:false ok:false, equal:false, notEqual:false, deepEqual:false */
+/* global notDeepEqual:false, strictEqual:false, notStrictEqual:false, raises:false */
+define(function treeDataFactory (require) {
+	var $ = require('jquery');
+
+	var setup = function setup () {
+		var $fixture = $('#qunit-fixture');
+		this.html = require('text!test/markup/checkbox-markup.html!strip');
+		this.$html = $(this.html);
+		$fixture.append(this.$html);
+	};
+
+	return {
+		setup: setup
+	};
+});
diff --git a/test/tests.js b/test/tests.js
index dbca99213..be4858113 100644
--- a/test/tests.js
+++ b/test/tests.js
@@ -43,21 +43,21 @@ define(function testWrapper (require) {
 
 	require('moment');
 	require('./test/checkbox-test');
-	require('./test/combobox-test');
-	require('./test/datepicker-moment-test');
-	require('./test/infinite-scroll-test');
-	require('./test/loader-test');
-	require('./test/pillbox-test');
-	require('./test/placard-test');
-	require('./test/radio-test');
-	require('./test/repeater-test');
-	require('./test/repeater-list-test');
-	require('./test/repeater-thumbnail-test');
-	require('./test/scheduler-test');
-	require('./test/search-test');
-	require('./test/selectlist-test');
-	require('./test/spinbox-test');
-	require('./test/picker-test');
-	require('./test/tree-test');
-	require('./test/wizard-test');
+	// require('./test/combobox-test');
+	// require('./test/datepicker-moment-test');
+	// require('./test/infinite-scroll-test');
+	// require('./test/loader-test');
+	// require('./test/pillbox-test');
+	// require('./test/placard-test');
+	// require('./test/radio-test');
+	// require('./test/repeater-test');
+	// require('./test/repeater-list-test');
+	// require('./test/repeater-thumbnail-test');
+	// require('./test/scheduler-test');
+	// require('./test/search-test');
+	// require('./test/selectlist-test');
+	// require('./test/spinbox-test');
+	// require('./test/picker-test');
+	// require('./test/tree-test');
+	// require('./test/wizard-test');
 });

From 859c37a4fbc07b7050df54040f3ad6b722871032 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Fri, 16 Jun 2017 15:27:27 -0400
Subject: [PATCH 04/31] (GH1972) more cleanup of checkbox tests

---
 test/checkbox-test.js          | 347 ++++++++++++++++-----------------
 test/checkbox-tests/helpers.js |   4 +
 2 files changed, 176 insertions(+), 175 deletions(-)

diff --git a/test/checkbox-test.js b/test/checkbox-test.js
index 2451a40ca..a9e2c8994 100644
--- a/test/checkbox-test.js
+++ b/test/checkbox-test.js
@@ -2,310 +2,307 @@
 /* global start:false, stop:false ok:false, equal:false, notEqual:false, deepEqual:false */
 /* global notDeepEqual:false, strictEqual:false, notStrictEqual:false, raises:false */
 
-define( function checkboxTest ( require ) {
+define(function checkboxTest (require) {
 	var QUnit = require('qunit');
-	var $ = require( 'jquery' );
+	var $ = require('jquery');
 
-	require( 'bootstrap' );
-	require( 'fuelux/checkbox' );
+	require('bootstrap');
+	require('fuelux/checkbox');
 
 
 	QUnit.module('Fuel UX Checkbox', {
 		beforeEach: require('./checkbox-tests/helpers').setup
 	}, function runCheckboxTests () {
-		QUnit.test( 'should be defined on jquery object', function ( assert ) {
-			assert.ok( $().checkbox, 'checkbox method is defined' );
-		} );
+		QUnit.test('should be defined on jquery object', function isCheckboxDefined (assert) {
+			assert.ok($().checkbox, 'checkbox method is defined');
+		});
 
-		QUnit.test( 'should return element', function ( assert ) {
-			var $chk1 = this.$html.find( '#Checkbox1' );
-			assert.ok( $chk1.checkbox() === $chk1, 'checkbox should be initialized' );
-		} );
-
-		QUnit.test( 'should set initial state for checked/enabled', function ( assert ) {
-			var $element = this.$html.find( '#CheckboxCheckedEnabled' ).clone();
+		QUnit.test('should return element', function doesCheckboxReturnCheckbox (assert) {
+			assert.ok(this.$checkedEnabled.checkbox() === this.$checkedEnabled, 'checkbox should be initialized');
+		});
 
+		QUnit.test('should set initial state for checked/enabled', function (assert) {
 			// Initialize checkbox
-			$element.find( 'label' ).checkbox();
+			this.$checkedEnabled.find('label').checkbox();
 
 			// Ensure label has checked class
-			var checked = $element.find( 'label' ).hasClass( 'checked' );
-			assert.equal( checked, true, 'label has "checked" class when input is checked' );
+			var checked = this.$checkedEnabled.find('label').hasClass('checked');
+			assert.equal(checked, true, 'label has "checked" class when input is checked');
 
 			// Ensure label does not have disabled class
-			var disabled = $element.find( 'label' ).hasClass( 'disabled' );
-			assert.equal( disabled, false, 'label does not have "disabled" class when input is enabled' );
-		} );
+			var disabled = this.$checkedEnabled.find('label').hasClass('disabled');
+			assert.equal(disabled, false, 'label does not have "disabled" class when input is enabled');
+		});
 
-		QUnit.test( 'should set initial state for checked/disabled', function ( assert ) {
-			var $element = this.$html.find( '#CheckboxCheckedDisabled' ).clone();
+		QUnit.test('should set initial state for checked/disabled', function (assert) {
+			var $element = this.$checkedDisabled;
 
 			// Initialize checkbox
-			$element.find( 'label' ).checkbox();
+			$element.find('label').checkbox();
 
 			// Ensure label has checked class
-			var checked = $element.find( 'label' ).hasClass( 'checked' );
-			assert.equal( checked, true, 'label has "checked" class when input is checked' );
+			var checked = $element.find('label').hasClass('checked');
+			assert.equal(checked, true, 'label has "checked" class when input is checked');
 
 			// Ensure label has disabled class
-			var disabled = $element.find( 'label' ).hasClass( 'disabled' );
-			assert.equal( disabled, true, 'label has "disabled" class when input is disabled' );
-		} );
+			var disabled = $element.find('label').hasClass('disabled');
+			assert.equal(disabled, true, 'label has "disabled" class when input is disabled');
+		});
 
-		QUnit.test( 'should set initial state for unchecked/enabled', function ( assert ) {
-			var $element = this.$html.find( '#CheckboxUncheckedEnabled' ).clone();
+		QUnit.test('should set initial state for unchecked/enabled', function (assert) {
+			var $element = this.$uncheckedEnabled;
 
 			// Initialize checkbox
-			$element.find( 'label' ).checkbox();
+			$element.find('label').checkbox();
 
 			// Ensure label does not have checked class
-			var checked = $element.find( 'label' ).hasClass( 'checked' );
-			assert.equal( checked, false, 'label does not have "checked" class when input is unchecked' );
+			var checked = $element.find('label').hasClass('checked');
+			assert.equal(checked, false, 'label does not have "checked" class when input is unchecked');
 
 			// Ensure label does not have disabled class
-			var disabled = $element.find( 'label' ).hasClass( 'disabled' );
-			assert.equal( disabled, false, 'label does not have "disabled" class when input is enabled' );
-		} );
+			var disabled = $element.find('label').hasClass('disabled');
+			assert.equal(disabled, false, 'label does not have "disabled" class when input is enabled');
+		});
 
-		QUnit.test( 'should set initial state for unchecked/disabled', function ( assert ) {
-			var $element = this.$html.find( '#CheckboxUncheckedDisabled' ).clone();
+		QUnit.test('should set initial state for unchecked/disabled', function (assert) {
+			var $element = this.$uncheckedDisabled;
 
 			// Initialize checkbox
-			$element.find( 'label' ).checkbox();
+			$element.find('label').checkbox();
 
 			// Ensure label does not have checked class
-			var checked = $element.find( 'label' ).hasClass( 'checked' );
-			assert.equal( checked, false, 'label does not have "checked" class when input is unchecked' );
+			var checked = $element.find('label').hasClass('checked');
+			assert.equal(checked, false, 'label does not have "checked" class when input is unchecked');
 
 			// Ensure label has disabled class
-			var disabled = $element.find( 'label' ).hasClass( 'disabled' );
-			assert.equal( disabled, true, 'label has "disabled" class when input is disabled' );
-		} );
+			var disabled = $element.find('label').hasClass('disabled');
+			assert.equal(disabled, true, 'label has "disabled" class when input is disabled');
+		});
 
-		QUnit.test( 'should disable checkbox', function ( assert ) {
-			var $element = this.$html.find( '#CheckboxUncheckedEnabled' ).clone();
-			var $input = $element.find( 'input[type="checkbox"]' );
+		QUnit.test('should disable checkbox', function (assert) {
+			var $element = this.$uncheckedEnabled;
+			var $input = $element.find('input[type="checkbox"]');
 
 			// Initialize checkbox
-			var $chk = $element.find( 'label' ).checkbox();
+			var $chk = $element.find('label').checkbox();
 
 			// Set disabled state
-			assert.equal( $input.prop( 'disabled' ), false, 'checkbox enabled initially' );
-			$chk.checkbox( 'disable' );
-			assert.equal( $input.prop( 'disabled' ), true, 'checkbox disabled after calling disable method' );
-		} );
+			assert.equal($input.prop('disabled'), false, 'checkbox enabled initially');
+			$chk.checkbox('disable');
+			assert.equal($input.prop('disabled'), true, 'checkbox disabled after calling disable method');
+		});
 
-		QUnit.test( 'should enable checkbox', function ( assert ) {
-			var $element = this.$html.find( '#CheckboxUncheckedDisabled' ).clone();
-			var $input = $element.find( 'input[type="checkbox"]' );
+		QUnit.test('should enable checkbox', function (assert) {
+			var $element = this.$uncheckedDisabled;
+			var $input = $element.find('input[type="checkbox"]');
 
 			// Initialize checkbox
-			var $chk = $element.find( 'label' ).checkbox();
+			var $chk = $element.find('label').checkbox();
 
 			// Set enabled state
-			assert.equal( $input.prop( 'disabled' ), true, 'checkbox disabled initially' );
-			$chk.checkbox( 'enable' );
-			assert.equal( $input.prop( 'disabled' ), false, 'checkbox enabled after calling enable method' );
-		} );
+			assert.equal($input.prop('disabled'), true, 'checkbox disabled initially');
+			$chk.checkbox('enable');
+			assert.equal($input.prop('disabled'), false, 'checkbox enabled after calling enable method');
+		});
 
-		QUnit.test( 'should check checkbox', function ( assert ) {
-			var $element = this.$html.find( '#CheckboxUncheckedEnabled' ).clone();
-			var $input = $element.find( 'input[type="checkbox"]' );
+		QUnit.test('should check checkbox', function (assert) {
+			var $element = this.$uncheckedEnabled;
+			var $input = $element.find('input[type="checkbox"]');
 
 			// Initialize checkbox
-			var $chk = $element.find( 'label' ).checkbox();
+			var $chk = $element.find('label').checkbox();
 
 			// Set checked state
-			assert.equal( $input.prop( 'checked' ), false, 'checkbox unchecked initially' );
-			$chk.checkbox( 'check' );
-			assert.equal( $input.prop( 'checked' ), true, 'checkbox checked after calling check method' );
-		} );
+			assert.equal($input.prop('checked'), false, 'checkbox unchecked initially');
+			$chk.checkbox('check');
+			assert.equal($input.prop('checked'), true, 'checkbox checked after calling check method');
+		});
 
-		QUnit.test( 'should uncheck checkbox', function ( assert ) {
-			var $element = this.$html.find( '#CheckboxCheckedEnabled' ).clone();
-			var $input = $element.find( 'input[type="checkbox"]' );
+		QUnit.test('should uncheck checkbox', function (assert) {
+			var $element = this.$checkedEnabled;
+			var $input = $element.find('input[type="checkbox"]');
 
 			// Initialize checkbox
-			var $chk = $element.find( 'label' ).checkbox();
+			var $chk = $element.find('label').checkbox();
 
 			// Set checked state
-			assert.equal( $input.prop( 'checked' ), true, 'checkbox checked initially' );
-			$chk.checkbox( 'uncheck' );
-			assert.equal( $input.prop( 'checked' ), false, 'checkbox unchecked after calling uncheck method' );
-		} );
+			assert.equal($input.prop('checked'), true, 'checkbox checked initially');
+			$chk.checkbox('uncheck');
+			assert.equal($input.prop('checked'), false, 'checkbox unchecked after calling uncheck method');
+		});
 
-		QUnit.test( 'should toggle checkbox', function ( assert ) {
-			var $element = this.$html.find( '#CheckboxCheckedEnabled' ).clone();
-			var $input = $element.find( 'input[type="checkbox"]' );
+		QUnit.test('should toggle checkbox', function (assert) {
+			var $element = this.$checkedEnabled;
+			var $input = $element.find('input[type="checkbox"]');
 
 			// Initialize checkbox
-			var $chk = $element.find( 'label' ).checkbox();
+			var $chk = $element.find('label').checkbox();
 
 			// Set checked state
-			assert.equal( $input.prop( 'checked' ), true, 'checkbox checked initially' );
-			$chk.checkbox( 'toggle' );
-			assert.equal( $input.prop( 'checked' ), false, 'checkbox unchecked after calling toggle method' );
-			$chk.checkbox( 'toggle' );
-			assert.equal( $input.prop( 'checked' ), true, 'checkbox checked after calling toggle method' );
-			$chk.checkbox( 'toggle' );
-			assert.equal( $input.prop( 'checked' ), false, 'checkbox unchecked after calling toggle method' );
-		} );
-
-		QUnit.test( 'should return checked state', function ( assert ) {
-			var $element = this.$html.find( '#CheckboxCheckedEnabled' ).clone();
+			assert.equal($input.prop('checked'), true, 'checkbox checked initially');
+			$chk.checkbox('toggle');
+			assert.equal($input.prop('checked'), false, 'checkbox unchecked after calling toggle method');
+			$chk.checkbox('toggle');
+			assert.equal($input.prop('checked'), true, 'checkbox checked after calling toggle method');
+			$chk.checkbox('toggle');
+			assert.equal($input.prop('checked'), false, 'checkbox unchecked after calling toggle method');
+		});
+
+		QUnit.test('should return checked state', function (assert) {
+			var $element = this.$checkedEnabled;
 
 			// Initialize checkbox
-			var $chk = $element.find( 'label' ).checkbox();
+			var $chk = $element.find('label').checkbox();
 
 			// Verify checked state changes with toggle method
-			assert.equal( $chk.checkbox( 'isChecked' ), true, 'checkbox state is checked' );
-			$chk.checkbox( 'toggle' );
-			assert.equal( $chk.checkbox( 'isChecked' ), false, 'checkbox state is unchecked' );
-			$chk.checkbox( 'toggle' );
-			assert.equal( $chk.checkbox( 'isChecked' ), true, 'checkbox state is checked' );
+			assert.equal($chk.checkbox('isChecked'), true, 'checkbox state is checked');
+			$chk.checkbox('toggle');
+			assert.equal($chk.checkbox('isChecked'), false, 'checkbox state is unchecked');
+			$chk.checkbox('toggle');
+			assert.equal($chk.checkbox('isChecked'), true, 'checkbox state is checked');
 
 			// Verify checked state changes with uncheck method
-			$chk.checkbox( 'uncheck' );
-			assert.equal( $chk.checkbox( 'isChecked' ), false, 'checkbox state is unchecked' );
+			$chk.checkbox('uncheck');
+			assert.equal($chk.checkbox('isChecked'), false, 'checkbox state is unchecked');
 
 			// Verify checked state changes with check method
-			$chk.checkbox( 'check' );
-			assert.equal( $chk.checkbox( 'isChecked' ), true, 'checkbox state is checked' );
-		} );
+			$chk.checkbox('check');
+			assert.equal($chk.checkbox('isChecked'), true, 'checkbox state is checked');
+		});
 
-		QUnit.test( 'should support getValue alias', function ( assert ) {
-			var $element = this.$html.find( '#CheckboxCheckedEnabled' ).clone();
+		QUnit.test('should support getValue alias', function (assert) {
+			var $element = this.$checkedEnabled;
 
 			// Initialize checkbox
-			var $chk = $element.find( 'label' ).checkbox();
+			var $chk = $element.find('label').checkbox();
 
 			// Verify alias aliases
-			assert.equal( $chk.checkbox( 'isChecked' ), $chk.checkbox( 'getValue' ), 'getValue alias matches isChecked' );
-			$chk.checkbox( 'toggle' );
-			assert.equal( $chk.checkbox( 'isChecked' ), $chk.checkbox( 'getValue' ), 'getValue alias matches isChecked' );
-			$chk.checkbox( 'toggle' );
-			assert.equal( $chk.checkbox( 'isChecked' ), $chk.checkbox( 'getValue' ), 'getValue alias matches isChecked' );
-		} );
+			assert.equal($chk.checkbox('isChecked'), $chk.checkbox('getValue'), 'getValue alias matches isChecked');
+			$chk.checkbox('toggle');
+			assert.equal($chk.checkbox('isChecked'), $chk.checkbox('getValue'), 'getValue alias matches isChecked');
+			$chk.checkbox('toggle');
+			assert.equal($chk.checkbox('isChecked'), $chk.checkbox('getValue'), 'getValue alias matches isChecked');
+		});
 
-		QUnit.test( 'should trigger checked event when calling check method', function ( assert ) {
-			var $element = this.$html.find( '#CheckboxUncheckedEnabled' ).clone();
+		QUnit.test('should trigger checked event when calling check method', function (assert) {
+			var $element = this.$uncheckedEnabled;
 
 			// Initialize checkbox
-			var $chk = $element.find( 'label' ).checkbox();
+			var $chk = $element.find('label').checkbox();
 
 			var triggered = false;
-			$chk.on( 'checked.fu.checkbox', function () {
+			$chk.on('checked.fu.checkbox', function () {
 				triggered = true;
-			} );
+			});
 
-			$chk.checkbox( 'check' );
+			$chk.checkbox('check');
 
-			assert.equal( triggered, true, 'checked event triggered' );
-		} );
+			assert.equal(triggered, true, 'checked event triggered');
+		});
 
-		QUnit.test( 'should trigger unchecked event when calling uncheck method', function ( assert ) {
-			var $element = this.$html.find( '#CheckboxCheckedEnabled' ).clone();
+		QUnit.test('should trigger unchecked event when calling uncheck method', function (assert) {
+			var $element = this.$checkedEnabled;
 
 			// Initialize checkbox
-			var $chk = $element.find( 'label' ).checkbox();
+			var $chk = $element.find('label').checkbox();
 
 			var triggered = false;
-			$chk.on( 'unchecked.fu.checkbox', function () {
+			$chk.on('unchecked.fu.checkbox', function () {
 				triggered = true;
-			} );
+			});
 
-			$chk.checkbox( 'uncheck' );
+			$chk.checkbox('uncheck');
 
-			assert.equal( triggered, true, 'unchecked event triggered' );
-		} );
+			assert.equal(triggered, true, 'unchecked event triggered');
+		});
 
-		QUnit.test( 'should trigger changed event when calling checked/unchecked method', function ( assert ) {
-			var $element = this.$html.find( '#CheckboxCheckedEnabled' ).clone();
+		QUnit.test('should trigger changed event when calling checked/unchecked method', function (assert) {
+			var $element = this.$checkedEnabled;
 
 			// Initialize checkbox
-			var $chk = $element.find( 'label' ).checkbox();
+			var $chk = $element.find('label').checkbox();
 
 			var triggered = false;
 			var state = false;
-			$chk.on( 'changed.fu.checkbox', function ( evt, data ) {
+			$chk.on('changed.fu.checkbox', function (evt, data) {
 				triggered = true;
 				state = data;
-			} );
+			});
 
-			$chk.checkbox( 'uncheck' );
+			$chk.checkbox('uncheck');
 
-			assert.equal( triggered, true, 'changed event triggered' );
-			assert.equal( state, false, 'changed event triggered passing correct state' );
-		} );
+			assert.equal(triggered, true, 'changed event triggered');
+			assert.equal(state, false, 'changed event triggered passing correct state');
+		});
 
-		QUnit.test( 'should trigger changed event when clicking on input element', function ( assert ) {
-			var $element = this.$html.find( '#CheckboxUncheckedEnabled' ).clone();
-			var $input = $element.find( 'input[type="checkbox"]' );
-			$element.appendTo( document.body ); // Append to body to capture clicks
+		QUnit.test('should trigger changed event when clicking on input element', function (assert) {
+			var $element = this.$uncheckedEnabled;
+			var $input = $element.find('input[type="checkbox"]');
+			$element.appendTo(document.body); // Append to body to capture clicks
 
 			// Initialize checkbox
-			$element.find( 'label' ).checkbox();
+			$element.find('label').checkbox();
 
 			var triggered = false;
-			$element.on( 'changed.fu.checkbox', function () {
+			$element.on('changed.fu.checkbox', function () {
 				triggered = true;
-			} );
+			});
 
 			$input.click();
-			assert.equal( triggered, true, 'changed event triggered' );
+			assert.equal(triggered, true, 'changed event triggered');
 
 			$element.remove();
-		} );
+		});
 
-		QUnit.test( 'should trigger changed event when clicking on input element', function ( assert ) {
-			var $element = this.$html.find( '#CheckboxUncheckedEnabled' ).clone();
-			var $input = $element.find( 'input[type="checkbox"]' );
-			$element.appendTo( document.body ); // Append to body to capture clicks
+		QUnit.test('should trigger changed event when clicking on input element', function (assert) {
+			var $element = this.$uncheckedEnabled;
+			var $input = $element.find('input[type="checkbox"]');
+			$element.appendTo(document.body); // Append to body to capture clicks
 
 			// Initialize checkbox
-			$element.find( 'label' ).checkbox();
+			$element.find('label').checkbox();
 
 			var triggered = false;
-			$element.on( 'changed.fu.checkbox', function () {
+			$element.on('changed.fu.checkbox', function () {
 				triggered = true;
-			} );
+			});
 
 			$input.click();
-			assert.equal( triggered, true, 'changed event triggered' );
+			assert.equal(triggered, true, 'changed event triggered');
 
 			$element.remove();
-		} );
+		});
 
-		QUnit.test( 'should toggle checkbox container visibility', function ( assert ) {
-			var $element = this.$html.find( '#CheckboxToggle' ).clone();
-			var $container = $element.find( '.checkboxToggle' );
-			$element.appendTo( document.body ); // Append to body to check visibility
+		QUnit.test('should toggle checkbox container visibility', function (assert) {
+			var $element = this.$html.find('#CheckboxToggle').clone();
+			var $container = $element.find('.checkboxToggle');
+			$element.appendTo(document.body); // Append to body to check visibility
 
 			// Initialize checkbox
-			var $chk = $element.find( 'label' ).checkbox();
+			var $chk = $element.find('label').checkbox();
 
-			assert.equal( $container.is( ':visible' ), false, 'toggle container hidden by default' );
-			$chk.checkbox( 'check' );
-			assert.equal( $container.is( ':visible' ), true, 'toggle container visible after check' );
-			$chk.checkbox( 'uncheck' );
-			assert.equal( $container.is( ':visible' ), false, 'toggle container hidden after uncheck' );
+			assert.equal($container.is(':visible'), false, 'toggle container hidden by default');
+			$chk.checkbox('check');
+			assert.equal($container.is(':visible'), true, 'toggle container visible after check');
+			$chk.checkbox('uncheck');
+			assert.equal($container.is(':visible'), false, 'toggle container hidden after uncheck');
 
 			$element.remove();
-		} );
+		});
 
-		QUnit.test( 'should destroy checkbox', function ( assert ) {
-			var $element = this.$html.find( '#CheckboxCheckedEnabled' ).clone();
+		QUnit.test('should destroy checkbox', function (assert) {
+			var $element = this.$checkedEnabled;
 
 			// Initialize checkbox
-			var $chk = $element.find( 'label' ).checkbox();
-			var originalMarkup = $element.find( 'label' )[ 0 ].outerHTML;
+			var $chk = $element.find('label').checkbox();
+			var originalMarkup = $element.find('label')[ 0 ].outerHTML;
 
-			assert.equal( $element.find( '#Checkbox1' ).length, 1, 'checkbox exists in DOM by default' );
+			assert.equal($element.find('#Checkbox1').length, 1, 'checkbox exists in DOM by default');
 
-			var markup = $chk.checkbox( 'destroy' );
+			var markup = $chk.checkbox('destroy');
 
-			assert.equal( originalMarkup, markup, 'returned original markup' );
-			assert.equal( $element.find( '#Checkbox1' ).length, 0, 'checkbox removed from DOM' );
-		} );
+			assert.equal(originalMarkup, markup, 'returned original markup');
+			assert.equal($element.find('#Checkbox1').length, 0, 'checkbox removed from DOM');
+		});
 	});
-} );
+});
diff --git a/test/checkbox-tests/helpers.js b/test/checkbox-tests/helpers.js
index 5286d5a7c..65c44155c 100644
--- a/test/checkbox-tests/helpers.js
+++ b/test/checkbox-tests/helpers.js
@@ -8,6 +8,10 @@ define(function treeDataFactory (require) {
 		var $fixture = $('#qunit-fixture');
 		this.html = require('text!test/markup/checkbox-markup.html!strip');
 		this.$html = $(this.html);
+		this.$checkedEnabled = this.$html.find('#CheckboxCheckedEnabled');
+		this.$checkedDisabled = this.$html.find('#CheckboxCheckedDisabled');
+		this.$uncheckedEnabled = this.$html.find('#CheckboxUncheckedEnabled');
+		this.$uncheckedDisabled = this.$html.find('#CheckboxUncheckedDisabled');
 		$fixture.append(this.$html);
 	};
 

From 30de1670d09dccbb24f27248cd730942fc0a278e Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Fri, 16 Jun 2017 21:51:54 -0400
Subject: [PATCH 05/31] (GH1972) cleans up checkbox qunit tests to utilize
 fixture, helpers, and ok/notOk instead of equals

---
 test/checkbox-test.js                 | 348 ++++++++------------------
 test/checkbox-tests/checked.js        |  34 +++
 test/checkbox-tests/disable.js        |  21 ++
 test/checkbox-tests/helpers.js        |   8 +-
 test/checkbox-tests/initialization.js |  25 ++
 test/checkbox-tests/return.js         |  20 ++
 6 files changed, 206 insertions(+), 250 deletions(-)
 create mode 100644 test/checkbox-tests/checked.js
 create mode 100644 test/checkbox-tests/disable.js
 create mode 100644 test/checkbox-tests/initialization.js
 create mode 100644 test/checkbox-tests/return.js

diff --git a/test/checkbox-test.js b/test/checkbox-test.js
index a9e2c8994..e9c0c0db7 100644
--- a/test/checkbox-test.js
+++ b/test/checkbox-test.js
@@ -21,288 +21,144 @@ define(function checkboxTest (require) {
 			assert.ok(this.$checkedEnabled.checkbox() === this.$checkedEnabled, 'checkbox should be initialized');
 		});
 
-		QUnit.test('should set initial state for checked/enabled', function (assert) {
-			// Initialize checkbox
-			this.$checkedEnabled.find('label').checkbox();
+		require('./checkbox-tests/initialization')(QUnit);
+		require('./checkbox-tests/disable')(QUnit);
+		require('./checkbox-tests/checked')(QUnit);
+		require('./checkbox-tests/return')(QUnit);
 
-			// Ensure label has checked class
-			var checked = this.$checkedEnabled.find('label').hasClass('checked');
-			assert.equal(checked, true, 'label has "checked" class when input is checked');
+		// QUnit.test('should support getValue alias', function (assert) {
+		// 	var $element = this.$checkedEnabled;
 
-			// Ensure label does not have disabled class
-			var disabled = this.$checkedEnabled.find('label').hasClass('disabled');
-			assert.equal(disabled, false, 'label does not have "disabled" class when input is enabled');
-		});
-
-		QUnit.test('should set initial state for checked/disabled', function (assert) {
-			var $element = this.$checkedDisabled;
-
-			// Initialize checkbox
-			$element.find('label').checkbox();
-
-			// Ensure label has checked class
-			var checked = $element.find('label').hasClass('checked');
-			assert.equal(checked, true, 'label has "checked" class when input is checked');
-
-			// Ensure label has disabled class
-			var disabled = $element.find('label').hasClass('disabled');
-			assert.equal(disabled, true, 'label has "disabled" class when input is disabled');
-		});
-
-		QUnit.test('should set initial state for unchecked/enabled', function (assert) {
-			var $element = this.$uncheckedEnabled;
-
-			// Initialize checkbox
-			$element.find('label').checkbox();
-
-			// Ensure label does not have checked class
-			var checked = $element.find('label').hasClass('checked');
-			assert.equal(checked, false, 'label does not have "checked" class when input is unchecked');
-
-			// Ensure label does not have disabled class
-			var disabled = $element.find('label').hasClass('disabled');
-			assert.equal(disabled, false, 'label does not have "disabled" class when input is enabled');
-		});
-
-		QUnit.test('should set initial state for unchecked/disabled', function (assert) {
-			var $element = this.$uncheckedDisabled;
-
-			// Initialize checkbox
-			$element.find('label').checkbox();
-
-			// Ensure label does not have checked class
-			var checked = $element.find('label').hasClass('checked');
-			assert.equal(checked, false, 'label does not have "checked" class when input is unchecked');
-
-			// Ensure label has disabled class
-			var disabled = $element.find('label').hasClass('disabled');
-			assert.equal(disabled, true, 'label has "disabled" class when input is disabled');
-		});
-
-		QUnit.test('should disable checkbox', function (assert) {
-			var $element = this.$uncheckedEnabled;
-			var $input = $element.find('input[type="checkbox"]');
-
-			// Initialize checkbox
-			var $chk = $element.find('label').checkbox();
-
-			// Set disabled state
-			assert.equal($input.prop('disabled'), false, 'checkbox enabled initially');
-			$chk.checkbox('disable');
-			assert.equal($input.prop('disabled'), true, 'checkbox disabled after calling disable method');
-		});
-
-		QUnit.test('should enable checkbox', function (assert) {
-			var $element = this.$uncheckedDisabled;
-			var $input = $element.find('input[type="checkbox"]');
-
-			// Initialize checkbox
-			var $chk = $element.find('label').checkbox();
-
-			// Set enabled state
-			assert.equal($input.prop('disabled'), true, 'checkbox disabled initially');
-			$chk.checkbox('enable');
-			assert.equal($input.prop('disabled'), false, 'checkbox enabled after calling enable method');
-		});
-
-		QUnit.test('should check checkbox', function (assert) {
-			var $element = this.$uncheckedEnabled;
-			var $input = $element.find('input[type="checkbox"]');
+		// 	// Initialize checkbox
+		// 	var $chk = $element.find('label').checkbox();
 
-			// Initialize checkbox
-			var $chk = $element.find('label').checkbox();
+		// 	// Verify alias aliases
+		// 	assert.equal($chk.checkbox('isChecked'), $chk.checkbox('getValue'), 'getValue alias matches isChecked');
+		// 	$chk.checkbox('toggle');
+		// 	assert.equal($chk.checkbox('isChecked'), $chk.checkbox('getValue'), 'getValue alias matches isChecked');
+		// 	$chk.checkbox('toggle');
+		// 	assert.equal($chk.checkbox('isChecked'), $chk.checkbox('getValue'), 'getValue alias matches isChecked');
+		// });
 
-			// Set checked state
-			assert.equal($input.prop('checked'), false, 'checkbox unchecked initially');
-			$chk.checkbox('check');
-			assert.equal($input.prop('checked'), true, 'checkbox checked after calling check method');
-		});
+		// QUnit.test('should trigger checked event when calling check method', function (assert) {
+		// 	var $element = this.$uncheckedEnabled;
 
-		QUnit.test('should uncheck checkbox', function (assert) {
-			var $element = this.$checkedEnabled;
-			var $input = $element.find('input[type="checkbox"]');
+		// 	// Initialize checkbox
+		// 	var $chk = $element.find('label').checkbox();
 
-			// Initialize checkbox
-			var $chk = $element.find('label').checkbox();
+		// 	var triggered = false;
+		// 	$chk.on('checked.fu.checkbox', function () {
+		// 		triggered = true;
+		// 	});
 
-			// Set checked state
-			assert.equal($input.prop('checked'), true, 'checkbox checked initially');
-			$chk.checkbox('uncheck');
-			assert.equal($input.prop('checked'), false, 'checkbox unchecked after calling uncheck method');
-		});
+		// 	$chk.checkbox('check');
 
-		QUnit.test('should toggle checkbox', function (assert) {
-			var $element = this.$checkedEnabled;
-			var $input = $element.find('input[type="checkbox"]');
-
-			// Initialize checkbox
-			var $chk = $element.find('label').checkbox();
-
-			// Set checked state
-			assert.equal($input.prop('checked'), true, 'checkbox checked initially');
-			$chk.checkbox('toggle');
-			assert.equal($input.prop('checked'), false, 'checkbox unchecked after calling toggle method');
-			$chk.checkbox('toggle');
-			assert.equal($input.prop('checked'), true, 'checkbox checked after calling toggle method');
-			$chk.checkbox('toggle');
-			assert.equal($input.prop('checked'), false, 'checkbox unchecked after calling toggle method');
-		});
+		// 	assert.equal(triggered, true, 'checked event triggered');
+		// });
 
-		QUnit.test('should return checked state', function (assert) {
-			var $element = this.$checkedEnabled;
+		// QUnit.test('should trigger unchecked event when calling uncheck method', function (assert) {
+		// 	var $element = this.$checkedEnabled;
 
-			// Initialize checkbox
-			var $chk = $element.find('label').checkbox();
+		// 	// Initialize checkbox
+		// 	var $chk = $element.find('label').checkbox();
 
-			// Verify checked state changes with toggle method
-			assert.equal($chk.checkbox('isChecked'), true, 'checkbox state is checked');
-			$chk.checkbox('toggle');
-			assert.equal($chk.checkbox('isChecked'), false, 'checkbox state is unchecked');
-			$chk.checkbox('toggle');
-			assert.equal($chk.checkbox('isChecked'), true, 'checkbox state is checked');
+		// 	var triggered = false;
+		// 	$chk.on('unchecked.fu.checkbox', function () {
+		// 		triggered = true;
+		// 	});
 
-			// Verify checked state changes with uncheck method
-			$chk.checkbox('uncheck');
-			assert.equal($chk.checkbox('isChecked'), false, 'checkbox state is unchecked');
+		// 	$chk.checkbox('uncheck');
 
-			// Verify checked state changes with check method
-			$chk.checkbox('check');
-			assert.equal($chk.checkbox('isChecked'), true, 'checkbox state is checked');
-		});
+		// 	assert.equal(triggered, true, 'unchecked event triggered');
+		// });
 
-		QUnit.test('should support getValue alias', function (assert) {
-			var $element = this.$checkedEnabled;
+		// QUnit.test('should trigger changed event when calling checked/unchecked method', function (assert) {
+		// 	var $element = this.$checkedEnabled;
 
-			// Initialize checkbox
-			var $chk = $element.find('label').checkbox();
+		// 	// Initialize checkbox
+		// 	var $chk = $element.find('label').checkbox();
 
-			// Verify alias aliases
-			assert.equal($chk.checkbox('isChecked'), $chk.checkbox('getValue'), 'getValue alias matches isChecked');
-			$chk.checkbox('toggle');
-			assert.equal($chk.checkbox('isChecked'), $chk.checkbox('getValue'), 'getValue alias matches isChecked');
-			$chk.checkbox('toggle');
-			assert.equal($chk.checkbox('isChecked'), $chk.checkbox('getValue'), 'getValue alias matches isChecked');
-		});
+		// 	var triggered = false;
+		// 	var state = false;
+		// 	$chk.on('changed.fu.checkbox', function (evt, data) {
+		// 		triggered = true;
+		// 		state = data;
+		// 	});
 
-		QUnit.test('should trigger checked event when calling check method', function (assert) {
-			var $element = this.$uncheckedEnabled;
+		// 	$chk.checkbox('uncheck');
 
-			// Initialize checkbox
-			var $chk = $element.find('label').checkbox();
+		// 	assert.equal(triggered, true, 'changed event triggered');
+		// 	assert.equal(state, false, 'changed event triggered passing correct state');
+		// });
 
-			var triggered = false;
-			$chk.on('checked.fu.checkbox', function () {
-				triggered = true;
-			});
+		// QUnit.test('should trigger changed event when clicking on input element', function (assert) {
+		// 	var $element = this.$uncheckedEnabled;
+		// 	var $input = $element.find('input[type="checkbox"]');
+		// 	$element.appendTo(document.body); // Append to body to capture clicks
 
-			$chk.checkbox('check');
+		// 	// Initialize checkbox
+		// 	$element.find('label').checkbox();
 
-			assert.equal(triggered, true, 'checked event triggered');
-		});
+		// 	var triggered = false;
+		// 	$element.on('changed.fu.checkbox', function () {
+		// 		triggered = true;
+		// 	});
 
-		QUnit.test('should trigger unchecked event when calling uncheck method', function (assert) {
-			var $element = this.$checkedEnabled;
+		// 	$input.click();
+		// 	assert.equal(triggered, true, 'changed event triggered');
 
-			// Initialize checkbox
-			var $chk = $element.find('label').checkbox();
+		// 	$element.remove();
+		// });
 
-			var triggered = false;
-			$chk.on('unchecked.fu.checkbox', function () {
-				triggered = true;
-			});
+		// QUnit.test('should trigger changed event when clicking on input element', function (assert) {
+		// 	var $element = this.$uncheckedEnabled;
+		// 	var $input = $element.find('input[type="checkbox"]');
+		// 	$element.appendTo(document.body); // Append to body to capture clicks
 
-			$chk.checkbox('uncheck');
+		// 	// Initialize checkbox
+		// 	$element.find('label').checkbox();
 
-			assert.equal(triggered, true, 'unchecked event triggered');
-		});
+		// 	var triggered = false;
+		// 	$element.on('changed.fu.checkbox', function () {
+		// 		triggered = true;
+		// 	});
 
-		QUnit.test('should trigger changed event when calling checked/unchecked method', function (assert) {
-			var $element = this.$checkedEnabled;
+		// 	$input.click();
+		// 	assert.equal(triggered, true, 'changed event triggered');
 
-			// Initialize checkbox
-			var $chk = $element.find('label').checkbox();
+		// 	$element.remove();
+		// });
 
-			var triggered = false;
-			var state = false;
-			$chk.on('changed.fu.checkbox', function (evt, data) {
-				triggered = true;
-				state = data;
-			});
+		// QUnit.test('should toggle checkbox container visibility', function (assert) {
+		// 	var $element = this.$html.find('#CheckboxToggle').clone();
+		// 	var $container = $element.find('.checkboxToggle');
+		// 	$element.appendTo(document.body); // Append to body to check visibility
 
-			$chk.checkbox('uncheck');
+		// 	// Initialize checkbox
+		// 	var $chk = $element.find('label').checkbox();
 
-			assert.equal(triggered, true, 'changed event triggered');
-			assert.equal(state, false, 'changed event triggered passing correct state');
-		});
-
-		QUnit.test('should trigger changed event when clicking on input element', function (assert) {
-			var $element = this.$uncheckedEnabled;
-			var $input = $element.find('input[type="checkbox"]');
-			$element.appendTo(document.body); // Append to body to capture clicks
-
-			// Initialize checkbox
-			$element.find('label').checkbox();
+		// 	assert.equal($container.is(':visible'), false, 'toggle container hidden by default');
+		// 	$chk.checkbox('check');
+		// 	assert.equal($container.is(':visible'), true, 'toggle container visible after check');
+		// 	$chk.checkbox('uncheck');
+		// 	assert.equal($container.is(':visible'), false, 'toggle container hidden after uncheck');
 
-			var triggered = false;
-			$element.on('changed.fu.checkbox', function () {
-				triggered = true;
-			});
-
-			$input.click();
-			assert.equal(triggered, true, 'changed event triggered');
-
-			$element.remove();
-		});
+		// 	$element.remove();
+		// });
 
-		QUnit.test('should trigger changed event when clicking on input element', function (assert) {
-			var $element = this.$uncheckedEnabled;
-			var $input = $element.find('input[type="checkbox"]');
-			$element.appendTo(document.body); // Append to body to capture clicks
+		// QUnit.test('should destroy checkbox', function (assert) {
+		// 	var $element = this.$checkedEnabled;
 
-			// Initialize checkbox
-			$element.find('label').checkbox();
+		// 	// Initialize checkbox
+		// 	var $chk = $element.find('label').checkbox();
+		// 	var originalMarkup = $element.find('label')[ 0 ].outerHTML;
 
-			var triggered = false;
-			$element.on('changed.fu.checkbox', function () {
-				triggered = true;
-			});
+		// 	assert.equal($element.find('#Checkbox1').length, 1, 'checkbox exists in DOM by default');
 
-			$input.click();
-			assert.equal(triggered, true, 'changed event triggered');
+		// 	var markup = $chk.checkbox('destroy');
 
-			$element.remove();
-		});
-
-		QUnit.test('should toggle checkbox container visibility', function (assert) {
-			var $element = this.$html.find('#CheckboxToggle').clone();
-			var $container = $element.find('.checkboxToggle');
-			$element.appendTo(document.body); // Append to body to check visibility
-
-			// Initialize checkbox
-			var $chk = $element.find('label').checkbox();
-
-			assert.equal($container.is(':visible'), false, 'toggle container hidden by default');
-			$chk.checkbox('check');
-			assert.equal($container.is(':visible'), true, 'toggle container visible after check');
-			$chk.checkbox('uncheck');
-			assert.equal($container.is(':visible'), false, 'toggle container hidden after uncheck');
-
-			$element.remove();
-		});
-
-		QUnit.test('should destroy checkbox', function (assert) {
-			var $element = this.$checkedEnabled;
-
-			// Initialize checkbox
-			var $chk = $element.find('label').checkbox();
-			var originalMarkup = $element.find('label')[ 0 ].outerHTML;
-
-			assert.equal($element.find('#Checkbox1').length, 1, 'checkbox exists in DOM by default');
-
-			var markup = $chk.checkbox('destroy');
-
-			assert.equal(originalMarkup, markup, 'returned original markup');
-			assert.equal($element.find('#Checkbox1').length, 0, 'checkbox removed from DOM');
-		});
+		// 	assert.equal(originalMarkup, markup, 'returned original markup');
+		// 	assert.equal($element.find('#Checkbox1').length, 0, 'checkbox removed from DOM');
+		// });
 	});
 });
diff --git a/test/checkbox-tests/checked.js b/test/checkbox-tests/checked.js
new file mode 100644
index 000000000..597475376
--- /dev/null
+++ b/test/checkbox-tests/checked.js
@@ -0,0 +1,34 @@
+define(function checkboxDisableEnableModule () {
+	return function checkboxDisableEnable (QUnit) {
+		QUnit.test('check should check checkbox', function testCheck (assert) {
+			var $input = this.$uncheckedEnabled.find('input[type="checkbox"]');
+
+			// Set checked state
+			assert.notOk($input.prop('checked'), 'checkbox unchecked initially');
+			this.$uncheckedEnabled.checkbox('check');
+			assert.ok($input.prop('checked'), 'checkbox checked after calling check method');
+		});
+
+		QUnit.test('uncheck should uncheck checkbox', function testUncheck (assert) {
+			var $input = this.$checkedEnabled.find('input[type="checkbox"]');
+
+			// Set checked state
+			assert.ok($input.prop('checked'), 'checkbox checked initially');
+			this.$checkedEnabled.checkbox('uncheck');
+			assert.notOk($input.prop('checked'), 'checkbox unchecked after calling uncheck method');
+		});
+
+		QUnit.test('toggle should toggle checkbox', function testToggle (assert) {
+			var $input = this.$checkedEnabled.find('input[type="checkbox"]');
+
+			// Set checked state
+			assert.ok($input.prop('checked'), 'checkbox checked initially');
+			this.$checkedEnabled.checkbox('toggle');
+			assert.notOk($input.prop('checked'), 'checkbox unchecked after calling toggle method');
+			this.$checkedEnabled.checkbox('toggle');
+			assert.ok($input.prop('checked'), 'checkbox checked after calling toggle method');
+			this.$checkedEnabled.checkbox('toggle');
+			assert.notOk($input.prop('checked'), 'checkbox unchecked after calling toggle method');
+		});
+	};
+});
diff --git a/test/checkbox-tests/disable.js b/test/checkbox-tests/disable.js
new file mode 100644
index 000000000..e944a503a
--- /dev/null
+++ b/test/checkbox-tests/disable.js
@@ -0,0 +1,21 @@
+define(function checkboxDisableEnableModule () {
+	return function checkboxDisableEnable (QUnit) {
+		QUnit.test('should disable correctly', function testDisable (assert) {
+			var $input = this.$uncheckedEnabled.find('input[type="checkbox"]');
+
+			// Set disabled state
+			assert.notOk($input.prop('disabled'), 'checkbox starts enabled');
+			this.$uncheckedEnabled.checkbox('disable');
+			assert.ok($input.prop('disabled'), 'checkbox disabled after calling disable method');
+		});
+
+		QUnit.test('should enable correctly', function testEnable (assert) {
+			var $input = this.$uncheckedDisabled.find('input[type="checkbox"]');
+
+			// Set enabled state
+			assert.ok($input.prop('disabled'), 'checkbox starts disabled');
+			this.$uncheckedDisabled.checkbox('enable');
+			assert.notOk($input.prop('disabled'), 'checkbox enabled after calling enable method');
+		});
+	};
+});
diff --git a/test/checkbox-tests/helpers.js b/test/checkbox-tests/helpers.js
index 65c44155c..a5503d849 100644
--- a/test/checkbox-tests/helpers.js
+++ b/test/checkbox-tests/helpers.js
@@ -8,11 +8,11 @@ define(function treeDataFactory (require) {
 		var $fixture = $('#qunit-fixture');
 		this.html = require('text!test/markup/checkbox-markup.html!strip');
 		this.$html = $(this.html);
-		this.$checkedEnabled = this.$html.find('#CheckboxCheckedEnabled');
-		this.$checkedDisabled = this.$html.find('#CheckboxCheckedDisabled');
-		this.$uncheckedEnabled = this.$html.find('#CheckboxUncheckedEnabled');
-		this.$uncheckedDisabled = this.$html.find('#CheckboxUncheckedDisabled');
 		$fixture.append(this.$html);
+		this.$checkedEnabled = $fixture.find('#CheckboxCheckedEnabled').find('label').checkbox();
+		this.$checkedDisabled = $fixture.find('#CheckboxCheckedDisabled').find('label').checkbox();
+		this.$uncheckedEnabled = $fixture.find('#CheckboxUncheckedEnabled').find('label').checkbox();
+		this.$uncheckedDisabled = $fixture.find('#CheckboxUncheckedDisabled').find('label').checkbox();
 	};
 
 	return {
diff --git a/test/checkbox-tests/initialization.js b/test/checkbox-tests/initialization.js
new file mode 100644
index 000000000..353b0d2db
--- /dev/null
+++ b/test/checkbox-tests/initialization.js
@@ -0,0 +1,25 @@
+define(function checkboxInitializationModule () {
+	return function checkboxInitialization (QUnit) {
+		QUnit.module('should initialize correctly', {}, function testInitialization () {
+			QUnit.test('for checked/enabled', function testCheckedEnabled (assert) {
+				assert.ok(this.$checkedEnabled.hasClass('checked'), 'label has "checked" class when input is checked');
+				assert.notOk(this.$checkedEnabled.hasClass('disabled'), 'label does not have "disabled" class when input is enabled');
+			});
+
+			QUnit.test('for checked/disabled', function testCheckedDisabled (assert) {
+				assert.ok(this.$checkedDisabled.hasClass('checked'), 'label has "checked" class when input is checked');
+				assert.ok(this.$checkedDisabled.hasClass('disabled'), 'label has "disabled" class when input is disabled');
+			});
+
+			QUnit.test('for unchecked/enabled', function testUncheckedEnabled (assert) {
+				assert.notOk(this.$uncheckedEnabled.hasClass('checked'), 'label does not have "checked" class when input is unchecked');
+				assert.notOk(this.$uncheckedEnabled.hasClass('disabled'), 'label does not have "disabled" class when input is enabled');
+			});
+
+			QUnit.test('for unchecked/disabled', function testUncheckedDisabled (assert) {
+				assert.notOk(this.$uncheckedDisabled.hasClass('checked'), 'label does not have "checked" class when input is unchecked');
+				assert.ok(this.$uncheckedDisabled.hasClass('disabled'), 'label has "disabled" class when input is disabled');
+			});
+		});
+	};
+});
diff --git a/test/checkbox-tests/return.js b/test/checkbox-tests/return.js
new file mode 100644
index 000000000..132abcf4d
--- /dev/null
+++ b/test/checkbox-tests/return.js
@@ -0,0 +1,20 @@
+define(function checkboxDisableEnableModule () {
+	return function checkboxDisableEnable (QUnit) {
+		QUnit.test('should return checked state', function testReturn (assert) {
+			// Verify checked state changes with toggle method
+			assert.ok(this.$checkedEnabled.checkbox('isChecked'), 'checkbox state is checked');
+			this.$checkedEnabled.checkbox('toggle');
+			assert.notOk(this.$checkedEnabled.checkbox('isChecked'), 'checkbox state is unchecked');
+			this.$checkedEnabled.checkbox('toggle');
+			assert.ok(this.$checkedEnabled.checkbox('isChecked'), 'checkbox state is checked');
+
+			// Verify checked state changes with uncheck method
+			this.$checkedEnabled.checkbox('uncheck');
+			assert.notOk(this.$checkedEnabled.checkbox('isChecked'), 'checkbox state is unchecked');
+
+			// Verify checked state changes with check method
+			this.$checkedEnabled.checkbox('check');
+			assert.ok(this.$checkedEnabled.checkbox('isChecked'), 'checkbox state is checked');
+		});
+	};
+});

From 82a872309279baa741ead6e32138e4712cd31779 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Mon, 19 Jun 2017 08:45:42 -0400
Subject: [PATCH 06/31] (GH1972) cleans up remaining checkbox tests. Corrects
 tested checkbox markup

---
 test/checkbox-test.js             | 139 +-----------------------------
 test/checkbox-tests/destroy.js    |  13 +++
 test/checkbox-tests/events.js     |  56 ++++++++++++
 test/checkbox-tests/get-value.js  |  13 +++
 test/checkbox-tests/helpers.js    |  10 ++-
 test/checkbox-tests/visibility.js |  13 +++
 test/markup/checkbox-markup.html  |  22 ++---
 7 files changed, 116 insertions(+), 150 deletions(-)
 create mode 100644 test/checkbox-tests/destroy.js
 create mode 100644 test/checkbox-tests/events.js
 create mode 100644 test/checkbox-tests/get-value.js
 create mode 100644 test/checkbox-tests/visibility.js

diff --git a/test/checkbox-test.js b/test/checkbox-test.js
index e9c0c0db7..8c1635e1e 100644
--- a/test/checkbox-test.js
+++ b/test/checkbox-test.js
@@ -25,140 +25,9 @@ define(function checkboxTest (require) {
 		require('./checkbox-tests/disable')(QUnit);
 		require('./checkbox-tests/checked')(QUnit);
 		require('./checkbox-tests/return')(QUnit);
-
-		// QUnit.test('should support getValue alias', function (assert) {
-		// 	var $element = this.$checkedEnabled;
-
-		// 	// Initialize checkbox
-		// 	var $chk = $element.find('label').checkbox();
-
-		// 	// Verify alias aliases
-		// 	assert.equal($chk.checkbox('isChecked'), $chk.checkbox('getValue'), 'getValue alias matches isChecked');
-		// 	$chk.checkbox('toggle');
-		// 	assert.equal($chk.checkbox('isChecked'), $chk.checkbox('getValue'), 'getValue alias matches isChecked');
-		// 	$chk.checkbox('toggle');
-		// 	assert.equal($chk.checkbox('isChecked'), $chk.checkbox('getValue'), 'getValue alias matches isChecked');
-		// });
-
-		// QUnit.test('should trigger checked event when calling check method', function (assert) {
-		// 	var $element = this.$uncheckedEnabled;
-
-		// 	// Initialize checkbox
-		// 	var $chk = $element.find('label').checkbox();
-
-		// 	var triggered = false;
-		// 	$chk.on('checked.fu.checkbox', function () {
-		// 		triggered = true;
-		// 	});
-
-		// 	$chk.checkbox('check');
-
-		// 	assert.equal(triggered, true, 'checked event triggered');
-		// });
-
-		// QUnit.test('should trigger unchecked event when calling uncheck method', function (assert) {
-		// 	var $element = this.$checkedEnabled;
-
-		// 	// Initialize checkbox
-		// 	var $chk = $element.find('label').checkbox();
-
-		// 	var triggered = false;
-		// 	$chk.on('unchecked.fu.checkbox', function () {
-		// 		triggered = true;
-		// 	});
-
-		// 	$chk.checkbox('uncheck');
-
-		// 	assert.equal(triggered, true, 'unchecked event triggered');
-		// });
-
-		// QUnit.test('should trigger changed event when calling checked/unchecked method', function (assert) {
-		// 	var $element = this.$checkedEnabled;
-
-		// 	// Initialize checkbox
-		// 	var $chk = $element.find('label').checkbox();
-
-		// 	var triggered = false;
-		// 	var state = false;
-		// 	$chk.on('changed.fu.checkbox', function (evt, data) {
-		// 		triggered = true;
-		// 		state = data;
-		// 	});
-
-		// 	$chk.checkbox('uncheck');
-
-		// 	assert.equal(triggered, true, 'changed event triggered');
-		// 	assert.equal(state, false, 'changed event triggered passing correct state');
-		// });
-
-		// QUnit.test('should trigger changed event when clicking on input element', function (assert) {
-		// 	var $element = this.$uncheckedEnabled;
-		// 	var $input = $element.find('input[type="checkbox"]');
-		// 	$element.appendTo(document.body); // Append to body to capture clicks
-
-		// 	// Initialize checkbox
-		// 	$element.find('label').checkbox();
-
-		// 	var triggered = false;
-		// 	$element.on('changed.fu.checkbox', function () {
-		// 		triggered = true;
-		// 	});
-
-		// 	$input.click();
-		// 	assert.equal(triggered, true, 'changed event triggered');
-
-		// 	$element.remove();
-		// });
-
-		// QUnit.test('should trigger changed event when clicking on input element', function (assert) {
-		// 	var $element = this.$uncheckedEnabled;
-		// 	var $input = $element.find('input[type="checkbox"]');
-		// 	$element.appendTo(document.body); // Append to body to capture clicks
-
-		// 	// Initialize checkbox
-		// 	$element.find('label').checkbox();
-
-		// 	var triggered = false;
-		// 	$element.on('changed.fu.checkbox', function () {
-		// 		triggered = true;
-		// 	});
-
-		// 	$input.click();
-		// 	assert.equal(triggered, true, 'changed event triggered');
-
-		// 	$element.remove();
-		// });
-
-		// QUnit.test('should toggle checkbox container visibility', function (assert) {
-		// 	var $element = this.$html.find('#CheckboxToggle').clone();
-		// 	var $container = $element.find('.checkboxToggle');
-		// 	$element.appendTo(document.body); // Append to body to check visibility
-
-		// 	// Initialize checkbox
-		// 	var $chk = $element.find('label').checkbox();
-
-		// 	assert.equal($container.is(':visible'), false, 'toggle container hidden by default');
-		// 	$chk.checkbox('check');
-		// 	assert.equal($container.is(':visible'), true, 'toggle container visible after check');
-		// 	$chk.checkbox('uncheck');
-		// 	assert.equal($container.is(':visible'), false, 'toggle container hidden after uncheck');
-
-		// 	$element.remove();
-		// });
-
-		// QUnit.test('should destroy checkbox', function (assert) {
-		// 	var $element = this.$checkedEnabled;
-
-		// 	// Initialize checkbox
-		// 	var $chk = $element.find('label').checkbox();
-		// 	var originalMarkup = $element.find('label')[ 0 ].outerHTML;
-
-		// 	assert.equal($element.find('#Checkbox1').length, 1, 'checkbox exists in DOM by default');
-
-		// 	var markup = $chk.checkbox('destroy');
-
-		// 	assert.equal(originalMarkup, markup, 'returned original markup');
-		// 	assert.equal($element.find('#Checkbox1').length, 0, 'checkbox removed from DOM');
-		// });
+		require('./checkbox-tests/get-value')(QUnit);
+		require('./checkbox-tests/events')(QUnit);
+		require('./checkbox-tests/visibility')(QUnit);
+		require('./checkbox-tests/destroy')(QUnit);
 	});
 });
diff --git a/test/checkbox-tests/destroy.js b/test/checkbox-tests/destroy.js
new file mode 100644
index 000000000..2166aa80f
--- /dev/null
+++ b/test/checkbox-tests/destroy.js
@@ -0,0 +1,13 @@
+define(function checkboxDestroyModule () {
+	return function checkboxDestroy (QUnit) {
+		QUnit.test('should destroy checkbox', function testDestroy (assert) {
+			assert.ok(this.$fixture.find('#CheckboxCheckedEnabled').length, 'checkbox exists in DOM by default');
+
+			var originalMarkup = this.$checkedEnabled.parent('.checkbox').html().trim();
+			var returnedMarkup = this.$checkedEnabled.checkbox('destroy');
+
+			assert.equal(originalMarkup, returnedMarkup, 'returned original markup');
+			assert.notOk(this.$fixture.find('#CheckboxCheckedEnabled').length, 'checkbox removed from DOM');
+		});
+	};
+});
diff --git a/test/checkbox-tests/events.js b/test/checkbox-tests/events.js
new file mode 100644
index 000000000..196e73c77
--- /dev/null
+++ b/test/checkbox-tests/events.js
@@ -0,0 +1,56 @@
+define(function checkboxEventsModule () {
+	return function checkboxEvents (QUnit) {
+		QUnit.module('should trigger', {}, function testInitialization () {
+			QUnit.test('checked event when calling check method', function testCheckedTrigger (assert) {
+				assert.expect(1);
+
+				this.$uncheckedEnabled.on('checked.fu.checkbox', function checkedTriggered () {
+					assert.ok(true, 'checked event triggered');
+				});
+
+				this.$uncheckedEnabled.checkbox('check');
+			});
+
+			QUnit.test('unchecked event when calling uncheck method', function testUncheckedTrigger (assert) {
+				assert.expect(1);
+
+				this.$checkedEnabled.on('unchecked.fu.checkbox', function uncheckedTriggered () {
+					assert.ok(true, 'unchecked event triggered');
+				});
+
+				this.$checkedEnabled.checkbox('uncheck');
+			});
+
+			QUnit.test('changed event when calling checked/unchecked method', function testChangedTrigger (assert) {
+				assert.expect(2);
+
+				this.$checkedEnabled.on('changed.fu.checkbox', function changedTriggered (evt, data) {
+					assert.ok(true, 'changed event triggered');
+					assert.notOk(data, 'changed event triggered passing correct state');
+				});
+
+				this.$checkedEnabled.checkbox('uncheck');
+			});
+
+			QUnit.test('changed event when clicking on input element', function testClickChecked (assert) {
+				assert.expect(1);
+
+				this.$uncheckedEnabled.on('changed.fu.checkbox', function changedTriggered () {
+					assert.ok(true, 'changed event triggered');
+				});
+
+				this.$uncheckedEnabled.find('input[type="checkbox"]').click();
+			});
+
+			QUnit.test('changed event when clicking on input element', function testClickUnchecked (assert) {
+				assert.expect(1);
+
+				this.$uncheckedEnabled.on('changed.fu.checkbox', function changedTriggered () {
+					assert.ok(true, 'changed event triggered');
+				});
+
+				this.$uncheckedEnabled.find('input[type="checkbox"]').click();
+			});
+		});
+	};
+});
diff --git a/test/checkbox-tests/get-value.js b/test/checkbox-tests/get-value.js
new file mode 100644
index 000000000..24cf28767
--- /dev/null
+++ b/test/checkbox-tests/get-value.js
@@ -0,0 +1,13 @@
+define(function checkboxGetValueModule () {
+	return function checkboxGetValue (QUnit) {
+		QUnit.test('should support getValue alias', function testGetValue (assert) {
+			var $chk = this.$checkedEnabled;
+
+			assert.equal($chk.checkbox('isChecked'), $chk.checkbox('getValue'), 'getValue alias matches isChecked');
+			$chk.checkbox('toggle');
+			assert.equal($chk.checkbox('isChecked'), $chk.checkbox('getValue'), 'getValue alias matches isChecked');
+			$chk.checkbox('toggle');
+			assert.equal($chk.checkbox('isChecked'), $chk.checkbox('getValue'), 'getValue alias matches isChecked');
+		});
+	};
+});
diff --git a/test/checkbox-tests/helpers.js b/test/checkbox-tests/helpers.js
index a5503d849..7a717a916 100644
--- a/test/checkbox-tests/helpers.js
+++ b/test/checkbox-tests/helpers.js
@@ -9,10 +9,12 @@ define(function treeDataFactory (require) {
 		this.html = require('text!test/markup/checkbox-markup.html!strip');
 		this.$html = $(this.html);
 		$fixture.append(this.$html);
-		this.$checkedEnabled = $fixture.find('#CheckboxCheckedEnabled').find('label').checkbox();
-		this.$checkedDisabled = $fixture.find('#CheckboxCheckedDisabled').find('label').checkbox();
-		this.$uncheckedEnabled = $fixture.find('#CheckboxUncheckedEnabled').find('label').checkbox();
-		this.$uncheckedDisabled = $fixture.find('#CheckboxUncheckedDisabled').find('label').checkbox();
+		this.$checkedEnabled = $fixture.find('#CheckboxCheckedEnabled').checkbox();
+		this.$checkedDisabled = $fixture.find('#CheckboxCheckedDisabled').checkbox();
+		this.$uncheckedEnabled = $fixture.find('#CheckboxUncheckedEnabled').checkbox();
+		this.$uncheckedDisabled = $fixture.find('#CheckboxUncheckedDisabled').checkbox();
+		this.$checkboxToggle = $fixture.find('#CheckboxToggle').checkbox();
+		this.$fixture = $fixture;
 	};
 
 	return {
diff --git a/test/checkbox-tests/visibility.js b/test/checkbox-tests/visibility.js
new file mode 100644
index 000000000..b4b4a9405
--- /dev/null
+++ b/test/checkbox-tests/visibility.js
@@ -0,0 +1,13 @@
+define(function checkboxVisibilityModule () {
+	return function checkboxVisibility (QUnit) {
+		QUnit.test('should toggle checkbox container visibility', function testVisibility (assert) {
+			var $container = this.$fixture.find('.checkboxToggle');
+
+			assert.notOk($container.is(':visible'), 'toggle container hidden by default');
+			this.$checkboxToggle.checkbox('check');
+			assert.ok($container.is(':visible'), 'toggle container visible after check');
+			this.$checkboxToggle.checkbox('uncheck');
+			assert.notOk($container.is(':visible'), 'toggle container hidden after uncheck');
+		});
+	};
+});
diff --git a/test/markup/checkbox-markup.html b/test/markup/checkbox-markup.html
index b53fe466b..98c833ac7 100644
--- a/test/markup/checkbox-markup.html
+++ b/test/markup/checkbox-markup.html
@@ -4,38 +4,38 @@
 <body>
 <div id="MyCheckboxContainer">
 
-	<div id="CheckboxCheckedEnabled" class="checkbox">
-		<label class="checkbox-custom">
-			<input class="sr-only checked" type="checkbox" checked="checked" id="Checkbox1" />
+	<div class="checkbox">
+		<label class="checkbox-custom" id="CheckboxCheckedEnabled" >
+			<input class="sr-only checked" type="checkbox" checked="checked" />
 			<span class="checkbox-label">Checked/Enabled</span>
 		</label>
 	</div>
 
-	<div id="CheckboxCheckedDisabled" class="checkbox">
-		<label class="checkbox-custom">
+	<div class="checkbox">
+		<label class="checkbox-custom" id="CheckboxCheckedDisabled">
 			<input class="sr-only checked" type="checkbox" checked="checked" disabled="disabled" />
 			<span class="checkbox-label">Checked/Disabled</span>
 		</label>
 	</div>
 
-	<div id="CheckboxUncheckedEnabled" class="checkbox">
-		<label class="checkbox-custom">
+	<div class="checkbox">
+		<label class="checkbox-custom" id="CheckboxUncheckedEnabled">
 			<input class="sr-only checked" type="checkbox" />
 			<span class="checkbox-label">Unchecked/Enabled</span>
 		</label>
 	</div>
 
-	<div id="CheckboxUncheckedDisabled" class="checkbox">
-		<label class="checkbox-custom">
+	<div class="checkbox">
+		<label class="checkbox-custom" id="CheckboxUncheckedDisabled">
 			<input class="sr-only checked" type="checkbox" disabled="disabled" />
 			<span class="checkbox-label">Unchecked/Disabled</span>
 		</label>
 	</div>
 
 
-	<div id="CheckboxToggle">
+	<div>
 		<div class="checkbox">
-			<label class="checkbox-custom">
+			<label class="checkbox-custom" id="CheckboxToggle">
 				<input type="checkbox" class="sr-only" data-toggle=".checkboxToggle" />
 				Custom checkbox toggles by class
 			</label>

From 6517999e9abfaae0ba8b784267f4c8145efdcd62 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Mon, 19 Jun 2017 14:27:56 -0400
Subject: [PATCH 07/31] (GH1972) renames return functions properly

---
 test/checkbox-tests/return.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/checkbox-tests/return.js b/test/checkbox-tests/return.js
index 132abcf4d..78a41cd09 100644
--- a/test/checkbox-tests/return.js
+++ b/test/checkbox-tests/return.js
@@ -1,5 +1,5 @@
-define(function checkboxDisableEnableModule () {
-	return function checkboxDisableEnable (QUnit) {
+define(function checkboxReturnModule () {
+	return function checkboxReturn (QUnit) {
 		QUnit.test('should return checked state', function testReturn (assert) {
 			// Verify checked state changes with toggle method
 			assert.ok(this.$checkedEnabled.checkbox('isChecked'), 'checkbox state is checked');

From 8b2382349ac526518ce30c28a70d0c69785edb3f Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Mon, 19 Jun 2017 14:28:13 -0400
Subject: [PATCH 08/31] (GH1972) stubs out keyboard tests

---
 test/checkbox-test.js           |  1 +
 test/checkbox-tests/keyboard.js | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 test/checkbox-tests/keyboard.js

diff --git a/test/checkbox-test.js b/test/checkbox-test.js
index 8c1635e1e..4fd83c642 100644
--- a/test/checkbox-test.js
+++ b/test/checkbox-test.js
@@ -29,5 +29,6 @@ define(function checkboxTest (require) {
 		require('./checkbox-tests/events')(QUnit);
 		require('./checkbox-tests/visibility')(QUnit);
 		require('./checkbox-tests/destroy')(QUnit);
+		require('./checkbox-tests/keyboard')(QUnit);
 	});
 });
diff --git a/test/checkbox-tests/keyboard.js b/test/checkbox-tests/keyboard.js
new file mode 100644
index 000000000..ab54d7975
--- /dev/null
+++ b/test/checkbox-tests/keyboard.js
@@ -0,0 +1,29 @@
+define(function checkboxKeyboardModule () {
+	return function checkboxKeyboard (QUnit) {
+		QUnit.test('spacebar should check and uncheck checkbox', function testSpace (assert) {
+			var $input = this.$uncheckedEnabled.find('input[type="checkbox"]');
+
+			// Set checked state
+			assert.notOk($input.prop('checked'), 'checkbox unchecked initially');
+			// select checkbox & hit spacebar
+			assert.ok($input.prop('checked'), 'checkbox checked after hitting spacebar on focused checkbox');
+			// hit spacebar again
+			assert.ok($input.prop('checked'), 'checkbox unchecked after hitting spacebar on focused checkbox');
+		});
+		QUnit.test('enter should check and uncheck checkbox', function testEnter (assert) {
+			var $input = this.$uncheckedEnabled.find('input[type="checkbox"]');
+
+			// Set checked state
+			assert.notOk($input.prop('checked'), 'checkbox unchecked initially');
+			// select checkbox & hit enter
+			assert.ok($input.prop('checked'), 'checkbox checked after hitting enter on focused checkbox');
+			// hit enter again
+			assert.ok($input.prop('checked'), 'checkbox unchecked after hitting enter on focused checkbox');
+		});
+		QUnit.test('should be tab-able', function testTab (assert) {
+			// Test to see if checkbox is focused
+			// Hit tab
+			// Teest to make sure checkbox is now focused
+		});
+	};
+});

From 42f2f1436859e36a47b73acf6056483caa856afc Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Tue, 20 Jun 2017 13:11:52 -0400
Subject: [PATCH 09/31] (GH1972) removes attempt to innapropriately test
 browser functionality

---
 test/checkbox-test.js           |  1 -
 test/checkbox-tests/keyboard.js | 29 -----------------------------
 2 files changed, 30 deletions(-)
 delete mode 100644 test/checkbox-tests/keyboard.js

diff --git a/test/checkbox-test.js b/test/checkbox-test.js
index 4fd83c642..8c1635e1e 100644
--- a/test/checkbox-test.js
+++ b/test/checkbox-test.js
@@ -29,6 +29,5 @@ define(function checkboxTest (require) {
 		require('./checkbox-tests/events')(QUnit);
 		require('./checkbox-tests/visibility')(QUnit);
 		require('./checkbox-tests/destroy')(QUnit);
-		require('./checkbox-tests/keyboard')(QUnit);
 	});
 });
diff --git a/test/checkbox-tests/keyboard.js b/test/checkbox-tests/keyboard.js
deleted file mode 100644
index ab54d7975..000000000
--- a/test/checkbox-tests/keyboard.js
+++ /dev/null
@@ -1,29 +0,0 @@
-define(function checkboxKeyboardModule () {
-	return function checkboxKeyboard (QUnit) {
-		QUnit.test('spacebar should check and uncheck checkbox', function testSpace (assert) {
-			var $input = this.$uncheckedEnabled.find('input[type="checkbox"]');
-
-			// Set checked state
-			assert.notOk($input.prop('checked'), 'checkbox unchecked initially');
-			// select checkbox & hit spacebar
-			assert.ok($input.prop('checked'), 'checkbox checked after hitting spacebar on focused checkbox');
-			// hit spacebar again
-			assert.ok($input.prop('checked'), 'checkbox unchecked after hitting spacebar on focused checkbox');
-		});
-		QUnit.test('enter should check and uncheck checkbox', function testEnter (assert) {
-			var $input = this.$uncheckedEnabled.find('input[type="checkbox"]');
-
-			// Set checked state
-			assert.notOk($input.prop('checked'), 'checkbox unchecked initially');
-			// select checkbox & hit enter
-			assert.ok($input.prop('checked'), 'checkbox checked after hitting enter on focused checkbox');
-			// hit enter again
-			assert.ok($input.prop('checked'), 'checkbox unchecked after hitting enter on focused checkbox');
-		});
-		QUnit.test('should be tab-able', function testTab (assert) {
-			// Test to see if checkbox is focused
-			// Hit tab
-			// Teest to make sure checkbox is now focused
-		});
-	};
-});

From 2c3ae6d7cd8761548cc9041302ee61dc029b5a30 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Tue, 20 Jun 2017 13:13:05 -0400
Subject: [PATCH 10/31] (GH1972) moves keypress factory method into more
 shareable location

---
 test/helpers.js            | 41 ++++++++++++++++++++++++++++++++++++++
 test/tree-tests/helpers.js | 28 +++-----------------------
 test/utilities-test.js     | 41 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+), 25 deletions(-)
 create mode 100644 test/helpers.js
 create mode 100644 test/utilities-test.js

diff --git a/test/helpers.js b/test/helpers.js
new file mode 100644
index 000000000..909a5e367
--- /dev/null
+++ b/test/helpers.js
@@ -0,0 +1,41 @@
+/* global QUnit:false, module:false, test:false, asyncTest:false, expect:false */
+/* global start:false, stop:false ok:false, equal:false, notEqual:false, deepEqual:false */
+/* global notDeepEqual:false, strictEqual:false, notStrictEqual:false, raises:false */
+define(function treeDataFactory (require) {
+	var $ = require('jquery');
+
+	var KEYMAP = {
+		tab: 9,
+		enter: 13,
+		space: 32,
+		end: 35,
+		home: 36,
+		left: 37,
+		up: 38,
+		right: 39,
+		down: 40
+	};
+
+	var getKeyDown = function getKeyDown (which, target) {
+		var $target = $(target);
+
+		var eventObject = this.defaultEventObject;
+		eventObject.which = KEYMAP[which];
+		eventObject.keyCode = KEYMAP[which];
+
+		if ($target) {
+			eventObject.originalEvent = $.Event( 'keydown', { // eslint-disable-line new-cap
+				target: $target
+			});
+		}
+
+		var e = $.Event( 'keydown', eventObject); // eslint-disable-line new-cap
+
+		return e;
+	};
+
+	return {
+		getKeyDown: getKeyDown,
+		KEYMAP: KEYMAP
+	};
+});
diff --git a/test/tree-tests/helpers.js b/test/tree-tests/helpers.js
index 519d450bf..19648404e 100644
--- a/test/tree-tests/helpers.js
+++ b/test/tree-tests/helpers.js
@@ -3,6 +3,8 @@
 /* global notDeepEqual:false, strictEqual:false, notStrictEqual:false, raises:false */
 define(function treeDataFactory (require) {
 	var $ = require('jquery');
+	var getKeyDown = require('../../helpers.js').getKeyDown;
+	var KEYMAP = require('../../helpers.js').KEYMAP;
 
 	var constants =	{
 		NUM_CHILDREN: 9,
@@ -118,30 +120,6 @@ define(function treeDataFactory (require) {
 		};
 	};
 
-	var KEYMAP = {
-		enter: 13,
-		space: 32,
-		end: 35,
-		home: 36,
-		left: 37,
-		up: 38,
-		right: 39,
-		down: 40
-	};
-
-	var getKeyDown = function getKeyDown (which, $target) {
-		var eventObject = this.defaultEventObject;
-		eventObject.which = KEYMAP[which];
-
-		if ($target) {
-			eventObject.originalEvent = $.Event( 'keydown', { // eslint-disable-line new-cap
-				target: $target
-			});
-		}
-
-		return $.Event( 'keydown', eventObject); // eslint-disable-line new-cap
-	};
-
 	var setup = function setup () {
 		var callLimit = 50;
 		var callCount = 0;
@@ -173,7 +151,7 @@ define(function treeDataFactory (require) {
 			originalEvent: $.Event( 'keydown', { // eslint-disable-line new-cap
 				target: this.$tree.find('li:not(".hidden"):first')
 			}),
-			which: 37
+			which: KEYMAP.left
 		};
 
 		this.getKeyDown = getKeyDown;
diff --git a/test/utilities-test.js b/test/utilities-test.js
new file mode 100644
index 000000000..ef39bb2e4
--- /dev/null
+++ b/test/utilities-test.js
@@ -0,0 +1,41 @@
+define( function utilitiesTestModule(require) {
+	var QUnit = require('qunit');
+	var $ = require('jquery');
+
+	require('fuelux/utilities');
+
+	QUnit.module( 'Fuel UX Utilities', function utilitiesTests() {
+		QUnit.test( 'should be defined on jquery object', function utilitiesObjectDefinedTest( assert ) {
+			assert.equal(typeof $().utilities,  'object', 'utilities object is defined' );
+		});
+
+		QUnit.module( 'cleanInput Method', {
+			beforeEach: function beforeEachUtilitiesCleanInputTests() {
+				this.utilities = $().utilities;
+				this.cleanInput = this.utilities.cleanInput;
+			}
+		}, function utilitiesCleanInputTests() {
+			QUnit.test( 'should be defined on utilities object', function cleanInputMethodDefinedTest( assert ) {
+				assert.equal(typeof this.utilities.cleanInput,  'function', 'cleanInput function is defined' );
+			});
+
+			QUnit.test( 'should encode strings', function cleanInputMethodEncodeTest( assert ) {
+				var dirtyString = '<script>';
+				var cleanString = '&lt;script&gt;';
+				assert.equal(this.cleanInput(dirtyString),  cleanString, 'string should be encoded' );
+			});
+
+			QUnit.test( 'should not double encode strings', function cleanInputMethodEncodeTest( assert ) {
+				var variants = [
+					{dirtyString: '&lt;&gt;', cleanString: '&lt;&gt;'},
+					{dirtyString: '&lt;script&gt;', cleanString: '&lt;script&gt;'},
+					{dirtyString: '<&lt;&gt;>', cleanString: '&lt;&lt;&gt;&gt;'}
+				];
+
+				variants.forEach(function forEachDoubleEncodeVariant(variant, index) {
+					assert.equal(this.cleanInput(variant.dirtyString), variant.cleanString, 'variant ' + (index + 1) + ' string should be encoded' );
+				}, this);
+			});
+		});
+	});
+});

From 14e7913f20ad7eaeb9b9dd01980448a20e3d6735 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Tue, 20 Jun 2017 13:13:43 -0400
Subject: [PATCH 11/31] (GH1972) puts back non-checkbox unit tests

---
 test/tests.js | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/test/tests.js b/test/tests.js
index be4858113..2bcb57402 100644
--- a/test/tests.js
+++ b/test/tests.js
@@ -43,21 +43,22 @@ define(function testWrapper (require) {
 
 	require('moment');
 	require('./test/checkbox-test');
-	// require('./test/combobox-test');
-	// require('./test/datepicker-moment-test');
-	// require('./test/infinite-scroll-test');
-	// require('./test/loader-test');
-	// require('./test/pillbox-test');
-	// require('./test/placard-test');
-	// require('./test/radio-test');
-	// require('./test/repeater-test');
-	// require('./test/repeater-list-test');
-	// require('./test/repeater-thumbnail-test');
-	// require('./test/scheduler-test');
-	// require('./test/search-test');
-	// require('./test/selectlist-test');
-	// require('./test/spinbox-test');
-	// require('./test/picker-test');
-	// require('./test/tree-test');
-	// require('./test/wizard-test');
+	require('./test/combobox-test');
+	require('./test/datepicker-moment-test');
+	require('./test/infinite-scroll-test');
+	require('./test/loader-test');
+	require('./test/pillbox-test');
+	require('./test/placard-test');
+	require('./test/radio-test');
+	require('./test/repeater-test');
+	require('./test/repeater-list-test');
+	require('./test/repeater-thumbnail-test');
+	require('./test/scheduler-test');
+	require('./test/search-test');
+	require('./test/selectlist-test');
+	require('./test/spinbox-test');
+	require('./test/picker-test');
+	require('./test/tree-test');
+	require('./test/wizard-test');
+	require('./test/utilities-test');
 });

From 11bbee5c396bf622e89a81423194fc57fd39fc25 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Tue, 20 Jun 2017 14:04:33 -0400
Subject: [PATCH 12/31] (GH1972) adds check for visibility hidden|collapse and
 errors out if checkbox is hidden or collapsed.

---
 js/checkbox.js | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/js/checkbox.js b/js/checkbox.js
index 9023bbb13..26fc96e25 100644
--- a/js/checkbox.js
+++ b/js/checkbox.js
@@ -33,16 +33,27 @@
 
 	var Checkbox = function (element, options) {
 		this.options = $.extend({}, $.fn.checkbox.defaults, options);
+		var $element = $(element);
 
-		if(element.tagName.toLowerCase() !== 'label') {
-			//console.log('initialize checkbox on the label that wraps the checkbox');
+		var errors = '';
+		if (element.tagName.toLowerCase() !== 'label') {
+			errors += 'checkbox must be initialized on the `label` that wraps the `input` element. See https://github.com/ExactTarget/fuelux/blob/master/reference/markup/checkbox.html for example of proper markup. Call `.checkbox()` on the `<label>` not the `<input>`.';
+		}
+		if ($element.css('visibility').match(/hidden|collapse/)) {
+			errors += 'for accessibility reasons, in order for tab and space to function on checkbox, `visibility` must not be set to `hidden` or `collapse`';
+		}
+
+		if (errors !== '' && !this.options.ignoreErrors) {
+			if (window && window.console && window.console.error) {
+				window.console.error(errors);
+			}
 			return;
 		}
 
 		// cache elements
-		this.$label = $(element);
+		this.$label = $element;
 		this.$chk = this.$label.find('input[type="checkbox"]');
-		this.$container = $(element).parent('.checkbox'); // the container div
+		this.$container = $element.parent('.checkbox'); // the container div
 
 		// determine if a toggle container is specified
 		var containerSelector = this.$chk.attr('data-toggle');

From c8a6aa96f7cdc0036fcf97ec4cd68a0dd91a43f9 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Tue, 20 Jun 2017 16:14:33 -0400
Subject: [PATCH 13/31] (GH1972) makes UMD wrapper consistent across Fuel UX

---
 js/checkbox.js           |  8 +++++---
 js/combobox.js           | 12 +++++++-----
 js/datepicker.js         |  6 ++++--
 js/dropdown-autoflip.js  |  6 ++++--
 js/infinite-scroll.js    |  6 ++++--
 js/loader.js             |  6 ++++--
 js/picker.js             |  6 ++++--
 js/pillbox.js            |  9 +++++----
 js/placard.js            |  6 ++++--
 js/radio.js              |  6 ++++--
 js/repeater-list.js      |  4 ++--
 js/repeater-thumbnail.js |  8 +++++---
 js/repeater.js           |  4 ++--
 js/scheduler.js          | 13 +++++++------
 js/search.js             |  6 ++++--
 js/selectlist.js         |  6 ++++--
 js/spinbox.js            |  6 ++++--
 js/tree.js               |  2 +-
 js/utilities.js          |  3 ++-
 js/wizard.js             |  6 ++++--
 20 files changed, 80 insertions(+), 49 deletions(-)

diff --git a/js/checkbox.js b/js/checkbox.js
index 26fc96e25..ec7ce3a9d 100644
--- a/js/checkbox.js
+++ b/js/checkbox.js
@@ -1,3 +1,5 @@
+/* global jQuery:true */
+
 /*
  * Fuel UX Checkbox
  * https://github.com/ExactTarget/fuelux
@@ -11,7 +13,7 @@
 // For more information on UMD visit:
 // https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
 
-(function (factory) {
+(function umdFactory (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// if AMD loader is available, register as an anonymous module.
 		define(['jquery'], factory);
@@ -22,7 +24,7 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function ($) {
+}(function CheckboxWrapper ($) {
 	// -- END UMD WRAPPER PREFACE --
 
 	// -- BEGIN MODULE CODE HERE --
@@ -31,7 +33,7 @@
 
 	// CHECKBOX CONSTRUCTOR AND PROTOTYPE
 
-	var Checkbox = function (element, options) {
+	var Checkbox = function Checkbox (element, options) {
 		this.options = $.extend({}, $.fn.checkbox.defaults, options);
 		var $element = $(element);
 
diff --git a/js/combobox.js b/js/combobox.js
index 92fc08efb..f1c2b2a67 100644
--- a/js/combobox.js
+++ b/js/combobox.js
@@ -1,3 +1,5 @@
+/* global jQuery:true */
+
 /*
  * Fuel UX Combobox
  * https://github.com/ExactTarget/fuelux
@@ -11,7 +13,7 @@
 // For more information on UMD visit:
 // https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
 
-(function (factory) {
+(function umdFactory (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// if AMD loader is available, register as an anonymous module.
 		define(['jquery'], factory);
@@ -22,7 +24,7 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function ($) {
+}(function ComboboxWrapper ($) {
 	// -- END UMD WRAPPER PREFACE --
 
 	// -- BEGIN MODULE CODE HERE --
@@ -83,9 +85,9 @@
 		},
 
 		doSelect: function ($item) {
-			
+
 			if (typeof $item[0] !== 'undefined') {
-				// remove selection from old item, may result in remove and 
+				// remove selection from old item, may result in remove and
 				// re-addition of class if item is the same
 				this.$element.find('li.selected:first').removeClass('selected');
 
@@ -285,7 +287,7 @@
 			if (extra && extra.synthetic) {
 				this.selectByText(val);
 				return;
-			} 
+			}
 			this.selectByText(val);
 
 			// find match based on input
diff --git a/js/datepicker.js b/js/datepicker.js
index dfa74d676..657b080cd 100644
--- a/js/datepicker.js
+++ b/js/datepicker.js
@@ -1,3 +1,5 @@
+/* global jQuery:true */
+
 /*
  * Fuel UX Datepicker
  * https://github.com/ExactTarget/fuelux
@@ -11,7 +13,7 @@
 // For more information on UMD visit:
 // https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
 
-(function (factory) {
+(function umdFactory (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// if AMD loader is available, register as an anonymous module.
 		define(['jquery'], factory);
@@ -22,7 +24,7 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function ($) {
+}(function DatepickerWrapper ($) {
 	// -- END UMD WRAPPER PREFACE --
 
 	// -- BEGIN MODULE CODE HERE --
diff --git a/js/dropdown-autoflip.js b/js/dropdown-autoflip.js
index 005758ff5..582d8a7d9 100644
--- a/js/dropdown-autoflip.js
+++ b/js/dropdown-autoflip.js
@@ -1,3 +1,5 @@
+/* global jQuery:true */
+
 /*
  * Fuel UX Dropdown Auto Flip
  * https://github.com/ExactTarget/fuelux
@@ -11,7 +13,7 @@
 // For more information on UMD visit:
 // https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
 
-(function (factory) {
+(function umdFactory (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// if AMD loader is available, register as an anonymous module.
 		define(['jquery'], factory);
@@ -22,7 +24,7 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function ($) {
+}(function dropdownautoflipWrapper ($) {
 	// -- END UMD WRAPPER PREFACE --
 
 	// -- BEGIN MODULE CODE HERE --
diff --git a/js/infinite-scroll.js b/js/infinite-scroll.js
index d431bb571..b744716a8 100644
--- a/js/infinite-scroll.js
+++ b/js/infinite-scroll.js
@@ -1,3 +1,5 @@
+/* global jQuery:true */
+
 /*
  * Fuel UX Infinite Scroll
  * https://github.com/ExactTarget/fuelux
@@ -11,7 +13,7 @@
 // For more information on UMD visit:
 // https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
 
-(function (factory) {
+(function umdFactory (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// if AMD loader is available, register as an anonymous module.
 		define(['jquery', 'fuelux/loader'], factory);
@@ -22,7 +24,7 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function ($) {
+}(function InfiniteScrollWrapper ($) {
 	// -- END UMD WRAPPER PREFACE --
 
 	// -- BEGIN MODULE CODE HERE --
diff --git a/js/loader.js b/js/loader.js
index 0d1442ca2..ca9c36315 100644
--- a/js/loader.js
+++ b/js/loader.js
@@ -1,3 +1,5 @@
+/* global jQuery:true */
+
 /*
  * Fuel UX Loader
  * https://github.com/ExactTarget/fuelux
@@ -11,7 +13,7 @@
 // For more information on UMD visit:
 // https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
 
-(function (factory) {
+(function umdFactory (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// if AMD loader is available, register as an anonymous module.
 		define(['jquery'], factory);
@@ -22,7 +24,7 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function ($) {
+}(function LoaderWrapper ($) {
 	// -- END UMD WRAPPER PREFACE --
 
 	// -- BEGIN MODULE CODE HERE --
diff --git a/js/picker.js b/js/picker.js
index e3274ef52..823a0c630 100644
--- a/js/picker.js
+++ b/js/picker.js
@@ -1,3 +1,5 @@
+/* global jQuery:true */
+
 /*
  * Fuel UX Picker
  * https://github.com/ExactTarget/fuelux
@@ -11,7 +13,7 @@
 // For more information on UMD visit:
 // https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
 
-(function (factory) {
+(function umdFactory (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// if AMD loader is available, register as an anonymous module.
 		define(['jquery'], factory);
@@ -22,7 +24,7 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function ($) {
+}(function PickerWrapper ($) {
 	// -- END UMD WRAPPER PREFACE --
 
 	// -- BEGIN MODULE CODE HERE --
diff --git a/js/pillbox.js b/js/pillbox.js
index fd6629314..c4ef263f0 100644
--- a/js/pillbox.js
+++ b/js/pillbox.js
@@ -14,7 +14,7 @@
 
 // For more information on UMD visit:
 // https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
-(function umdWrapper (factory) {
+(function umdFactory (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// if AMD loader is available, register as an anonymous module.
 		define(['jquery', 'fuelux/utilities', 'fuelux/dropdown-autoflip'], factory);
@@ -25,7 +25,10 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function pillboxWrapper ($) {
+}(function PillboxWrapper ($) {
+	// -- END UMD WRAPPER PREFACE --
+
+	// -- BEGIN MODULE CODE HERE --
 	if (!$.fn.dropdownautoflip) {
 		throw new Error('Fuel UX pillbox control requires dropdown-autoflip.');
 	}
@@ -33,9 +36,7 @@
 	if (!$.fn.utilities) {
 		throw new Error('Fuel UX pillbox control requires FuelUX utilities.');
 	}
-	// -- END UMD WRAPPER PREFACE --
 
-	// -- BEGIN MODULE CODE HERE --
 	var old = $.fn.pillbox;
 
 	var utilities = $.fn.utilities;
diff --git a/js/placard.js b/js/placard.js
index f9358add7..11bf7ae82 100644
--- a/js/placard.js
+++ b/js/placard.js
@@ -1,3 +1,5 @@
+/* global jQuery:true */
+
 /*
  * Fuel UX Placard
  * https://github.com/ExactTarget/fuelux
@@ -11,7 +13,7 @@
 // For more information on UMD visit:
 // https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
 
-(function (factory) {
+(function umdFactory (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// if AMD loader is available, register as an anonymous module.
 		define(['jquery'], factory);
@@ -22,7 +24,7 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function ($) {
+}(function PlacardWrapper ($) {
 	// -- END UMD WRAPPER PREFACE --
 
 	// -- BEGIN MODULE CODE HERE --
diff --git a/js/radio.js b/js/radio.js
index 05b13fe0d..4d257680f 100644
--- a/js/radio.js
+++ b/js/radio.js
@@ -1,3 +1,5 @@
+/* global jQuery:true */
+
 /*
  * Fuel UX Radio
  * https://github.com/ExactTarget/fuelux
@@ -11,7 +13,7 @@
 // For more information on UMD visit:
 // https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
 
-(function (factory) {
+(function umdFactory (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// if AMD loader is available, register as an anonymous module.
 		define(['jquery'], factory);
@@ -22,7 +24,7 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function ($) {
+}(function RadioWrapper ($) {
 	// -- END UMD WRAPPER PREFACE --
 
 	// -- BEGIN MODULE CODE HERE --
diff --git a/js/repeater-list.js b/js/repeater-list.js
index 90377631b..e615c209e 100755
--- a/js/repeater-list.js
+++ b/js/repeater-list.js
@@ -13,7 +13,7 @@
 // For more information on UMD visit:
 // https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
 
-(function UMDFactory (factory) {
+(function umdFactory (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// if AMD loader is available, register as an anonymous module.
 		define(['jquery', 'fuelux/repeater', 'fuelux/checkbox'], factory);
@@ -24,7 +24,7 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function repeaterList ($) {
+}(function repeaterListWrapper ($) {
 	// -- END UMD WRAPPER PREFACE --
 
 	// -- BEGIN MODULE CODE HERE --
diff --git a/js/repeater-thumbnail.js b/js/repeater-thumbnail.js
index 026b6c615..8e55a4a8b 100755
--- a/js/repeater-thumbnail.js
+++ b/js/repeater-thumbnail.js
@@ -1,3 +1,5 @@
+/* global jQuery:true */
+
 /*
  * Fuel UX Repeater - Thumbnail View Plugin
  * https://github.com/ExactTarget/fuelux
@@ -11,7 +13,7 @@
 // For more information on UMD visit:
 // https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
 
-(function (factory) {
+(function umdFactory (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// if AMD loader is available, register as an anonymous module.
 		define(['jquery', 'fuelux/repeater'], factory);
@@ -22,7 +24,7 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function ($) {
+}(function repeaterThumbnailWrapper ($) {
 	// -- END UMD WRAPPER PREFACE --
 
 	// -- BEGIN MODULE CODE HERE --
@@ -166,7 +168,7 @@
 				var selected = 'selected';
 				var self = this;
 				var $thumbnail = $(fillTemplate(helpers.subset[helpers.index], this.viewOptions.thumbnail_template));
-				
+
 				$thumbnail.data('item_data', helpers.data.items[helpers.index]);
 
 				if (selectable) {
diff --git a/js/repeater.js b/js/repeater.js
index a08e00a10..115197410 100755
--- a/js/repeater.js
+++ b/js/repeater.js
@@ -13,7 +13,7 @@
 // For more information on UMD visit:
 // https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
 
-(function UMDFactory (factory) {
+(function umdFactory (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// if AMD loader is available, register as an anonymous module.
 		define(['jquery', 'fuelux/combobox', 'fuelux/infinite-scroll', 'fuelux/search', 'fuelux/selectlist'], factory);
@@ -25,7 +25,7 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function repeater ($) {
+}(function RepeaterWrapper ($) {
 	// -- END UMD WRAPPER PREFACE --
 
 	// -- BEGIN MODULE CODE HERE --
diff --git a/js/scheduler.js b/js/scheduler.js
index ad4c59f63..a19924859 100644
--- a/js/scheduler.js
+++ b/js/scheduler.js
@@ -1,3 +1,5 @@
+/* global jQuery:true */
+
 /*
  * Fuel UX Scheduler
  * https://github.com/ExactTarget/fuelux
@@ -11,7 +13,7 @@
 // For more information on UMD visit:
 // https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
 
-(function (factory) {
+(function umdFactory (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// if AMD loader is available, register as an anonymous module.
 		define(['jquery', 'fuelux/combobox', 'fuelux/datepicker', 'fuelux/radio', 'fuelux/selectlist', 'fuelux/spinbox'], factory);
@@ -23,14 +25,13 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function ($) {
-	if (!$.fn.combobox || !$.fn.datepicker || !$.fn.radio || !$.fn.selectlist || !$.fn.spinbox) {
-		throw new Error('Fuel UX scheduler control requires combobox, datepicker, radio, selectlist, and spinbox.');
-	}
-
+}(function SchedulerWrapper ($) {
 	// -- END UMD WRAPPER PREFACE --
 
 	// -- BEGIN MODULE CODE HERE --
+	if (!$.fn.combobox || !$.fn.datepicker || !$.fn.radio || !$.fn.selectlist || !$.fn.spinbox) {
+		throw new Error('Fuel UX scheduler control requires combobox, datepicker, radio, selectlist, and spinbox.');
+	}
 
 	var old = $.fn.scheduler;
 
diff --git a/js/search.js b/js/search.js
index 51faebcff..20a22fea6 100644
--- a/js/search.js
+++ b/js/search.js
@@ -1,3 +1,5 @@
+/* global jQuery:true */
+
 /*
  * Fuel UX Search
  * https://github.com/ExactTarget/fuelux
@@ -11,7 +13,7 @@
 // For more information on UMD visit:
 // https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
 
-(function (factory) {
+(function umdFactory (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// if AMD loader is available, register as an anonymous module.
 		define(['jquery'], factory);
@@ -22,7 +24,7 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function ($) {
+}(function SearchWrapper ($) {
 	// -- END UMD WRAPPER PREFACE --
 
 	// -- BEGIN MODULE CODE HERE --
diff --git a/js/selectlist.js b/js/selectlist.js
index 6a7a4ec55..5a517302c 100644
--- a/js/selectlist.js
+++ b/js/selectlist.js
@@ -1,3 +1,5 @@
+/* global jQuery:true */
+
 /*
  * Fuel UX Selectlist
  * https://github.com/ExactTarget/fuelux
@@ -11,7 +13,7 @@
 // For more information on UMD visit:
 // https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
 
-(function (factory) {
+(function umdFactory (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// if AMD loader is available, register as an anonymous module.
 		define(['jquery'], factory);
@@ -22,7 +24,7 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function ($) {
+}(function SelectlistWrapper ($) {
 	// -- END UMD WRAPPER PREFACE --
 
 	// -- BEGIN MODULE CODE HERE --
diff --git a/js/spinbox.js b/js/spinbox.js
index 9c1c7cc4b..856111808 100644
--- a/js/spinbox.js
+++ b/js/spinbox.js
@@ -1,3 +1,5 @@
+/* global jQuery:true */
+
 /*
  * Fuel UX Spinbox
  * https://github.com/ExactTarget/fuelux
@@ -11,7 +13,7 @@
 // For more information on UMD visit:
 // https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
 
-(function (factory) {
+(function umdFactory (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// if AMD loader is available, register as an anonymous module.
 		define(['jquery'], factory);
@@ -22,7 +24,7 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function ($) {
+}(function SpinboxWrapper ($) {
 	// -- END UMD WRAPPER PREFACE --
 
 	// -- BEGIN MODULE CODE HERE --
diff --git a/js/tree.js b/js/tree.js
index 1bf62fb09..6e7d86a91 100644
--- a/js/tree.js
+++ b/js/tree.js
@@ -24,7 +24,7 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function tree ($) {
+}(function TreeWrapper ($) {
 	// -- END UMD WRAPPER PREFACE --
 
 	// -- BEGIN MODULE CODE HERE --
diff --git a/js/utilities.js b/js/utilities.js
index f9bb82ef5..0c5300114 100644
--- a/js/utilities.js
+++ b/js/utilities.js
@@ -26,8 +26,9 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function utilities ($) {
+}(function utilitiesWrapper ($) {
 	// -- END UMD WRAPPER PREFACE --
+
 	// -- BEGIN MODULE CODE HERE --
 	var CONST = {
 		BACKSPACE_KEYCODE: 8,
diff --git a/js/wizard.js b/js/wizard.js
index 45e87de56..82c3b1b32 100644
--- a/js/wizard.js
+++ b/js/wizard.js
@@ -1,3 +1,5 @@
+/* global jQuery:true */
+
 /*
  * Fuel UX Wizard
  * https://github.com/ExactTarget/fuelux
@@ -11,7 +13,7 @@
 // For more information on UMD visit:
 // https://github.com/umdjs/umd/blob/master/jqueryPlugin.js
 
-(function (factory) {
+(function umdFactory (factory) {
 	if (typeof define === 'function' && define.amd) {
 		// if AMD loader is available, register as an anonymous module.
 		define(['jquery'], factory);
@@ -22,7 +24,7 @@
 		// OR use browser globals if AMD is not present
 		factory(jQuery);
 	}
-}(function ($) {
+}(function WizardWrapper ($) {
 	// -- END UMD WRAPPER PREFACE --
 
 	// -- BEGIN MODULE CODE HERE --

From 384d28fd430cb49613f66e302487c7edfbbb26cf Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Tue, 20 Jun 2017 16:19:19 -0400
Subject: [PATCH 14/31] (GH1972) fixes eslint errors in checkbox

---
 js/checkbox.js | 61 +++++++++++++++++++-------------------------------
 1 file changed, 23 insertions(+), 38 deletions(-)

diff --git a/js/checkbox.js b/js/checkbox.js
index ec7ce3a9d..8afc13c28 100644
--- a/js/checkbox.js
+++ b/js/checkbox.js
@@ -72,9 +72,8 @@
 
 		constructor: Checkbox,
 
-		setInitialState: function() {
+		setInitialState: function setInitialState () {
 			var $chk = this.$chk;
-			var $lbl = this.$label;
 
 			// get current state of input
 			var checked = $chk.prop('checked');
@@ -85,26 +84,19 @@
 			this.setDisabledState($chk, disabled);
 		},
 
-		setCheckedState: function(element, checked) {
+		setCheckedState: function setCheckedState (element, checked) {
 			var $chk = element;
 			var $lbl = this.$label;
-			var $container = this.$container;
 			var $containerToggle = this.$toggleContainer;
 
-			// set class on outer container too...to support highlighting
-			// TODO: verify inline checkboxes, also test with MCTheme
-
-			if(checked) {
+			if (checked) {
 				$chk.prop('checked', true);
 				$lbl.addClass('checked');
-				//$container.addClass('checked');
 				$containerToggle.removeClass('hide hidden');
 				$lbl.trigger('checked.fu.checkbox');
-			}
-			else {
+			} else {
 				$chk.prop('checked', false);
 				$lbl.removeClass('checked');
-				//$container.removeClass('checked');
 				$containerToggle.addClass('hidden');
 				$lbl.trigger('unchecked.fu.checkbox');
 			}
@@ -112,67 +104,60 @@
 			$lbl.trigger('changed.fu.checkbox', checked);
 		},
 
-		setDisabledState: function(element, disabled) {
-			var $chk = element;
+		setDisabledState: function setDisabledState (element, disabled) {
 			var $lbl = this.$label;
 
-			if(disabled) {
+			if (disabled) {
 				this.$chk.prop('disabled', true);
 				$lbl.addClass('disabled');
 				$lbl.trigger('disabled.fu.checkbox');
-			}
-			else {
+			} else {
 				this.$chk.prop('disabled', false);
 				$lbl.removeClass('disabled');
 				$lbl.trigger('enabled.fu.checkbox');
 			}
 		},
 
-		itemchecked: function (evt) {
+		itemchecked: function itemchecked (evt) {
 			var $chk = $(evt.target);
 			var checked = $chk.prop('checked');
 
 			this.setCheckedState($chk, checked);
 		},
 
-		toggle: function () {
+		toggle: function toggle () {
 			var checked = this.isChecked();
 
-			if(checked) {
+			if (checked) {
 				this.uncheck();
-			}
-			else {
+			} else {
 				this.check();
 			}
 		},
 
-		check: function () {
+		check: function check () {
 			this.setCheckedState(this.$chk, true);
 		},
 
-		uncheck: function () {
+		uncheck: function uncheck () {
 			this.setCheckedState(this.$chk, false);
 		},
 
-		isChecked: function () {
+		isChecked: function isChecked () {
 			var checked = this.$chk.prop('checked');
 			return checked;
 		},
 
-		enable: function () {
+		enable: function enable () {
 			this.setDisabledState(this.$chk, false);
 		},
 
-		disable: function () {
+		disable: function disable () {
 			this.setDisabledState(this.$chk, true);
 		},
 
-		destroy: function () {
+		destroy: function destroy () {
 			this.$label.remove();
-			// remove any external bindings
-			// [none]
-			// empty elements to return to original markup
-			// [none]
 			return this.$label[0].outerHTML;
 		}
 	};
@@ -181,11 +166,11 @@
 
 	// CHECKBOX PLUGIN DEFINITION
 
-	$.fn.checkbox = function (option) {
+	$.fn.checkbox = function checkbox (option) {
 		var args = Array.prototype.slice.call(arguments, 1);
 		var methodReturn;
 
-		var $set = this.each(function () {
+		var $set = this.each(function applyData () {
 			var $this = $(this);
 			var data = $this.data('fu.checkbox');
 			var options = typeof option === 'object' && option;
@@ -206,14 +191,14 @@
 
 	$.fn.checkbox.Constructor = Checkbox;
 
-	$.fn.checkbox.noConflict = function () {
+	$.fn.checkbox.noConflict = function noConflict () {
 		$.fn.checkbox = old;
 		return this;
 	};
 
 	// DATA-API
 
-	$(document).on('mouseover.fu.checkbox.data-api', '[data-initialize=checkbox]', function (e) {
+	$(document).on('mouseover.fu.checkbox.data-api', '[data-initialize=checkbox]', function initializeCheckboxes (e) {
 		var $control = $(e.target);
 		if (!$control.data('fu.checkbox')) {
 			$control.checkbox($control.data());
@@ -221,8 +206,8 @@
 	});
 
 	// Must be domReady for AMD compatibility
-	$(function () {
-		$('[data-initialize=checkbox]').each(function () {
+	$(function onReadyInitializeCheckboxes () {
+		$('[data-initialize=checkbox]').each(function initializeCheckbox () {
 			var $this = $(this);
 			if (!$this.data('fu.checkbox')) {
 				$this.checkbox($this.data());

From dfe29b03e8e38ce404f9ba23b247253f3f509276 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Tue, 20 Jun 2017 16:24:51 -0400
Subject: [PATCH 15/31] (GH1972) adds line breaks to error messages in case
 there are more than one that show

---
 js/checkbox.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/checkbox.js b/js/checkbox.js
index 8afc13c28..959b59021 100644
--- a/js/checkbox.js
+++ b/js/checkbox.js
@@ -39,10 +39,10 @@
 
 		var errors = '';
 		if (element.tagName.toLowerCase() !== 'label') {
-			errors += 'checkbox must be initialized on the `label` that wraps the `input` element. See https://github.com/ExactTarget/fuelux/blob/master/reference/markup/checkbox.html for example of proper markup. Call `.checkbox()` on the `<label>` not the `<input>`.';
+			errors += 'checkbox must be initialized on the `label` that wraps the `input` element. See https://github.com/ExactTarget/fuelux/blob/master/reference/markup/checkbox.html for example of proper markup. Call `.checkbox()` on the `<label>` not the `<input>`\n';
 		}
 		if ($element.css('visibility').match(/hidden|collapse/)) {
-			errors += 'for accessibility reasons, in order for tab and space to function on checkbox, `visibility` must not be set to `hidden` or `collapse`';
+			errors += 'for accessibility reasons, in order for tab and space to function on checkbox, `visibility` must not be set to `hidden` or `collapse.`\n';
 		}
 
 		if (errors !== '' && !this.options.ignoreErrors) {

From 0b978442d0ffa580bf492af9e7c7ee1e8dde125f Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Wed, 21 Jun 2017 09:06:09 -0400
Subject: [PATCH 16/31] (GH1972) makes a11y checkbox error non-breaking

---
 js/checkbox.js | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/js/checkbox.js b/js/checkbox.js
index 959b59021..5212d0912 100644
--- a/js/checkbox.js
+++ b/js/checkbox.js
@@ -33,23 +33,22 @@
 
 	// CHECKBOX CONSTRUCTOR AND PROTOTYPE
 
+	var logError = function logError (error) {
+		if (window && window.console && window.console.error) {
+			window.console.error(error);
+		}
+	};
+
 	var Checkbox = function Checkbox (element, options) {
 		this.options = $.extend({}, $.fn.checkbox.defaults, options);
 		var $element = $(element);
 
-		var errors = '';
 		if (element.tagName.toLowerCase() !== 'label') {
-			errors += 'checkbox must be initialized on the `label` that wraps the `input` element. See https://github.com/ExactTarget/fuelux/blob/master/reference/markup/checkbox.html for example of proper markup. Call `.checkbox()` on the `<label>` not the `<input>`\n';
+			logError('Checkbox must be initialized on the `label` that wraps the `input` element. See https://github.com/ExactTarget/fuelux/blob/master/reference/markup/checkbox.html for example of proper markup. Call `.checkbox()` on the `<label>` not the `<input>`');
+			return;
 		}
 		if ($element.css('visibility').match(/hidden|collapse/)) {
-			errors += 'for accessibility reasons, in order for tab and space to function on checkbox, `visibility` must not be set to `hidden` or `collapse.`\n';
-		}
-
-		if (errors !== '' && !this.options.ignoreErrors) {
-			if (window && window.console && window.console.error) {
-				window.console.error(errors);
-			}
-			return;
+			logError('For accessibility reasons, in order for tab and space to function on checkbox, `visibility` must not be set to `hidden` or `collapse`. See https://github.com/ExactTarget/fuelux/pull/ for more details.');
 		}
 
 		// cache elements

From 13769f24726817d6c46e7c958bc210ef040117df Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Wed, 21 Jun 2017 09:11:31 -0400
Subject: [PATCH 17/31] (CH1972) references correct PR number from error
 message

---
 js/checkbox.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/checkbox.js b/js/checkbox.js
index 5212d0912..20174a58c 100644
--- a/js/checkbox.js
+++ b/js/checkbox.js
@@ -48,7 +48,7 @@
 			return;
 		}
 		if ($element.css('visibility').match(/hidden|collapse/)) {
-			logError('For accessibility reasons, in order for tab and space to function on checkbox, `visibility` must not be set to `hidden` or `collapse`. See https://github.com/ExactTarget/fuelux/pull/ for more details.');
+			logError('For accessibility reasons, in order for tab and space to function on checkbox, `visibility` must not be set to `hidden` or `collapse`. See https://github.com/ExactTarget/fuelux/pull/1996 for more details.');
 		}
 
 		// cache elements

From f81f9b9a0bb098646be19267d9f17d7e2fe9b22e Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Wed, 21 Jun 2017 10:23:08 -0400
Subject: [PATCH 18/31] (CH1972) adds error to radio also

---
 js/radio.js | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/js/radio.js b/js/radio.js
index 4d257680f..679f2ba74 100644
--- a/js/radio.js
+++ b/js/radio.js
@@ -32,14 +32,23 @@
 	var old = $.fn.radio;
 
 	// RADIO CONSTRUCTOR AND PROTOTYPE
+	var logError = function logError (error) {
+		if (window && window.console && window.console.error) {
+			window.console.error(error);
+		}
+	};
 
 	var Radio = function (element, options) {
 		this.options = $.extend({}, $.fn.radio.defaults, options);
+		var $element = $(element);
 
-		if(element.tagName.toLowerCase() !== 'label') {
-			//console.log('initialize radio on the label that wraps the radio');
+		if (element.tagName.toLowerCase() !== 'label') {
+			logError('Radio must be initialized on the `label` that wraps the `input` element. See https://github.com/ExactTarget/fuelux/blob/master/reference/markup/radio.html for example of proper markup. Call `.radio()` on the `<label>` not the `<input>`');
 			return;
 		}
+		if ($element.css('visibility').match(/hidden|collapse/)) {
+			logError('For accessibility reasons, in order for tab and space to function on radio, `visibility` must not be set to `hidden` or `collapse`. See https://github.com/ExactTarget/fuelux/pull/1996 for more details.');
+		}
 
 		// cache elements
 		this.$label = $(element);

From a13c5f80c18099cfb83ae7ec007c5cf42fa198d0 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Wed, 21 Jun 2017 10:29:24 -0400
Subject: [PATCH 19/31] (CH1972) cleans up eslint error. Moves setDisabledState
 closer to a functional programming pattern (actually uses passed in var)

---
 js/checkbox.js |  7 ++++--
 js/radio.js    | 63 +++++++++++++++++++++++---------------------------
 2 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/js/checkbox.js b/js/checkbox.js
index 20174a58c..f22f03e11 100644
--- a/js/checkbox.js
+++ b/js/checkbox.js
@@ -104,17 +104,20 @@
 		},
 
 		setDisabledState: function setDisabledState (element, disabled) {
+			var $chk = $(element);
 			var $lbl = this.$label;
 
 			if (disabled) {
-				this.$chk.prop('disabled', true);
+				$chk.prop('disabled', true);
 				$lbl.addClass('disabled');
 				$lbl.trigger('disabled.fu.checkbox');
 			} else {
-				this.$chk.prop('disabled', false);
+				$chk.prop('disabled', false);
 				$lbl.removeClass('disabled');
 				$lbl.trigger('enabled.fu.checkbox');
 			}
+
+			return $chk;
 		},
 
 		itemchecked: function itemchecked (evt) {
diff --git a/js/radio.js b/js/radio.js
index 679f2ba74..30b3d173e 100644
--- a/js/radio.js
+++ b/js/radio.js
@@ -38,7 +38,7 @@
 		}
 	};
 
-	var Radio = function (element, options) {
+	var Radio = function Radio (element, options) {
 		this.options = $.extend({}, $.fn.radio.defaults, options);
 		var $element = $(element);
 
@@ -70,9 +70,8 @@
 
 		constructor: Radio,
 
-		setInitialState: function() {
+		setInitialState: function setInitialState () {
 			var $radio = this.$radio;
-			var $lbl = this.$label;
 
 			// get current state of input
 			var checked = $radio.prop('checked');
@@ -83,9 +82,9 @@
 			this.setDisabledState($radio, disabled);
 		},
 
-		resetGroup: function() {
+		resetGroup: function resetGroup () {
 			var $radios = $('input[name="' + this.groupName + '"]');
-			$radios.each(function(index, item) {
+			$radios.each(function resetRadio (index, item) {
 				var $radio = $(item);
 				var $lbl = $radio.parent();
 				var containerSelector = $radio.attr('data-toggle');
@@ -97,13 +96,13 @@
 			});
 		},
 
-		setCheckedState: function(element, checked) {
+		setCheckedState: function setCheckedState (element, checked) {
 			var $radio = element;
 			var $lbl = $radio.parent();
 			var containerSelector = $radio.attr('data-toggle');
 			var $containerToggle = $(containerSelector);
 
-			if(checked) {
+			if (checked) {
 				// reset all items in group
 				this.resetGroup();
 
@@ -111,8 +110,7 @@
 				$lbl.addClass('checked');
 				$containerToggle.removeClass('hide hidden');
 				$lbl.trigger('checked.fu.radio');
-			}
-			else {
+			} else {
 				$radio.prop('checked', false);
 				$lbl.removeClass('checked');
 				$containerToggle.addClass('hidden');
@@ -122,54 +120,51 @@
 			$lbl.trigger('changed.fu.radio', checked);
 		},
 
-		setDisabledState: function(element, disabled) {
-			var $radio = element;
+		setDisabledState: function setDisabledState (element, disabled) {
+			var $radio = $(element);
 			var $lbl = this.$label;
 
-			if(disabled) {
-				this.$radio.prop('disabled', true);
+			if (disabled) {
+				$radio.prop('disabled', true);
 				$lbl.addClass('disabled');
 				$lbl.trigger('disabled.fu.radio');
-			}
-			else {
-				this.$radio.prop('disabled', false);
+			} else {
+				$radio.prop('disabled', false);
 				$lbl.removeClass('disabled');
 				$lbl.trigger('enabled.fu.radio');
 			}
+
+			return $radio;
 		},
 
-		itemchecked: function (evt) {
+		itemchecked: function itemchecked (evt) {
 			var $radio = $(evt.target);
 			this.setCheckedState($radio, true);
 		},
 
-		check: function () {
+		check: function check () {
 			this.setCheckedState(this.$radio, true);
 		},
 
-		uncheck: function () {
+		uncheck: function uncheck () {
 			this.setCheckedState(this.$radio, false);
 		},
 
-		isChecked: function () {
+		isChecked: function isChecked () {
 			var checked = this.$radio.prop('checked');
 			return checked;
 		},
 
-		enable: function () {
+		enable: function enable () {
 			this.setDisabledState(this.$radio, false);
 		},
 
-		disable: function () {
+		disable: function disable () {
 			this.setDisabledState(this.$radio, true);
 		},
 
-		destroy: function () {
+		destroy: function destroy () {
 			this.$label.remove();
-			// remove any external bindings
-			// [none]
-			// empty elements to return to original markup
-			// [none]
 			return this.$label[0].outerHTML;
 		}
 	};
@@ -178,11 +173,11 @@
 
 	// RADIO PLUGIN DEFINITION
 
-	$.fn.radio = function (option) {
+	$.fn.radio = function radio (option) {
 		var args = Array.prototype.slice.call(arguments, 1);
 		var methodReturn;
 
-		var $set = this.each(function () {
+		var $set = this.each(function applyData () {
 			var $this = $(this);
 			var data = $this.data('fu.radio');
 			var options = typeof option === 'object' && option;
@@ -203,7 +198,7 @@
 
 	$.fn.radio.Constructor = Radio;
 
-	$.fn.radio.noConflict = function () {
+	$.fn.radio.noConflict = function noConflict () {
 		$.fn.radio = old;
 		return this;
 	};
@@ -211,7 +206,7 @@
 
 	// DATA-API
 
-	$(document).on('mouseover.fu.radio.data-api', '[data-initialize=radio]', function (e) {
+	$(document).on('mouseover.fu.radio.data-api', '[data-initialize=radio]', function initializeRadios (e) {
 		var $control = $(e.target);
 		if (!$control.data('fu.radio')) {
 			$control.radio($control.data());
@@ -219,8 +214,8 @@
 	});
 
 	// Must be domReady for AMD compatibility
-	$(function () {
-		$('[data-initialize=radio]').each(function () {
+	$(function onReadyInitializeRadios () {
+		$('[data-initialize=radio]').each(function initializeRadio () {
 			var $this = $(this);
 			if (!$this.data('fu.radio')) {
 				$this.radio($this.data());
@@ -230,4 +225,4 @@
 
 	// -- BEGIN UMD WRAPPER AFTERWORD --
 }));
-// -- END UMD WRAPPER AFTERWORD --
\ No newline at end of file
+// -- END UMD WRAPPER AFTERWORD --

From 4ced2a4fe2c125060809905e444ce5719e156340 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Wed, 21 Jun 2017 10:51:57 -0400
Subject: [PATCH 20/31] (CH1972) allow options override to ignore visibility
 check

---
 js/checkbox.js | 6 ++++--
 js/radio.js    | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/js/checkbox.js b/js/checkbox.js
index f22f03e11..4843caa11 100644
--- a/js/checkbox.js
+++ b/js/checkbox.js
@@ -47,7 +47,7 @@
 			logError('Checkbox must be initialized on the `label` that wraps the `input` element. See https://github.com/ExactTarget/fuelux/blob/master/reference/markup/checkbox.html for example of proper markup. Call `.checkbox()` on the `<label>` not the `<input>`');
 			return;
 		}
-		if ($element.css('visibility').match(/hidden|collapse/)) {
+		if (!this.options.ignoreVisibilityCheck && $element.css('visibility').match(/hidden|collapse/)) {
 			logError('For accessibility reasons, in order for tab and space to function on checkbox, `visibility` must not be set to `hidden` or `collapse`. See https://github.com/ExactTarget/fuelux/pull/1996 for more details.');
 		}
 
@@ -189,7 +189,9 @@
 		return (methodReturn === undefined) ? $set : methodReturn;
 	};
 
-	$.fn.checkbox.defaults = {};
+	$.fn.checkbox.defaults = {
+		ignoreVisibilityCheck: false
+	};
 
 	$.fn.checkbox.Constructor = Checkbox;
 
diff --git a/js/radio.js b/js/radio.js
index 30b3d173e..433fe6069 100644
--- a/js/radio.js
+++ b/js/radio.js
@@ -46,7 +46,7 @@
 			logError('Radio must be initialized on the `label` that wraps the `input` element. See https://github.com/ExactTarget/fuelux/blob/master/reference/markup/radio.html for example of proper markup. Call `.radio()` on the `<label>` not the `<input>`');
 			return;
 		}
-		if ($element.css('visibility').match(/hidden|collapse/)) {
+		if (!this.options.ignoreVisibilityCheck && $element.css('visibility').match(/hidden|collapse/)) {
 			logError('For accessibility reasons, in order for tab and space to function on radio, `visibility` must not be set to `hidden` or `collapse`. See https://github.com/ExactTarget/fuelux/pull/1996 for more details.');
 		}
 
@@ -194,7 +194,9 @@
 		return (methodReturn === undefined) ? $set : methodReturn;
 	};
 
-	$.fn.radio.defaults = {};
+	$.fn.radio.defaults = {
+		ignoreVisibilityCheck: false
+	};
 
 	$.fn.radio.Constructor = Radio;
 

From 67dcc06d703a7b5cb2616186115ef400a7df10c9 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Wed, 21 Jun 2017 11:46:03 -0400
Subject: [PATCH 21/31] (CH1972) checks actual input element visibility instead
 of label

---
 js/checkbox.js | 7 ++++---
 js/radio.js    | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/js/checkbox.js b/js/checkbox.js
index 4843caa11..00ce6e17d 100644
--- a/js/checkbox.js
+++ b/js/checkbox.js
@@ -47,15 +47,16 @@
 			logError('Checkbox must be initialized on the `label` that wraps the `input` element. See https://github.com/ExactTarget/fuelux/blob/master/reference/markup/checkbox.html for example of proper markup. Call `.checkbox()` on the `<label>` not the `<input>`');
 			return;
 		}
-		if (!this.options.ignoreVisibilityCheck && $element.css('visibility').match(/hidden|collapse/)) {
-			logError('For accessibility reasons, in order for tab and space to function on checkbox, `visibility` must not be set to `hidden` or `collapse`. See https://github.com/ExactTarget/fuelux/pull/1996 for more details.');
-		}
 
 		// cache elements
 		this.$label = $element;
 		this.$chk = this.$label.find('input[type="checkbox"]');
 		this.$container = $element.parent('.checkbox'); // the container div
 
+		if (!this.options.ignoreVisibilityCheck && this.$chk.css('visibility').match(/hidden|collapse/)) {
+			logError('For accessibility reasons, in order for tab and space to function on checkbox, checkbox `<input />`\'s `visibility` must not be set to `hidden` or `collapse`. See https://github.com/ExactTarget/fuelux/pull/1996 for more details.');
+		}
+
 		// determine if a toggle container is specified
 		var containerSelector = this.$chk.attr('data-toggle');
 		this.$toggleContainer = $(containerSelector);
diff --git a/js/radio.js b/js/radio.js
index 433fe6069..f1d5c425d 100644
--- a/js/radio.js
+++ b/js/radio.js
@@ -40,21 +40,21 @@
 
 	var Radio = function Radio (element, options) {
 		this.options = $.extend({}, $.fn.radio.defaults, options);
-		var $element = $(element);
 
 		if (element.tagName.toLowerCase() !== 'label') {
 			logError('Radio must be initialized on the `label` that wraps the `input` element. See https://github.com/ExactTarget/fuelux/blob/master/reference/markup/radio.html for example of proper markup. Call `.radio()` on the `<label>` not the `<input>`');
 			return;
 		}
-		if (!this.options.ignoreVisibilityCheck && $element.css('visibility').match(/hidden|collapse/)) {
-			logError('For accessibility reasons, in order for tab and space to function on radio, `visibility` must not be set to `hidden` or `collapse`. See https://github.com/ExactTarget/fuelux/pull/1996 for more details.');
-		}
 
 		// cache elements
 		this.$label = $(element);
 		this.$radio = this.$label.find('input[type="radio"]');
 		this.groupName = this.$radio.attr('name'); // don't cache group itself since items can be added programmatically
 
+		if (!this.options.ignoreVisibilityCheck && this.$radio.css('visibility').match(/hidden|collapse/)) {
+			logError('For accessibility reasons, in order for tab and space to function on radio, `visibility` must not be set to `hidden` or `collapse`. See https://github.com/ExactTarget/fuelux/pull/1996 for more details.');
+		}
+
 		// determine if a toggle container is specified
 		var containerSelector = this.$radio.attr('data-toggle');
 		this.$toggleContainer = $(containerSelector);

From f58b649f7843e3bf32cc1eb0c3f3e3f70082b4c0 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Wed, 21 Jun 2017 11:46:35 -0400
Subject: [PATCH 22/31] (CH1972) adds dev tests for visibility checks

---
 index.html | 12 ++++++------
 index.js   |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/index.html b/index.html
index 24998365f..c3b610998 100644
--- a/index.html
+++ b/index.html
@@ -59,14 +59,14 @@ <h2>Checkboxes</h2>
 				<div class="thin-box">
 					<section id="checkboxes-toggling">
 						<div class="checkbox">
-							<label class="checkbox-custom" data-initialize="checkbox" id="myCustomTogglingCheckbox1">
-								<input type="checkbox" class="sr-only" data-toggle=".checkboxToggle" />
+							<label class="checkbox-custom" data-initialize="checkbox" data-ignore-visibility-check=true id="myCustomTogglingCheckbox1">
+								<input type="checkbox" class="sr-only" data-toggle=".checkboxToggle" style="visibility: hidden;" />
 								<span class="checkbox-label">Custom checkbox toggles by class</span>
 							</label>
 						</div>
 						<div class="checkbox">
 							<label class="checkbox-custom" data-initialize="checkbox" id="myCustomTogglingCheckbox2">
-								<input type="checkbox" class="sr-only" data-toggle="#checkboxToggle" />
+								<input type="checkbox" class="sr-only" data-toggle="#checkboxToggle" style="visibility: hidden;" />
 								<span class="checkbox-label">Custom checkbox toggles by id</span>
 							</label>
 						</div>
@@ -654,14 +654,14 @@ <h2>Radio Buttons</h2>
 				<div class="thin-box">
 					<!--Block-level Radios-->
 					<div class="radio">
-						<label class="radio-custom" data-initialize="radio" id="myCustomRadio1">
-							<input class="sr-only" name="radio1" type="radio" value="" id="radio1" />
+						<label class="radio-custom" data-initialize="radio" data-ignore-visibility-check=true id="myCustomRadio1">
+							<input class="sr-only" name="radio1" type="radio" value="" id="radio1" style="visibility: hidden;"/>
 							<span class="radio-label">Custom radio unchecked on page load</span>
 						</label>
 					</div>
 					<div class="radio">
 						<label class="radio-custom" data-initialize="radio" id="myCustomRadio2">
-							<input checked="checked" class="checked sr-only" name="radio1" type="radio" value="" id="radio2" />
+							<input checked="checked" class="checked sr-only" name="radio1" type="radio" value="" id="radio2" style="visibility: hidden;"/>
 							<span class="radio-label">Custom radio checked on page load</span>
 						</label>
 					</div>
diff --git a/index.js b/index.js
index a1465f6e5..c532475e9 100644
--- a/index.js
+++ b/index.js
@@ -10,9 +10,9 @@ define(function (require) {
 			window.console.log.apply(console, args);
 		}
 	};
-	if (window.console && window.console.clear) {
-		window.console.clear();
-	}
+	// if (window.console && window.console.clear) {
+	// 	window.console.clear();
+	// }
 
 	// programmatically injecting this is so much easier than writing the html by hand 376 times...
 	$('h1[id], h2[id], h3[id], h4[id], h5[id], h6[id], dt[id], section[id]').each(function (i) {

From 28a0256bc60efcad9d077ddf401803c921735bdc Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Wed, 21 Jun 2017 11:47:18 -0400
Subject: [PATCH 23/31] (CH1972) adds unit tests for visibility error check

---
 test/checkbox-tests/helpers.js    |  6 ++---
 test/checkbox-tests/visibility.js | 42 +++++++++++++++++++++++++++++++
 test/markup/checkbox-markup.html  |  7 ++++++
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/test/checkbox-tests/helpers.js b/test/checkbox-tests/helpers.js
index 7a717a916..b39ae2504 100644
--- a/test/checkbox-tests/helpers.js
+++ b/test/checkbox-tests/helpers.js
@@ -3,11 +3,11 @@
 /* global notDeepEqual:false, strictEqual:false, notStrictEqual:false, raises:false */
 define(function treeDataFactory (require) {
 	var $ = require('jquery');
+	var $fixture = $('#qunit-fixture');
+	var html = require('text!test/markup/checkbox-markup.html!strip');
 
 	var setup = function setup () {
-		var $fixture = $('#qunit-fixture');
-		this.html = require('text!test/markup/checkbox-markup.html!strip');
-		this.$html = $(this.html);
+		this.$html = $(html);
 		$fixture.append(this.$html);
 		this.$checkedEnabled = $fixture.find('#CheckboxCheckedEnabled').checkbox();
 		this.$checkedDisabled = $fixture.find('#CheckboxCheckedDisabled').checkbox();
diff --git a/test/checkbox-tests/visibility.js b/test/checkbox-tests/visibility.js
index b4b4a9405..710ae6112 100644
--- a/test/checkbox-tests/visibility.js
+++ b/test/checkbox-tests/visibility.js
@@ -9,5 +9,47 @@ define(function checkboxVisibilityModule () {
 			this.$checkboxToggle.checkbox('uncheck');
 			assert.notOk($container.is(':visible'), 'toggle container hidden after uncheck');
 		});
+
+		QUnit.test('should not error on init if checkbox visibility visible', function testNonError (assert) {
+			assert.expect(1);
+
+			window.console.error = function error(msg) {
+				assert.notOk(msg, 'console.error should not have fired');
+			};
+
+			var $checkbox = this.$fixture.find('#CheckboxHidden');
+			var $input = $checkbox.find('input[type="checkbox"]');
+			$input.css('visibility', 'visible');
+			assert.equal($input.css('visibility'), 'visible', 'visibility set to visible');
+			$checkbox.checkbox();
+		});
+
+		QUnit.test('should error on init if checkbox visibility hidden', function testHiddenError (assert) {
+			assert.expect(2);
+
+			window.console.error = function error(msg) {
+				assert.ok(msg, 'console.error fired');
+			};
+
+			var $checkbox = this.$fixture.find('#CheckboxHidden');
+			var $input = $checkbox.find('input[type="checkbox"]');
+
+			assert.equal($input.css('visibility'), 'hidden', 'visibility set to hidden');
+			$checkbox.checkbox();
+		});
+
+		QUnit.test('should error on init if checkbox visibility collapse', function testCollapseError (assert) {
+			assert.expect(2);
+
+			window.console.error = function error(msg) {
+				assert.ok(msg, 'console.error fired');
+			};
+
+			var $checkbox = this.$fixture.find('#CheckboxHidden');
+			var $input = $checkbox.find('input[type="checkbox"]');
+			$input.css('visibility', 'collapse');
+			assert.equal($input.css('visibility'), 'collapse', 'visibility set to collapse');
+			$checkbox.checkbox();
+		});
 	};
 });
diff --git a/test/markup/checkbox-markup.html b/test/markup/checkbox-markup.html
index 98c833ac7..74bd96ef3 100644
--- a/test/markup/checkbox-markup.html
+++ b/test/markup/checkbox-markup.html
@@ -43,6 +43,13 @@
 		<div class="checkboxToggle hidden">This message's visibility toggles by class with a checkbox above.</div>
 	</div>
 
+	<div class="checkbox">
+		<label class="checkbox-custom" id="CheckboxHidden">
+			<input class="sr-only checked" type="checkbox" checked="checked" style="visibility: hidden;" />
+			<span class="checkbox-label">Checked/Enabled</span>
+		</label>
+	</div>
+
 </div>
 </body>
 </html>

From e97f9c42736ec7d2f9d8060b6b74eff386ef57ab Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Wed, 21 Jun 2017 11:51:35 -0400
Subject: [PATCH 24/31] (CH1972) adds unit test for ignoreVisibilityCheck
 option

---
 test/checkbox-tests/visibility.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/test/checkbox-tests/visibility.js b/test/checkbox-tests/visibility.js
index 710ae6112..905ca1b30 100644
--- a/test/checkbox-tests/visibility.js
+++ b/test/checkbox-tests/visibility.js
@@ -24,6 +24,20 @@ define(function checkboxVisibilityModule () {
 			$checkbox.checkbox();
 		});
 
+		QUnit.test('should not error on init if checkbox visibility hidden and ignoreVisibilityCheck option passed', function testIgnoreError (assert) {
+			assert.expect(1);
+
+			window.console.error = function error(msg) {
+				assert.notOk(msg, 'console.error should not have fired');
+			};
+
+			var $checkbox = this.$fixture.find('#CheckboxHidden');
+			var $input = $checkbox.find('input[type="checkbox"]');
+
+			assert.equal($input.css('visibility'), 'hidden', 'visibility set to hidden');
+			$checkbox.checkbox({ignoreVisibilityCheck: true});
+		});
+
 		QUnit.test('should error on init if checkbox visibility hidden', function testHiddenError (assert) {
 			assert.expect(2);
 

From deaa53e0d475fcd49d12f78e24131836ad573310 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Wed, 21 Jun 2017 12:01:21 -0400
Subject: [PATCH 25/31] (CH1972) fixes all eslint errors in radio unittests

---
 test/radio-test.js | 420 ++++++++++++++++++++++-----------------------
 1 file changed, 209 insertions(+), 211 deletions(-)

diff --git a/test/radio-test.js b/test/radio-test.js
index fd8ce2b77..2c78afb61 100644
--- a/test/radio-test.js
+++ b/test/radio-test.js
@@ -1,370 +1,368 @@
-/*global QUnit:false, module:false, test:false, asyncTest:false, expect:false*/
-/*global start:false, stop:false ok:false, equal:false, notEqual:false, deepEqual:false*/
-/*global notDeepEqual:false, strictEqual:false, notStrictEqual:false, raises:false*/
+/* global QUnit:false, module:false, test:false, asyncTest:false, expect:false */
+/* global start:false, stop:false ok:false, equal:false, notEqual:false, deepEqual:false */
+/* global notDeepEqual:false, strictEqual:false, notStrictEqual:false, raises:false */
 
-define( function ( require ) {
+define(function (require) {
 	var QUnit = require('qunit');
-	var $ = require( "jquery" );
-	var html = require( "text!test/markup/radio-markup.html!strip" );
+	var $ = require('jquery');
+	var html = require('text!test/markup/radio-markup.html!strip');
 	/* FOR DEV TESTING - uncomment to test against index.html */
 
-	//Html = require('text!index.html!strip');
-	html = $( "<div>" + html + "</div>" ).find( "#MyRadioContainer" );
+	// Html = require('text!index.html!strip');
+	html = $('<div>' + html + '</div>').find('#MyRadioContainer');
 
-	require( "bootstrap" );
-	require( "fuelux/radio" );
+	require('bootstrap');
+	require('fuelux/radio');
 
-	QUnit.module( "Fuel UX Radio" );
+	QUnit.module('Fuel UX Radio');
 
-	QUnit.test( "should be defined on jquery object", function( assert ) {
-		assert.ok( $().radio, "radio method is defined" );
-	} );
+	QUnit.test('should be defined on jquery object', function (assert) {
+		assert.ok($().radio, 'radio method is defined');
+	});
 
-	QUnit.test( "should return element", function( assert ) {
-		var $radio1 = $( html ).find( "#Radio1" );
-		assert.ok( $radio1.radio() === $radio1, "radio should be initialized" );
-	} );
+	QUnit.test('should return element', function (assert) {
+		var $radio1 = $(html).find('#Radio1');
+		assert.ok($radio1.radio() === $radio1, 'radio should be initialized');
+	});
 
-	QUnit.test( "should set initial state for checked/enabled", function( assert ) {
-		var $element = $( html ).find( "#RadioCheckedEnabled" ).clone();
+	QUnit.test('should set initial state for checked/enabled', function (assert) {
+		var $element = $(html).find('#RadioCheckedEnabled').clone();
 
 		// Initialize radio
-		$element.find( "label" ).radio();
+		$element.find('label').radio();
 
 		// Ensure label has checked class
-		var checked = $element.find( "label" ).hasClass( "checked" );
-		assert.equal( checked, true, 'label has "checked" class when input is checked' );
+		var checked = $element.find('label').hasClass('checked');
+		assert.equal(checked, true, 'label has "checked" class when input is checked');
 
 		// Ensure label does not have disabled class
-		var disabled = $element.find( "label" ).hasClass( "disabled" );
-		assert.equal( disabled, false, 'label does not have "disabled" class when input is enabled' );
-	} );
+		var disabled = $element.find('label').hasClass('disabled');
+		assert.equal(disabled, false, 'label does not have "disabled" class when input is enabled');
+	});
 
-	QUnit.test( "should set initial state to checked for first item in group", function( assert ) {
-		var $element = $( html ).find( "#RadioGroup" ).clone();
+	QUnit.test('should set initial state to checked for first item in group', function (assert) {
+		var $element = $(html).find('#RadioGroup').clone();
 
-		$element.find( "input" ).eq( 0 ).prop( "checked", "checked" );
+		$element.find('input').eq(0).prop('checked', 'checked');
 
 		// Initialize radio
-		$element.find( "label" ).radio();
+		$element.find('label').radio();
 
-		var item0 = $element.find( "label" ).eq( 0 );
-		assert.equal( item0.hasClass( "checked" ), true, 'index 0 label has "checked" class when input is checked' );
+		var item0 = $element.find('label').eq(0);
+		assert.equal(item0.hasClass('checked'), true, 'index 0 label has "checked" class when input is checked');
 
-		var item1 = $element.find( "label" ).eq( 1 );
-		assert.equal( item1.hasClass( "checked" ), false, 'index 1 label does not have "checked" class' );
+		var item1 = $element.find('label').eq(1);
+		assert.equal(item1.hasClass('checked'), false, 'index 1 label does not have "checked" class');
 
-		var item2 = $element.find( "label" ).eq( 2 );
-		assert.equal( item2.hasClass( "checked" ), false, 'index 2 label does not have "checked" class' );
-	} );
+		var item2 = $element.find('label').eq(2);
+		assert.equal(item2.hasClass('checked'), false, 'index 2 label does not have "checked" class');
+	});
 
-	QUnit.test( "should set 2nd item checked and 1st item unchecked after selecting 2nd item in group", function( assert ) {
-		var $element = $( html ).find( "#RadioGroup" ).clone();
-		$element.appendTo( document.body ); // Append to body to capture clicks
+	QUnit.test('should set 2nd item checked and 1st item unchecked after selecting 2nd item in group', function (assert) {
+		var $element = $(html).find('#RadioGroup').clone();
+		$element.appendTo(document.body); // Append to body to capture clicks
 
-		$element.find( "input" ).eq( 0 ).prop( "checked", "checked" );
+		$element.find('input').eq(0).prop('checked', 'checked');
 
 		// Initialize radio
-		$element.find( "label" ).radio();
+		$element.find('label').radio();
 
-		var $input = $element.find( "input" ).eq( 1 );
+		var $input = $element.find('input').eq(1);
 		$input.click();
 
 		// Ensure item 0 (1st) label has checked class
-		var item0 = $element.find( "label" ).eq( 0 );
-		assert.equal( item0.hasClass( "checked" ), false, 'index 0 label does not have "checked" class when input is checked' );
+		var item0 = $element.find('label').eq(0);
+		assert.equal(item0.hasClass('checked'), false, 'index 0 label does not have "checked" class when input is checked');
 
-		var item1 = $element.find( "label" ).eq( 1 );
-		assert.equal( item1.hasClass( "checked" ), true, 'index 1 label has "checked" class' );
+		var item1 = $element.find('label').eq(1);
+		assert.equal(item1.hasClass('checked'), true, 'index 1 label has "checked" class');
 
-		var item2 = $element.find( "label" ).eq( 2 );
-		assert.equal( item2.hasClass( "checked" ), false, 'index 2 label does not have "checked" class' );
+		var item2 = $element.find('label').eq(2);
+		assert.equal(item2.hasClass('checked'), false, 'index 2 label does not have "checked" class');
 
 		$element.remove();
-	} );
+	});
 
-	QUnit.test( "should set initial state to checked for middle item in group", function( assert ) {
-		var $element = $( html ).find( "#RadioGroup" ).clone();
+	QUnit.test('should set initial state to checked for middle item in group', function (assert) {
+		var $element = $(html).find('#RadioGroup').clone();
 
-		$element.find( "input" ).eq( 1 ).prop( "checked", "checked" );
+		$element.find('input').eq(1).prop('checked', 'checked');
 
 		// Initialize radio
-		$element.find( "label" ).radio();
+		$element.find('label').radio();
 
-		var item0 = $element.find( "label" ).eq( 0 );
-		assert.equal( item0.hasClass( "checked" ), false, 'index 0 label does not have "checked" class when input is checked' );
+		var item0 = $element.find('label').eq(0);
+		assert.equal(item0.hasClass('checked'), false, 'index 0 label does not have "checked" class when input is checked');
 
-		var item1 = $element.find( "label" ).eq( 1 );
-		assert.equal( item1.hasClass( "checked" ), true, 'index 1 label has "checked" class' );
+		var item1 = $element.find('label').eq(1);
+		assert.equal(item1.hasClass('checked'), true, 'index 1 label has "checked" class');
 
-		var item2 = $element.find( "label" ).eq( 2 );
-		assert.equal( item2.hasClass( "checked" ), false, 'index 2 label does not have "checked" class' );
-	} );
+		var item2 = $element.find('label').eq(2);
+		assert.equal(item2.hasClass('checked'), false, 'index 2 label does not have "checked" class');
+	});
 
-	QUnit.test( "should set initial state to checked for last item in group", function( assert ) {
-		var $element = $( html ).find( "#RadioGroup" ).clone();
+	QUnit.test('should set initial state to checked for last item in group', function (assert) {
+		var $element = $(html).find('#RadioGroup').clone();
 
-		$element.find( "input" ).eq( 2 ).prop( "checked", "checked" );
+		$element.find('input').eq(2).prop('checked', 'checked');
 
 		// Initialize radio
-		$element.find( "label" ).radio();
+		$element.find('label').radio();
 
-		var item0 = $element.find( "label" ).eq( 0 );
-		assert.equal( item0.hasClass( "checked" ), false, 'index 0 label does not have "checked" class when input is checked' );
+		var item0 = $element.find('label').eq(0);
+		assert.equal(item0.hasClass('checked'), false, 'index 0 label does not have "checked" class when input is checked');
 
-		var item1 = $element.find( "label" ).eq( 1 );
-		assert.equal( item1.hasClass( "checked" ), false, 'index 1 label does not have "checked" class' );
+		var item1 = $element.find('label').eq(1);
+		assert.equal(item1.hasClass('checked'), false, 'index 1 label does not have "checked" class');
 
-		var item2 = $element.find( "label" ).eq( 2 );
-		assert.equal( item2.hasClass( "checked" ), true, 'index 2 label has "checked" class' );
-	} );
+		var item2 = $element.find('label').eq(2);
+		assert.equal(item2.hasClass('checked'), true, 'index 2 label has "checked" class');
+	});
 
-	QUnit.test( "should set initial state for checked/disabled", function( assert ) {
-		var $element = $( html ).find( "#RadioCheckedDisabled" ).clone();
+	QUnit.test('should set initial state for checked/disabled', function (assert) {
+		var $element = $(html).find('#RadioCheckedDisabled').clone();
 
 		// Initialize radio
-		$element.find( "label" ).radio();
+		$element.find('label').radio();
 
 		// Ensure label has checked class
-		var checked = $element.find( "label" ).hasClass( "checked" );
-		assert.equal( checked, true, 'label has "checked" class when input is checked' );
+		var checked = $element.find('label').hasClass('checked');
+		assert.equal(checked, true, 'label has "checked" class when input is checked');
 
 		// Ensure label has disabled class
-		var disabled = $element.find( "label" ).hasClass( "disabled" );
-		assert.equal( disabled, true, 'label has "disabled" class when input is disabled' );
-	} );
+		var disabled = $element.find('label').hasClass('disabled');
+		assert.equal(disabled, true, 'label has "disabled" class when input is disabled');
+	});
 
-	QUnit.test( "should set initial state for unchecked/enabled", function( assert ) {
-		var $element = $( html ).find( "#RadioUncheckedEnabled" ).clone();
+	QUnit.test('should set initial state for unchecked/enabled', function (assert) {
+		var $element = $(html).find('#RadioUncheckedEnabled').clone();
 
 		// Initialize radio
-		$element.find( "label" ).radio();
+		$element.find('label').radio();
 
 		// Ensure label does not have checked class
-		var checked = $element.find( "label" ).hasClass( "checked" );
-		assert.equal( checked, false, 'label does not have "checked" class when input is unchecked' );
+		var checked = $element.find('label').hasClass('checked');
+		assert.equal(checked, false, 'label does not have "checked" class when input is unchecked');
 
 		// Ensure label does not have disabled class
-		var disabled = $element.find( "label" ).hasClass( "disabled" );
-		assert.equal( disabled, false, 'label does not have "disabled" class when input is enabled' );
-	} );
+		var disabled = $element.find('label').hasClass('disabled');
+		assert.equal(disabled, false, 'label does not have "disabled" class when input is enabled');
+	});
 
-	QUnit.test( "should set initial state for unchecked/disabled", function( assert ) {
-		var $element = $( html ).find( "#RadioUncheckedDisabled" ).clone();
+	QUnit.test('should set initial state for unchecked/disabled', function (assert) {
+		var $element = $(html).find('#RadioUncheckedDisabled').clone();
 
 		// Initialize radio
-		$element.find( "label" ).radio();
+		$element.find('label').radio();
 
 		// Ensure label does not have checked class
-		var checked = $element.find( "label" ).hasClass( "checked" );
-		assert.equal( checked, false, 'label does not have "checked" class when input is unchecked' );
+		var checked = $element.find('label').hasClass('checked');
+		assert.equal(checked, false, 'label does not have "checked" class when input is unchecked');
 
 		// Ensure label has disabled class
-		var disabled = $element.find( "label" ).hasClass( "disabled" );
-		assert.equal( disabled, true, 'label has "disabled" class when input is disabled' );
-	} );
+		var disabled = $element.find('label').hasClass('disabled');
+		assert.equal(disabled, true, 'label has "disabled" class when input is disabled');
+	});
 
-	QUnit.test( "should disable radio", function( assert ) {
-		var $element = $( html ).find( "#RadioUncheckedEnabled" ).clone();
-		var $input = $element.find( 'input[type="radio"]' );
+	QUnit.test('should disable radio', function (assert) {
+		var $element = $(html).find('#RadioUncheckedEnabled').clone();
+		var $input = $element.find('input[type="radio"]');
 
 		// Initialize radio
-		var $radio = $element.find( "label" ).radio();
+		var $radio = $element.find('label').radio();
 
 		// Set disabled state
-		assert.equal( $input.prop( "disabled" ), false, "radio enabled initially" );
-		$radio.radio( "disable" );
-		assert.equal( $input.prop( "disabled" ), true, "radio disabled after calling disable method" );
-	} );
+		assert.equal($input.prop('disabled'), false, 'radio enabled initially');
+		$radio.radio('disable');
+		assert.equal($input.prop('disabled'), true, 'radio disabled after calling disable method');
+	});
 
-	QUnit.test( "should enable radio", function( assert ) {
-		var $element = $( html ).find( "#RadioUncheckedDisabled" ).clone();
-		var $input = $element.find( 'input[type="radio"]' );
+	QUnit.test('should enable radio', function (assert) {
+		var $element = $(html).find('#RadioUncheckedDisabled').clone();
+		var $input = $element.find('input[type="radio"]');
 
 		// Initialize radio
-		var $radio = $element.find( "label" ).radio();
+		var $radio = $element.find('label').radio();
 
 		// Set enabled state
-		assert.equal( $input.prop( "disabled" ), true, "radio disabled initially" );
-		$radio.radio( "enable" );
-		assert.equal( $input.prop( "disabled" ), false, "radio enabled after calling enable method" );
-	} );
+		assert.equal($input.prop('disabled'), true, 'radio disabled initially');
+		$radio.radio('enable');
+		assert.equal($input.prop('disabled'), false, 'radio enabled after calling enable method');
+	});
 
-	QUnit.test( "should check radio", function( assert ) {
-		var $element = $( html ).find( "#RadioUncheckedEnabled" ).clone();
-		var $input = $element.find( 'input[type="radio"]' );
+	QUnit.test('should check radio', function (assert) {
+		var $element = $(html).find('#RadioUncheckedEnabled').clone();
+		var $input = $element.find('input[type="radio"]');
 
 		// Initialize radio
-		var $radio = $element.find( "label" ).radio();
+		var $radio = $element.find('label').radio();
 
 		// Set checked state
-		assert.equal( $input.prop( "checked" ), false, "radio unchecked initially" );
-		$radio.radio( "check" );
-		assert.equal( $input.prop( "checked" ), true, "radio checked after calling check method" );
-	} );
+		assert.equal($input.prop('checked'), false, 'radio unchecked initially');
+		$radio.radio('check');
+		assert.equal($input.prop('checked'), true, 'radio checked after calling check method');
+	});
 
-	QUnit.test( "should uncheck radio", function( assert ) {
-		var $element = $( html ).find( "#RadioCheckedEnabled" ).clone();
-		var $input = $element.find( 'input[type="radio"]' );
+	QUnit.test('should uncheck radio', function (assert) {
+		var $element = $(html).find('#RadioCheckedEnabled').clone();
+		var $input = $element.find('input[type="radio"]');
 
 		// Initialize radio
-		var $radio = $element.find( "label" ).radio();
+		var $radio = $element.find('label').radio();
 
 		// Set checked state
-		assert.equal( $input.prop( "checked" ), true, "radio checked initially" );
-		$radio.radio( "uncheck" );
-		assert.equal( $input.prop( "checked" ), false, "radio unchecked after calling uncheck method" );
-	} );
+		assert.equal($input.prop('checked'), true, 'radio checked initially');
+		$radio.radio('uncheck');
+		assert.equal($input.prop('checked'), false, 'radio unchecked after calling uncheck method');
+	});
 
-	QUnit.test( "should return checked state", function( assert ) {
-		var $element = $( html ).find( "#RadioCheckedEnabled" ).clone();
-		var $input = $element.find( 'input[type="radio"]' );
+	QUnit.test('should return checked state', function (assert) {
+		var $element = $(html).find('#RadioCheckedEnabled').clone();
 
 		// Initialize radio
-		var $radio = $element.find( "label" ).radio();
+		var $radio = $element.find('label').radio();
 
 		// Verify checked state changes with uncheck method
-		$radio.radio( "uncheck" );
-		assert.equal( $radio.radio( "isChecked" ), false, "radio state is unchecked" );
+		$radio.radio('uncheck');
+		assert.equal($radio.radio('isChecked'), false, 'radio state is unchecked');
 
 		// Verify checked state changes with check method
-		$radio.radio( "check" );
-		assert.equal( $radio.radio( "isChecked" ), true, "radio state is checked" );
-	} );
+		$radio.radio('check');
+		assert.equal($radio.radio('isChecked'), true, 'radio state is checked');
+	});
 
-	QUnit.test( "should support getValue alias", function( assert ) {
-		var $element = $( html ).find( "#CheckboxCheckedEnabled" ).clone();
-		var $input = $element.find( 'input[type="checkbox"]' );
+	QUnit.test('should support getValue alias', function (assert) {
+		var $element = $(html).find('#CheckboxCheckedEnabled').clone();
 
 		// Initialize checkbox
-		var $radio = $element.find( "label" ).radio();
+		var $radio = $element.find('label').radio();
 
 		// Verify alias aliases
-		assert.equal( $radio.radio( "isChecked" ), $radio.radio( "getValue" ), "getValue alias matches isChecked" );
-		$radio.radio( "toggle" );
-		assert.equal( $radio.radio( "isChecked" ), $radio.radio( "getValue" ), "getValue alias matches isChecked" );
-		$radio.checkbox( "toggle" );
-		assert.equal( $radio.radio( "isChecked" ), $radio.radio( "getValue" ), "getValue alias matches isChecked" );
-	} );
+		assert.equal($radio.radio('isChecked'), $radio.radio('getValue'), 'getValue alias matches isChecked');
+		$radio.radio('toggle');
+		assert.equal($radio.radio('isChecked'), $radio.radio('getValue'), 'getValue alias matches isChecked');
+		$radio.checkbox('toggle');
+		assert.equal($radio.radio('isChecked'), $radio.radio('getValue'), 'getValue alias matches isChecked');
+	});
 
-	QUnit.test( "should trigger checked event when calling check method", function( assert ) {
-		var $element = $( html ).find( "#RadioUncheckedEnabled" ).clone();
+	QUnit.test('should trigger checked event when calling check method', function (assert) {
+		var $element = $(html).find('#RadioUncheckedEnabled').clone();
 
 		// Initialize radio
-		var $radio = $element.find( "label" ).radio();
+		var $radio = $element.find('label').radio();
 
 		var triggered = false;
-		$radio.on( "checked.fu.radio", function() {
+		$radio.on('checked.fu.radio', function () {
 			triggered = true;
-		} );
+		});
 
-		$radio.radio( "check" );
+		$radio.radio('check');
 
-		assert.equal( triggered, true, "checked event triggered" );
-	} );
+		assert.equal(triggered, true, 'checked event triggered');
+	});
 
-	QUnit.test( "should trigger unchecked event when calling uncheck method", function( assert ) {
-		var $element = $( html ).find( "#RadioCheckedEnabled" ).clone();
+	QUnit.test('should trigger unchecked event when calling uncheck method', function (assert) {
+		var $element = $(html).find('#RadioCheckedEnabled').clone();
 
 		// Initialize radio
-		var $radio = $element.find( "label" ).radio();
+		var $radio = $element.find('label').radio();
 
 		var triggered = false;
-		$radio.on( "unchecked.fu.radio", function() {
+		$radio.on('unchecked.fu.radio', function () {
 			triggered = true;
-		} );
+		});
 
-		$radio.radio( "uncheck" );
+		$radio.radio('uncheck');
 
-		assert.equal( triggered, true, "unchecked event triggered" );
-	} );
+		assert.equal(triggered, true, 'unchecked event triggered');
+	});
 
-	QUnit.test( "should trigger changed event when calling checked/unchecked method", function( assert ) {
-		var $element = $( html ).find( "#RadioCheckedEnabled" ).clone();
+	QUnit.test('should trigger changed event when calling checked/unchecked method', function (assert) {
+		var $element = $(html).find('#RadioCheckedEnabled').clone();
 
 		// Initialize radio
-		var $radio = $element.find( "label" ).radio();
+		var $radio = $element.find('label').radio();
 
 		var triggered = false;
 		var state = false;
-		$radio.on( "changed.fu.radio", function( evt, data ) {
+		$radio.on('changed.fu.radio', function (evt, data) {
 			triggered = true;
 			state = data;
-		} );
+		});
 
-		$radio.radio( "uncheck" );
+		$radio.radio('uncheck');
 
-		assert.equal( triggered, true, "changed event triggered" );
-		assert.equal( state, false, "changed event triggered passing correct state" );
-	} );
+		assert.equal(triggered, true, 'changed event triggered');
+		assert.equal(state, false, 'changed event triggered passing correct state');
+	});
 
-	QUnit.test( "should trigger changed event when clicking on input element", function( assert ) {
-		var $element = $( html ).find( "#RadioUncheckedEnabled" ).clone();
-		var $input = $element.find( 'input[type="radio"]' );
-		$element.appendTo( document.body ); // Append to body to capture clicks
+	QUnit.test('should trigger changed event when clicking on input element', function (assert) {
+		var $element = $(html).find('#RadioUncheckedEnabled').clone();
+		var $input = $element.find('input[type="radio"]');
+		$element.appendTo(document.body); // Append to body to capture clicks
 
 		// Initialize radio
-		var $radio = $element.find( "label" ).radio();
+		$element.find('label').radio();
 
 		var triggered = false;
-		$element.on( "changed.fu.radio", function() {
+		$element.on('changed.fu.radio', function () {
 			triggered = true;
-		} );
+		});
 
 		$input.click();
-		assert.equal( triggered, true, "changed event triggered" );
+		assert.equal(triggered, true, 'changed event triggered');
 
 		$element.remove();
-	} );
+	});
 
-	QUnit.test( "should trigger changed event when clicking on input element", function( assert ) {
-		var $element = $( html ).find( "#RadioUncheckedEnabled" ).clone();
-		var $input = $element.find( 'input[type="radio"]' );
-		$element.appendTo( document.body ); // Append to body to capture clicks
+	QUnit.test('should trigger changed event when clicking on input element', function (assert) {
+		var $element = $(html).find('#RadioUncheckedEnabled').clone();
+		var $input = $element.find('input[type="radio"]');
+		$element.appendTo(document.body); // Append to body to capture clicks
 
 		// Initialize radio
-		var $radio = $element.find( "label" ).radio();
+		$element.find('label').radio();
 
 		var triggered = false;
-		$element.on( "changed.fu.radio", function() {
+		$element.on('changed.fu.radio', function () {
 			triggered = true;
-		} );
+		});
 
 		$input.click();
-		assert.equal( triggered, true, "changed event triggered" );
+		assert.equal(triggered, true, 'changed event triggered');
 
 		$element.remove();
-	} );
+	});
 
-	QUnit.test( "should toggle radio container visibility", function( assert ) {
-		var $element = $( html ).find( "#RadioToggle" ).clone();
-		var $container = $element.find( ".radioToggle" );
-		$element.appendTo( document.body ); // Append to body to check visibility
+	QUnit.test('should toggle radio container visibility', function (assert) {
+		var $element = $(html).find('#RadioToggle').clone();
+		var $container = $element.find('.radioToggle');
+		$element.appendTo(document.body); // Append to body to check visibility
 
 		// Initialize radio
-		var $radio = $element.find( "label" ).radio();
+		var $radio = $element.find('label').radio();
 
-		assert.equal( $container.is( ":visible" ), false, "toggle container hidden by default" );
-		$radio.radio( "check" );
-		assert.equal( $container.is( ":visible" ), true, "toggle container visible after check" );
-		$radio.radio( "uncheck" );
-		assert.equal( $container.is( ":visible" ), false, "toggle container hidden after uncheck" );
+		assert.equal($container.is(':visible'), false, 'toggle container hidden by default');
+		$radio.radio('check');
+		assert.equal($container.is(':visible'), true, 'toggle container visible after check');
+		$radio.radio('uncheck');
+		assert.equal($container.is(':visible'), false, 'toggle container hidden after uncheck');
 
 		$element.remove();
-	} );
+	});
 
-	QUnit.test( "should destroy radio", function( assert ) {
-		var $element = $( html ).find( "#RadioCheckedEnabled" ).clone();
+	QUnit.test('should destroy radio', function (assert) {
+		var $element = $(html).find('#RadioCheckedEnabled').clone();
 
 		// Initialize radio
-		var $radio = $element.find( "label" ).radio();
-		var originalMarkup = $element.find( "label" )[ 0 ].outerHTML;
+		var $radio = $element.find('label').radio();
+		var originalMarkup = $element.find('label')[ 0 ].outerHTML;
 
-		assert.equal( $element.find( "#Radio1" ).length, 1, "radio exists in DOM by default" );
+		assert.equal($element.find('#Radio1').length, 1, 'radio exists in DOM by default');
 
-		var markup = $radio.radio( "destroy" );
+		var markup = $radio.radio('destroy');
 
-		assert.equal( originalMarkup, markup, "returned original markup" );
-		assert.equal( $element.find( "#Radio1" ).length, 0, "radio removed from DOM" );
-	} );
-} );
+		assert.equal(originalMarkup, markup, 'returned original markup');
+		assert.equal($element.find('#Radio1').length, 0, 'radio removed from DOM');
+	});
+});

From 1fced53f5eab5d489d9434b8a2c2d8e3ba3cc088 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Wed, 21 Jun 2017 16:26:44 -0400
Subject: [PATCH 26/31] (CH1972) makes checkbox test both checked and unchecked
 change event instead of just one of those twice

---
 test/checkbox-tests/events.js  | 8 ++++----
 test/checkbox-tests/helpers.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/checkbox-tests/events.js b/test/checkbox-tests/events.js
index 196e73c77..029c9c257 100644
--- a/test/checkbox-tests/events.js
+++ b/test/checkbox-tests/events.js
@@ -32,7 +32,7 @@ define(function checkboxEventsModule () {
 				this.$checkedEnabled.checkbox('uncheck');
 			});
 
-			QUnit.test('changed event when clicking on input element', function testClickChecked (assert) {
+			QUnit.test('changed event when clicking on input unchecked element', function testClickChecked (assert) {
 				assert.expect(1);
 
 				this.$uncheckedEnabled.on('changed.fu.checkbox', function changedTriggered () {
@@ -42,14 +42,14 @@ define(function checkboxEventsModule () {
 				this.$uncheckedEnabled.find('input[type="checkbox"]').click();
 			});
 
-			QUnit.test('changed event when clicking on input element', function testClickUnchecked (assert) {
+			QUnit.test('changed event when clicking on input checked element', function testClickUnchecked (assert) {
 				assert.expect(1);
 
-				this.$uncheckedEnabled.on('changed.fu.checkbox', function changedTriggered () {
+				this.$checkedEnabled.on('changed.fu.checkbox', function changedTriggered () {
 					assert.ok(true, 'changed event triggered');
 				});
 
-				this.$uncheckedEnabled.find('input[type="checkbox"]').click();
+				this.$checkedEnabled.find('input[type="checkbox"]').click();
 			});
 		});
 	};
diff --git a/test/checkbox-tests/helpers.js b/test/checkbox-tests/helpers.js
index b39ae2504..87dc36f66 100644
--- a/test/checkbox-tests/helpers.js
+++ b/test/checkbox-tests/helpers.js
@@ -1,7 +1,7 @@
 /* global QUnit:false, module:false, test:false, asyncTest:false, expect:false */
 /* global start:false, stop:false ok:false, equal:false, notEqual:false, deepEqual:false */
 /* global notDeepEqual:false, strictEqual:false, notStrictEqual:false, raises:false */
-define(function treeDataFactory (require) {
+define(function checkboxHelpers (require) {
 	var $ = require('jquery');
 	var $fixture = $('#qunit-fixture');
 	var html = require('text!test/markup/checkbox-markup.html!strip');

From 906def4242e58754564490ba0a3b24f76fd7b303 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Wed, 21 Jun 2017 16:27:47 -0400
Subject: [PATCH 27/31] (CH1972) cleans up radio tests. They were badly
 copy-pastad versions of checkbox tests and weren't actually even running in
 some instances somehow

---
 test/markup/radio-markup.html      |  44 ++--
 test/radio-test.js                 | 369 ++---------------------------
 test/radio-tests/checked.js        |  21 ++
 test/radio-tests/destroy.js        |  13 +
 test/radio-tests/disable.js        |  21 ++
 test/radio-tests/events.js         |  46 ++++
 test/radio-tests/get-value.js      |  13 +
 test/radio-tests/group.js          |  43 ++++
 test/radio-tests/helpers.js        |  38 +++
 test/radio-tests/initialization.js |  25 ++
 test/radio-tests/return.js         |  13 +
 test/radio-tests/visibility.js     |  69 ++++++
 12 files changed, 347 insertions(+), 368 deletions(-)
 create mode 100644 test/radio-tests/checked.js
 create mode 100644 test/radio-tests/destroy.js
 create mode 100644 test/radio-tests/disable.js
 create mode 100644 test/radio-tests/events.js
 create mode 100644 test/radio-tests/get-value.js
 create mode 100644 test/radio-tests/group.js
 create mode 100644 test/radio-tests/helpers.js
 create mode 100644 test/radio-tests/initialization.js
 create mode 100644 test/radio-tests/return.js
 create mode 100644 test/radio-tests/visibility.js

diff --git a/test/markup/radio-markup.html b/test/markup/radio-markup.html
index b00d6757e..dae3035d9 100644
--- a/test/markup/radio-markup.html
+++ b/test/markup/radio-markup.html
@@ -4,20 +4,21 @@
 <body>
 <div id="MyRadioContainer">
 
-	<div id="RadioCheckedEnabled" class="radio">
-		<label class="radio-custom">
-			<input class="sr-only checked" type="radio" checked="checked" id="Radio1" />
+	<div class="radio">
+		<label class="radio-custom" id="RadioCheckedEnabled">
+			<input class="sr-only checked" type="radio" checked="checked" />
 			<span class="radio-label">Checked/Enabled</span>
 		</label>
 	</div>
 
-	<div id="RadioGroup" class="radio">
+
+	<div class="radio" id="RadioGroup">
 		<label class="radio-custom">
-			<input class="sr-only" type="radio" name="group" />
+			<input class="sr-only" type="radio" name="group" checked="checked"/><!-- two of the group's inputs are set to "checked" on purpose to make sure that the radio element set's the checked prop correctly on init -->
 			<span class="radio-label">Item 1</span>
 		</label>
 		<label class="radio-custom">
-			<input class="sr-only" type="radio" name="group" />
+			<input class="sr-only" type="radio" name="group" checked="checked"/><!-- two of the group's inputs are set to "checked" on purpose to make sure that the radio element set's the checked prop correctly on init -->
 			<span class="radio-label">Item 2</span>
 		</label>
 		<label class="radio-custom">
@@ -26,38 +27,49 @@
 		</label>
 	</div>
 
-	<div id="RadioCheckedDisabled" class="radio">
-		<label class="radio-custom">
+	<div class="radio">
+		<label class="radio-custom" id="RadioCheckedDisabled">
 			<input class="sr-only checked" type="radio" checked="checked" disabled="disabled" />
 			<span class="radio-label">Checked/Disabled</span>
 		</label>
 	</div>
 
-	<div id="RadioUncheckedEnabled" class="radio">
-		<label class="radio-custom">
+	<div class="radio">
+		<label class="radio-custom" id="RadioUncheckedEnabled">
 			<input class="sr-only checked" type="radio" />
 			<span class="radio-label">Unchecked/Enabled</span>
 		</label>
 	</div>
 
-	<div id="RadioUncheckedDisabled" class="radio">
-		<label class="radio-custom">
+	<div class="radio">
+		<label class="radio-custom" id="RadioUncheckedDisabled">
 			<input class="sr-only checked" type="radio" disabled="disabled" />
 			<span class="radio-label">Unchecked/Disabled</span>
 		</label>
 	</div>
 
 
-	<div id="RadioToggle">
+	<div>
 		<div class="radio">
-			<label class="radio-custom">
-				<input type="radio" class="sr-only" data-toggle=".radioToggle" />
-				Custom radio toggles by class
+			<label class="radio-custom" id="RadioToggleOn">
+				<input type="radio" class="sr-only" name="visibilityGroup" data-toggle=".radioToggle" />
+				Custom radio toggles on by class
+			</label>
+			<label class="radio-custom" id="RadioToggleOff">
+				<input type="radio" class="sr-only" name="visibilityGroup" />
+				Custom radio toggles off by class
 			</label>
 		</div>
 		<div class="radioToggle hidden">This message's visibility toggles by class with a radio above.</div>
 	</div>
 
+	<div class="radio">
+		<label class="radio-custom" id="RadioHidden">
+			<input class="sr-only checked" type="radio" checked="checked" style="visibility: hidden;" />
+			<span class="radio-label">Checked/Enabled</span>
+		</label>
+	</div>
+
 </div>
 </body>
 </html>
diff --git a/test/radio-test.js b/test/radio-test.js
index 2c78afb61..2ffa3b133 100644
--- a/test/radio-test.js
+++ b/test/radio-test.js
@@ -2,367 +2,32 @@
 /* global start:false, stop:false ok:false, equal:false, notEqual:false, deepEqual:false */
 /* global notDeepEqual:false, strictEqual:false, notStrictEqual:false, raises:false */
 
-define(function (require) {
+define(function radioTest (require) {
 	var QUnit = require('qunit');
 	var $ = require('jquery');
-	var html = require('text!test/markup/radio-markup.html!strip');
-	/* FOR DEV TESTING - uncomment to test against index.html */
-
-	// Html = require('text!index.html!strip');
-	html = $('<div>' + html + '</div>').find('#MyRadioContainer');
 
 	require('bootstrap');
 	require('fuelux/radio');
 
-	QUnit.module('Fuel UX Radio');
-
-	QUnit.test('should be defined on jquery object', function (assert) {
-		assert.ok($().radio, 'radio method is defined');
-	});
-
-	QUnit.test('should return element', function (assert) {
-		var $radio1 = $(html).find('#Radio1');
-		assert.ok($radio1.radio() === $radio1, 'radio should be initialized');
-	});
-
-	QUnit.test('should set initial state for checked/enabled', function (assert) {
-		var $element = $(html).find('#RadioCheckedEnabled').clone();
-
-		// Initialize radio
-		$element.find('label').radio();
-
-		// Ensure label has checked class
-		var checked = $element.find('label').hasClass('checked');
-		assert.equal(checked, true, 'label has "checked" class when input is checked');
-
-		// Ensure label does not have disabled class
-		var disabled = $element.find('label').hasClass('disabled');
-		assert.equal(disabled, false, 'label does not have "disabled" class when input is enabled');
-	});
-
-	QUnit.test('should set initial state to checked for first item in group', function (assert) {
-		var $element = $(html).find('#RadioGroup').clone();
-
-		$element.find('input').eq(0).prop('checked', 'checked');
-
-		// Initialize radio
-		$element.find('label').radio();
-
-		var item0 = $element.find('label').eq(0);
-		assert.equal(item0.hasClass('checked'), true, 'index 0 label has "checked" class when input is checked');
-
-		var item1 = $element.find('label').eq(1);
-		assert.equal(item1.hasClass('checked'), false, 'index 1 label does not have "checked" class');
-
-		var item2 = $element.find('label').eq(2);
-		assert.equal(item2.hasClass('checked'), false, 'index 2 label does not have "checked" class');
-	});
-
-	QUnit.test('should set 2nd item checked and 1st item unchecked after selecting 2nd item in group', function (assert) {
-		var $element = $(html).find('#RadioGroup').clone();
-		$element.appendTo(document.body); // Append to body to capture clicks
-
-		$element.find('input').eq(0).prop('checked', 'checked');
-
-		// Initialize radio
-		$element.find('label').radio();
-
-		var $input = $element.find('input').eq(1);
-		$input.click();
-
-		// Ensure item 0 (1st) label has checked class
-		var item0 = $element.find('label').eq(0);
-		assert.equal(item0.hasClass('checked'), false, 'index 0 label does not have "checked" class when input is checked');
-
-		var item1 = $element.find('label').eq(1);
-		assert.equal(item1.hasClass('checked'), true, 'index 1 label has "checked" class');
-
-		var item2 = $element.find('label').eq(2);
-		assert.equal(item2.hasClass('checked'), false, 'index 2 label does not have "checked" class');
-
-		$element.remove();
-	});
-
-	QUnit.test('should set initial state to checked for middle item in group', function (assert) {
-		var $element = $(html).find('#RadioGroup').clone();
-
-		$element.find('input').eq(1).prop('checked', 'checked');
-
-		// Initialize radio
-		$element.find('label').radio();
-
-		var item0 = $element.find('label').eq(0);
-		assert.equal(item0.hasClass('checked'), false, 'index 0 label does not have "checked" class when input is checked');
-
-		var item1 = $element.find('label').eq(1);
-		assert.equal(item1.hasClass('checked'), true, 'index 1 label has "checked" class');
-
-		var item2 = $element.find('label').eq(2);
-		assert.equal(item2.hasClass('checked'), false, 'index 2 label does not have "checked" class');
-	});
-
-	QUnit.test('should set initial state to checked for last item in group', function (assert) {
-		var $element = $(html).find('#RadioGroup').clone();
-
-		$element.find('input').eq(2).prop('checked', 'checked');
-
-		// Initialize radio
-		$element.find('label').radio();
-
-		var item0 = $element.find('label').eq(0);
-		assert.equal(item0.hasClass('checked'), false, 'index 0 label does not have "checked" class when input is checked');
-
-		var item1 = $element.find('label').eq(1);
-		assert.equal(item1.hasClass('checked'), false, 'index 1 label does not have "checked" class');
-
-		var item2 = $element.find('label').eq(2);
-		assert.equal(item2.hasClass('checked'), true, 'index 2 label has "checked" class');
-	});
-
-	QUnit.test('should set initial state for checked/disabled', function (assert) {
-		var $element = $(html).find('#RadioCheckedDisabled').clone();
-
-		// Initialize radio
-		$element.find('label').radio();
-
-		// Ensure label has checked class
-		var checked = $element.find('label').hasClass('checked');
-		assert.equal(checked, true, 'label has "checked" class when input is checked');
-
-		// Ensure label has disabled class
-		var disabled = $element.find('label').hasClass('disabled');
-		assert.equal(disabled, true, 'label has "disabled" class when input is disabled');
-	});
-
-	QUnit.test('should set initial state for unchecked/enabled', function (assert) {
-		var $element = $(html).find('#RadioUncheckedEnabled').clone();
-
-		// Initialize radio
-		$element.find('label').radio();
-
-		// Ensure label does not have checked class
-		var checked = $element.find('label').hasClass('checked');
-		assert.equal(checked, false, 'label does not have "checked" class when input is unchecked');
-
-		// Ensure label does not have disabled class
-		var disabled = $element.find('label').hasClass('disabled');
-		assert.equal(disabled, false, 'label does not have "disabled" class when input is enabled');
-	});
-
-	QUnit.test('should set initial state for unchecked/disabled', function (assert) {
-		var $element = $(html).find('#RadioUncheckedDisabled').clone();
-
-		// Initialize radio
-		$element.find('label').radio();
-
-		// Ensure label does not have checked class
-		var checked = $element.find('label').hasClass('checked');
-		assert.equal(checked, false, 'label does not have "checked" class when input is unchecked');
-
-		// Ensure label has disabled class
-		var disabled = $element.find('label').hasClass('disabled');
-		assert.equal(disabled, true, 'label has "disabled" class when input is disabled');
-	});
-
-	QUnit.test('should disable radio', function (assert) {
-		var $element = $(html).find('#RadioUncheckedEnabled').clone();
-		var $input = $element.find('input[type="radio"]');
-
-		// Initialize radio
-		var $radio = $element.find('label').radio();
-
-		// Set disabled state
-		assert.equal($input.prop('disabled'), false, 'radio enabled initially');
-		$radio.radio('disable');
-		assert.equal($input.prop('disabled'), true, 'radio disabled after calling disable method');
-	});
-
-	QUnit.test('should enable radio', function (assert) {
-		var $element = $(html).find('#RadioUncheckedDisabled').clone();
-		var $input = $element.find('input[type="radio"]');
-
-		// Initialize radio
-		var $radio = $element.find('label').radio();
-
-		// Set enabled state
-		assert.equal($input.prop('disabled'), true, 'radio disabled initially');
-		$radio.radio('enable');
-		assert.equal($input.prop('disabled'), false, 'radio enabled after calling enable method');
-	});
-
-	QUnit.test('should check radio', function (assert) {
-		var $element = $(html).find('#RadioUncheckedEnabled').clone();
-		var $input = $element.find('input[type="radio"]');
-
-		// Initialize radio
-		var $radio = $element.find('label').radio();
-
-		// Set checked state
-		assert.equal($input.prop('checked'), false, 'radio unchecked initially');
-		$radio.radio('check');
-		assert.equal($input.prop('checked'), true, 'radio checked after calling check method');
-	});
-
-	QUnit.test('should uncheck radio', function (assert) {
-		var $element = $(html).find('#RadioCheckedEnabled').clone();
-		var $input = $element.find('input[type="radio"]');
-
-		// Initialize radio
-		var $radio = $element.find('label').radio();
-
-		// Set checked state
-		assert.equal($input.prop('checked'), true, 'radio checked initially');
-		$radio.radio('uncheck');
-		assert.equal($input.prop('checked'), false, 'radio unchecked after calling uncheck method');
-	});
-
-	QUnit.test('should return checked state', function (assert) {
-		var $element = $(html).find('#RadioCheckedEnabled').clone();
-
-		// Initialize radio
-		var $radio = $element.find('label').radio();
-
-		// Verify checked state changes with uncheck method
-		$radio.radio('uncheck');
-		assert.equal($radio.radio('isChecked'), false, 'radio state is unchecked');
-
-		// Verify checked state changes with check method
-		$radio.radio('check');
-		assert.equal($radio.radio('isChecked'), true, 'radio state is checked');
-	});
-
-	QUnit.test('should support getValue alias', function (assert) {
-		var $element = $(html).find('#CheckboxCheckedEnabled').clone();
-
-		// Initialize checkbox
-		var $radio = $element.find('label').radio();
-
-		// Verify alias aliases
-		assert.equal($radio.radio('isChecked'), $radio.radio('getValue'), 'getValue alias matches isChecked');
-		$radio.radio('toggle');
-		assert.equal($radio.radio('isChecked'), $radio.radio('getValue'), 'getValue alias matches isChecked');
-		$radio.checkbox('toggle');
-		assert.equal($radio.radio('isChecked'), $radio.radio('getValue'), 'getValue alias matches isChecked');
-	});
-
-	QUnit.test('should trigger checked event when calling check method', function (assert) {
-		var $element = $(html).find('#RadioUncheckedEnabled').clone();
-
-		// Initialize radio
-		var $radio = $element.find('label').radio();
-
-		var triggered = false;
-		$radio.on('checked.fu.radio', function () {
-			triggered = true;
-		});
-
-		$radio.radio('check');
-
-		assert.equal(triggered, true, 'checked event triggered');
-	});
-
-	QUnit.test('should trigger unchecked event when calling uncheck method', function (assert) {
-		var $element = $(html).find('#RadioCheckedEnabled').clone();
-
-		// Initialize radio
-		var $radio = $element.find('label').radio();
-
-		var triggered = false;
-		$radio.on('unchecked.fu.radio', function () {
-			triggered = true;
-		});
-
-		$radio.radio('uncheck');
-
-		assert.equal(triggered, true, 'unchecked event triggered');
-	});
-
-	QUnit.test('should trigger changed event when calling checked/unchecked method', function (assert) {
-		var $element = $(html).find('#RadioCheckedEnabled').clone();
-
-		// Initialize radio
-		var $radio = $element.find('label').radio();
-
-		var triggered = false;
-		var state = false;
-		$radio.on('changed.fu.radio', function (evt, data) {
-			triggered = true;
-			state = data;
+	QUnit.module('Fuel UX Radio', {
+		beforeEach: require('./radio-tests/helpers').setup
+	}, function runRadioTests () {
+		QUnit.test('should be defined on jquery object', function isRadioDefined (assert) {
+			assert.ok($().radio, 'radio method is defined');
 		});
 
-		$radio.radio('uncheck');
-
-		assert.equal(triggered, true, 'changed event triggered');
-		assert.equal(state, false, 'changed event triggered passing correct state');
-	});
-
-	QUnit.test('should trigger changed event when clicking on input element', function (assert) {
-		var $element = $(html).find('#RadioUncheckedEnabled').clone();
-		var $input = $element.find('input[type="radio"]');
-		$element.appendTo(document.body); // Append to body to capture clicks
-
-		// Initialize radio
-		$element.find('label').radio();
-
-		var triggered = false;
-		$element.on('changed.fu.radio', function () {
-			triggered = true;
-		});
-
-		$input.click();
-		assert.equal(triggered, true, 'changed event triggered');
-
-		$element.remove();
-	});
-
-	QUnit.test('should trigger changed event when clicking on input element', function (assert) {
-		var $element = $(html).find('#RadioUncheckedEnabled').clone();
-		var $input = $element.find('input[type="radio"]');
-		$element.appendTo(document.body); // Append to body to capture clicks
-
-		// Initialize radio
-		$element.find('label').radio();
-
-		var triggered = false;
-		$element.on('changed.fu.radio', function () {
-			triggered = true;
+		QUnit.test('should return element', function doesRadioReturnRadio (assert) {
+			assert.equal(this.$checkedEnabled.radio(), this.$checkedEnabled, 'radio should be initialized');
 		});
 
-		$input.click();
-		assert.equal(triggered, true, 'changed event triggered');
-
-		$element.remove();
-	});
-
-	QUnit.test('should toggle radio container visibility', function (assert) {
-		var $element = $(html).find('#RadioToggle').clone();
-		var $container = $element.find('.radioToggle');
-		$element.appendTo(document.body); // Append to body to check visibility
-
-		// Initialize radio
-		var $radio = $element.find('label').radio();
-
-		assert.equal($container.is(':visible'), false, 'toggle container hidden by default');
-		$radio.radio('check');
-		assert.equal($container.is(':visible'), true, 'toggle container visible after check');
-		$radio.radio('uncheck');
-		assert.equal($container.is(':visible'), false, 'toggle container hidden after uncheck');
-
-		$element.remove();
-	});
-
-	QUnit.test('should destroy radio', function (assert) {
-		var $element = $(html).find('#RadioCheckedEnabled').clone();
-
-		// Initialize radio
-		var $radio = $element.find('label').radio();
-		var originalMarkup = $element.find('label')[ 0 ].outerHTML;
-
-		assert.equal($element.find('#Radio1').length, 1, 'radio exists in DOM by default');
-
-		var markup = $radio.radio('destroy');
-
-		assert.equal(originalMarkup, markup, 'returned original markup');
-		assert.equal($element.find('#Radio1').length, 0, 'radio removed from DOM');
+		require('./radio-tests/initialization')(QUnit);
+		require('./radio-tests/group')(QUnit);
+		require('./radio-tests/disable')(QUnit);
+		require('./radio-tests/checked')(QUnit);
+		require('./radio-tests/return')(QUnit);
+		require('./radio-tests/get-value')(QUnit);
+		require('./radio-tests/events')(QUnit);
+		require('./radio-tests/visibility')(QUnit);
+		require('./radio-tests/destroy')(QUnit);
 	});
 });
diff --git a/test/radio-tests/checked.js b/test/radio-tests/checked.js
new file mode 100644
index 000000000..9e93f797c
--- /dev/null
+++ b/test/radio-tests/checked.js
@@ -0,0 +1,21 @@
+define(function radioDisableEnableModule () {
+	return function radioDisableEnable (QUnit) {
+		QUnit.test('check should check radio', function testCheck (assert) {
+			var $input = this.$uncheckedEnabled.find('input[type="radio"]');
+
+			// Set checked state
+			assert.notOk($input.prop('checked'), 'radio unchecked initially');
+			this.$uncheckedEnabled.radio('check');
+			assert.ok($input.prop('checked'), 'radio checked after calling check method');
+		});
+
+		QUnit.test('uncheck should uncheck radio', function testUncheck (assert) {
+			var $input = this.$checkedEnabled.find('input[type="radio"]');
+
+			// Set checked state
+			assert.ok($input.prop('checked'), 'radio checked initially');
+			this.$checkedEnabled.radio('uncheck');
+			assert.notOk($input.prop('checked'), 'radio unchecked after calling uncheck method');
+		});
+	};
+});
diff --git a/test/radio-tests/destroy.js b/test/radio-tests/destroy.js
new file mode 100644
index 000000000..d46b10264
--- /dev/null
+++ b/test/radio-tests/destroy.js
@@ -0,0 +1,13 @@
+define(function radioDestroyModule () {
+	return function radioDestroy (QUnit) {
+		QUnit.test('should destroy radio', function testDestroy (assert) {
+			assert.ok(this.$fixture.find('#RadioCheckedEnabled').length, 'radio exists in DOM by default');
+
+			var originalMarkup = this.$checkedEnabled.parent('.radio').html().trim();
+			var returnedMarkup = this.$checkedEnabled.radio('destroy');
+
+			assert.equal(originalMarkup, returnedMarkup, 'returned original markup');
+			assert.notOk(this.$fixture.find('#RadioCheckedEnabled').length, 'radio removed from DOM');
+		});
+	};
+});
diff --git a/test/radio-tests/disable.js b/test/radio-tests/disable.js
new file mode 100644
index 000000000..3b32fb40a
--- /dev/null
+++ b/test/radio-tests/disable.js
@@ -0,0 +1,21 @@
+define(function radioDisableEnableModule () {
+	return function radioDisableEnable (QUnit) {
+		QUnit.test('should disable correctly', function testDisable (assert) {
+			var $input = this.$uncheckedEnabled.find('input[type="radio"]');
+
+			// Set disabled state
+			assert.notOk($input.prop('disabled'), 'radio starts enabled');
+			this.$uncheckedEnabled.radio('disable');
+			assert.ok($input.prop('disabled'), 'radio disabled after calling disable method');
+		});
+
+		QUnit.test('should enable correctly', function testEnable (assert) {
+			var $input = this.$uncheckedDisabled.find('input[type="radio"]');
+
+			// Set enabled state
+			assert.ok($input.prop('disabled'), 'radio starts disabled');
+			this.$uncheckedDisabled.radio('enable');
+			assert.notOk($input.prop('disabled'), 'radio enabled after calling enable method');
+		});
+	};
+});
diff --git a/test/radio-tests/events.js b/test/radio-tests/events.js
new file mode 100644
index 000000000..4caefd0f1
--- /dev/null
+++ b/test/radio-tests/events.js
@@ -0,0 +1,46 @@
+define(function radioEventsModule () {
+	return function radioEvents (QUnit) {
+		QUnit.module('should trigger', {}, function testInitialization () {
+			QUnit.test('checked event when calling check method', function testCheckedTrigger (assert) {
+				assert.expect(1);
+
+				this.$uncheckedEnabled.on('checked.fu.radio', function checkedTriggered () {
+					assert.ok(true, 'checked event triggered');
+				});
+
+				this.$uncheckedEnabled.radio('check');
+			});
+
+			QUnit.test('unchecked event when calling uncheck method', function testUncheckedTrigger (assert) {
+				assert.expect(1);
+
+				this.$checkedEnabled.on('unchecked.fu.radio', function uncheckedTriggered () {
+					assert.ok(true, 'unchecked event triggered');
+				});
+
+				this.$checkedEnabled.radio('uncheck');
+			});
+
+			QUnit.test('changed event when calling checked/unchecked method', function testChangedTrigger (assert) {
+				assert.expect(2);
+
+				this.$checkedEnabled.on('changed.fu.radio', function changedTriggered (evt, data) {
+					assert.ok(true, 'changed event triggered');
+					assert.notOk(data, 'changed event triggered passing correct state');
+				});
+
+				this.$checkedEnabled.radio('uncheck');
+			});
+
+			QUnit.test('changed event when clicking on input element', function testClickChecked (assert) {
+				assert.expect(1);
+
+				this.$uncheckedEnabled.on('changed.fu.radio', function changedTriggered () {
+					assert.ok(true, 'changed event triggered');
+				});
+
+				this.$uncheckedEnabled.find('input[type="radio"]').click();
+			});
+		});
+	};
+});
diff --git a/test/radio-tests/get-value.js b/test/radio-tests/get-value.js
new file mode 100644
index 000000000..7c6dd8940
--- /dev/null
+++ b/test/radio-tests/get-value.js
@@ -0,0 +1,13 @@
+define(function radioGetValueModule () {
+	return function radioGetValue (QUnit) {
+		QUnit.test('should support getValue alias', function testGetValue (assert) {
+			var $radio = this.$checkedEnabled;
+
+			assert.equal($radio.radio('isChecked'), $radio.radio('getValue'), 'getValue alias matches isChecked');
+			$radio.radio('check');
+			assert.equal($radio.radio('isChecked'), $radio.radio('getValue'), 'getValue alias matches isChecked');
+			$radio.radio('uncheck');
+			assert.equal($radio.radio('isChecked'), $radio.radio('getValue'), 'getValue alias matches isChecked');
+		});
+	};
+});
diff --git a/test/radio-tests/group.js b/test/radio-tests/group.js
new file mode 100644
index 000000000..5f32ce9b7
--- /dev/null
+++ b/test/radio-tests/group.js
@@ -0,0 +1,43 @@
+define(function radioGroupModule () {
+	return function radioGroup (QUnit) {
+		QUnit.module('groups', {}, function testInitialization () {
+			QUnit.test('should initialize with only one element checked (if any)', function testGroupInitialization (assert) {
+				this.initializeGroup(0);
+
+				assert.ok(this.radioGroup[0].hasClass('checked'), 'index 0 label has "checked" class when input is checked');
+				assert.notOk(this.radioGroup[1].hasClass('checked'), 'index 1 label does not have "checked" class');
+				assert.notOk(this.radioGroup[2].hasClass('checked'), 'index 2 label does not have "checked" class');
+			});
+
+			QUnit.test('should set 2nd item checked and 1st item unchecked after selecting 2nd item in group', function testGroupCheckedChange (assert) {
+				assert.expect(3);
+				this.initializeGroup(0);
+
+				var fixture = this;
+				this.$radioGroup.one('changed.fu.radio', function testChecked () {
+					assert.notOk(fixture.radioGroup[0].hasClass('checked'), 'index 0 label does not have "checked" class when input is checked');
+					assert.ok(fixture.radioGroup[1].hasClass('checked'), 'index 1 label has "checked" class');
+					assert.notOk(fixture.radioGroup[2].hasClass('checked'), 'index 2 label does not have "checked" class');
+				});
+
+				this.radioGroup[1].find('input').click();
+			});
+
+			QUnit.test('should set initial state to checked for middle item in group', function testMiddleInit (assert) {
+				this.initializeGroup(1);
+
+				assert.notOk(this.radioGroup[0].hasClass('checked'), 'index 0 label does not have "checked" class when input is checked');
+				assert.ok(this.radioGroup[1].hasClass('checked'), 'index 1 label has "checked" class');
+				assert.notOk(this.radioGroup[2].hasClass('checked'), 'index 2 label does not have "checked" class');
+			});
+
+			QUnit.test('should set initial state to checked for last item in group', function testLastInit (assert) {
+				this.initializeGroup(2);
+
+				assert.notOk(this.radioGroup[0].hasClass('checked'), 'index 0 label does not have "checked" class when input is checked');
+				assert.notOk(this.radioGroup[1].hasClass('checked'), 'index 1 label does not have "checked" class');
+				assert.ok(this.radioGroup[2].hasClass('checked'), 'index 2 label has "checked" class');
+			});
+		});
+	};
+});
diff --git a/test/radio-tests/helpers.js b/test/radio-tests/helpers.js
new file mode 100644
index 000000000..b70757fcc
--- /dev/null
+++ b/test/radio-tests/helpers.js
@@ -0,0 +1,38 @@
+/* global QUnit:false, module:false, test:false, asyncTest:false, expect:false */
+/* global start:false, stop:false ok:false, equal:false, notEqual:false, deepEqual:false */
+/* global notDeepEqual:false, strictEqual:false, notStrictEqual:false, raises:false */
+define(function radioHelpers (require) {
+	var $ = require('jquery');
+	var $fixture = $('#qunit-fixture');
+	var html = require('text!test/markup/radio-markup.html!strip');
+
+	var initializeGroup = function initializeGroup (checkedIndex) {
+		var radioGroup = [];
+		this.$radioGroup.find('.radio-custom').each(function initializeRadio (i) {
+			radioGroup[i] = $(this);
+			if (i === checkedIndex) {
+				radioGroup[i].find('> input').prop('checked', true);
+			}
+			radioGroup[i].radio();
+		});
+		this.radioGroup = radioGroup;
+	};
+
+	var setup = function setup () {
+		this.$html = $(html);
+		$fixture.append(this.$html);
+		this.$fixture = $fixture;
+		this.$checkedEnabled = $fixture.find('#RadioCheckedEnabled').radio();
+		this.$radioGroup = $fixture.find('#RadioGroup');
+		this.$checkedDisabled = $fixture.find('#RadioCheckedDisabled').radio();
+		this.$uncheckedEnabled = $fixture.find('#RadioUncheckedEnabled').radio();
+		this.$uncheckedDisabled = $fixture.find('#RadioUncheckedDisabled').radio();
+		this.$radioToggleOn = $fixture.find('#RadioToggleOn').radio();
+		this.$radioToggleOff = $fixture.find('#RadioToggleOff').radio();
+		this.initializeGroup = initializeGroup;
+	};
+
+	return {
+		setup: setup
+	};
+});
diff --git a/test/radio-tests/initialization.js b/test/radio-tests/initialization.js
new file mode 100644
index 000000000..43e77832f
--- /dev/null
+++ b/test/radio-tests/initialization.js
@@ -0,0 +1,25 @@
+define(function radioInitializationModule () {
+	return function radioInitialization (QUnit) {
+		QUnit.module('should initialize correctly', {}, function testInitialization () {
+			QUnit.test('for checked/enabled', function testCheckedEnabled (assert) {
+				assert.ok(this.$checkedEnabled.hasClass('checked'), 'label has "checked" class when input is checked');
+				assert.notOk(this.$checkedEnabled.hasClass('disabled'), 'label does not have "disabled" class when input is enabled');
+			});
+
+			QUnit.test('for checked/disabled', function testCheckedDisabled (assert) {
+				assert.ok(this.$checkedDisabled.hasClass('checked'), 'label has "checked" class when input is checked');
+				assert.ok(this.$checkedDisabled.hasClass('disabled'), 'label has "disabled" class when input is disabled');
+			});
+
+			QUnit.test('for unchecked/enabled', function testUncheckedEnabled (assert) {
+				assert.notOk(this.$uncheckedEnabled.hasClass('checked'), 'label does not have "checked" class when input is unchecked');
+				assert.notOk(this.$uncheckedEnabled.hasClass('disabled'), 'label does not have "disabled" class when input is enabled');
+			});
+
+			QUnit.test('for unchecked/disabled', function testUncheckedDisabled (assert) {
+				assert.notOk(this.$uncheckedDisabled.hasClass('checked'), 'label does not have "checked" class when input is unchecked');
+				assert.ok(this.$uncheckedDisabled.hasClass('disabled'), 'label has "disabled" class when input is disabled');
+			});
+		});
+	};
+});
diff --git a/test/radio-tests/return.js b/test/radio-tests/return.js
new file mode 100644
index 000000000..f8775b8e2
--- /dev/null
+++ b/test/radio-tests/return.js
@@ -0,0 +1,13 @@
+define(function radioReturnModule () {
+	return function radioReturn (QUnit) {
+		QUnit.test('should return checked state', function testReturn (assert) {
+			// Verify checked state changes with uncheck method
+			this.$checkedEnabled.radio('uncheck');
+			assert.notOk(this.$checkedEnabled.radio('isChecked'), 'radio state is unchecked');
+
+			// Verify checked state changes with check method
+			this.$checkedEnabled.radio('check');
+			assert.ok(this.$checkedEnabled.radio('isChecked'), 'radio state is checked');
+		});
+	};
+});
diff --git a/test/radio-tests/visibility.js b/test/radio-tests/visibility.js
new file mode 100644
index 000000000..423da689f
--- /dev/null
+++ b/test/radio-tests/visibility.js
@@ -0,0 +1,69 @@
+define(function radioVisibilityModule () {
+	return function radioVisibility (QUnit) {
+		QUnit.test('should toggle radio container visibility', function testVisibility (assert) {
+			var $container = this.$fixture.find('.radioToggle');
+
+			assert.notOk($container.is(':visible'), 'toggle container hidden by default');
+			this.$radioToggleOn.radio('check');
+			assert.ok($container.is(':visible'), 'toggle container visible after check');
+			this.$radioToggleOff.radio('check');
+			assert.notOk($container.is(':visible'), 'toggle container hidden after uncheck');
+		});
+
+		QUnit.test('should not error on init if radio visibility visible', function testNonError (assert) {
+			assert.expect(1);
+
+			window.console.error = function error(msg) {
+				assert.notOk(msg, 'console.error should not have fired');
+			};
+
+			var $radio = this.$fixture.find('#RadioHidden');
+			var $input = $radio.find('input[type="radio"]');
+			$input.css('visibility', 'visible');
+			assert.equal($input.css('visibility'), 'visible', 'visibility set to visible');
+			$radio.radio();
+		});
+
+		QUnit.test('should not error on init if radio visibility hidden and ignoreVisibilityCheck option passed', function testIgnoreError (assert) {
+			assert.expect(1);
+
+			window.console.error = function error(msg) {
+				assert.notOk(msg, 'console.error should not have fired');
+			};
+
+			var $radio = this.$fixture.find('#RadioHidden');
+			var $input = $radio.find('input[type="radio"]');
+
+			assert.equal($input.css('visibility'), 'hidden', 'visibility set to hidden');
+			$radio.radio({ignoreVisibilityCheck: true});
+		});
+
+		QUnit.test('should error on init if radio visibility hidden', function testHiddenError (assert) {
+			assert.expect(2);
+
+			window.console.error = function error(msg) {
+				assert.ok(msg, 'console.error fired');
+			};
+
+			var $radio = this.$fixture.find('#RadioHidden');
+			var $input = $radio.find('input[type="radio"]');
+
+			assert.equal($input.css('visibility'), 'hidden', 'visibility set to hidden');
+			$radio.radio();
+		});
+
+		QUnit.test('should error on init if radio visibility collapse', function testCollapseError (assert) {
+			assert.expect(2);
+
+			window.console.error = function error(msg) {
+				assert.ok(msg, 'console.error fired');
+			};
+
+			var $radio = this.$fixture.find('#RadioHidden');
+			var $input = $radio.find('input[type="radio"]');
+			$input.css('visibility', 'collapse');
+			assert.equal($input.css('visibility'), 'collapse', 'visibility set to collapse');
+			$radio.radio();
+		});
+	};
+});

From 60598f4f5a70686fe6e8f15e383b89041c364b34 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Tue, 27 Jun 2017 17:25:49 -0400
Subject: [PATCH 28/31] (CH1972) removes commented out feature

---
 index.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/index.js b/index.js
index c532475e9..2ebaf2a45 100644
--- a/index.js
+++ b/index.js
@@ -10,9 +10,6 @@ define(function (require) {
 			window.console.log.apply(console, args);
 		}
 	};
-	// if (window.console && window.console.clear) {
-	// 	window.console.clear();
-	// }
 
 	// programmatically injecting this is so much easier than writing the html by hand 376 times...
 	$('h1[id], h2[id], h3[id], h4[id], h5[id], h6[id], dt[id], section[id]').each(function (i) {

From 3a6c7209a7a9a3b80e35eea7eb27d3d9cef6762a Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Tue, 27 Jun 2017 18:57:32 -0400
Subject: [PATCH 29/31] (CH1972) places single require error checking code
 outside of code that gets bundled into all.js where it would be innapropriate

---
 js/pillbox.js   | 6 +++---
 js/scheduler.js | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/js/pillbox.js b/js/pillbox.js
index c4ef263f0..432d9fd01 100644
--- a/js/pillbox.js
+++ b/js/pillbox.js
@@ -26,9 +26,6 @@
 		factory(jQuery);
 	}
 }(function PillboxWrapper ($) {
-	// -- END UMD WRAPPER PREFACE --
-
-	// -- BEGIN MODULE CODE HERE --
 	if (!$.fn.dropdownautoflip) {
 		throw new Error('Fuel UX pillbox control requires dropdown-autoflip.');
 	}
@@ -36,6 +33,9 @@
 	if (!$.fn.utilities) {
 		throw new Error('Fuel UX pillbox control requires FuelUX utilities.');
 	}
+	// -- END UMD WRAPPER PREFACE --
+
+	// -- BEGIN MODULE CODE HERE --
 
 	var old = $.fn.pillbox;
 
diff --git a/js/scheduler.js b/js/scheduler.js
index a19924859..6ace69701 100644
--- a/js/scheduler.js
+++ b/js/scheduler.js
@@ -26,13 +26,14 @@
 		factory(jQuery);
 	}
 }(function SchedulerWrapper ($) {
-	// -- END UMD WRAPPER PREFACE --
-
-	// -- BEGIN MODULE CODE HERE --
 	if (!$.fn.combobox || !$.fn.datepicker || !$.fn.radio || !$.fn.selectlist || !$.fn.spinbox) {
 		throw new Error('Fuel UX scheduler control requires combobox, datepicker, radio, selectlist, and spinbox.');
 	}
 
+	// -- END UMD WRAPPER PREFACE --
+
+	// -- BEGIN MODULE CODE HERE --
+
 	var old = $.fn.scheduler;
 
 	// SCHEDULER CONSTRUCTOR AND PROTOTYPE

From eb88b1d91d0c941e300ca2813d4202ad3a3aee85 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Tue, 27 Jun 2017 19:14:21 -0400
Subject: [PATCH 30/31] (CH1972) attempts to clarify skipped tests

---
 test/SKIPPED_TESTS.md               | 1 +
 test/tree-tests/down-key-module.js  | 6 +++---
 test/tree-tests/end-key-module.js   | 2 +-
 test/tree-tests/home-key-module.js  | 6 ++----
 test/tree-tests/left-key-module.js  | 2 ++
 test/tree-tests/right-key-module.js | 4 ++--
 test/tree-tests/space-key-module.js | 6 +++---
 test/tree-tests/tab-indexes.js      | 8 ++++----
 test/tree-tests/up-key-module.js    | 6 +++---
 9 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 test/SKIPPED_TESTS.md

diff --git a/test/SKIPPED_TESTS.md b/test/SKIPPED_TESTS.md
new file mode 100644
index 000000000..e9cbb3924
--- /dev/null
+++ b/test/SKIPPED_TESTS.md
@@ -0,0 +1 @@
+When the tree accessibility work was originally done, time did not allow for fully baking all of the unit tests. All of the reasonable test cases that I could think of were defined so that the intended functionality could be documented. The idea being that if the tree was ever touched again (which is actually a big question mark given the state of Fuel UX) any functionality affected by the re-work should at that time (if reasonable) be covered by fully-baked unit tests.
\ No newline at end of file
diff --git a/test/tree-tests/down-key-module.js b/test/tree-tests/down-key-module.js
index bf262e823..0b237fcc0 100644
--- a/test/tree-tests/down-key-module.js
+++ b/test/tree-tests/down-key-module.js
@@ -4,15 +4,15 @@ define(function keyboardNavigationModuleFactory (require) {
 	return function downKeyModule (QUnit) {
 		QUnit.module( 'should respond to down key', {}, function testDownKeyPresses () {
 			QUnit.skip('when focus is on node above sibling node, moves focus down to sibling', function loadTree (assert) {
-
+				// Skipped due to time constraints. If you touch this part of the tree, please complete this test
 			});
 
 			QUnit.skip('when focus is on last focusable child of parent, moves focus out of parent onto first focusable sibling of parent', function loadTree (assert) {
-
+				// Skipped due to time constraints. If you touch this part of the tree, please complete this test
 			});
 
 			QUnit.skip('when focus is on open branch, moves focus into open branch onto first focusable child', function respondsToKeyboardInput (assert) {
-
+				// Skipped due to time constraints. If you touch this part of the tree, please complete this test
 			});
 		});
 	};
diff --git a/test/tree-tests/end-key-module.js b/test/tree-tests/end-key-module.js
index aba54b638..d771170d1 100644
--- a/test/tree-tests/end-key-module.js
+++ b/test/tree-tests/end-key-module.js
@@ -4,7 +4,7 @@ define(function keyboardNavigationModuleFactory (require) {
 	return function endKeyModule (QUnit) {
 		QUnit.module( 'should respond to end key', {}, function testEndKeyPresses () {
 			QUnit.skip('moves focus to last selectable node in tree', function loadTree (assert) {
-
+				// Skipped due to time constraints. If you touch this part of the tree, please complete this test
 			});
 		});
 	};
diff --git a/test/tree-tests/home-key-module.js b/test/tree-tests/home-key-module.js
index 578b20016..61f90b0ec 100644
--- a/test/tree-tests/home-key-module.js
+++ b/test/tree-tests/home-key-module.js
@@ -1,10 +1,8 @@
-define(function keyboardNavigationModuleFactory (require) {
-	var $ = require('jquery');
-
+define(function keyboardNavigationModuleFactory () {
 	return function homeKeyModule (QUnit) {
 		QUnit.module( 'should respond to home key', {}, function testHomeKeyPresses () {
 			QUnit.skip('moves focus to first selectable node in tree', function loadTree (assert) {
-
+				// Skipped due to time constraints. If you touch this part of the tree, please complete this test
 			});
 		});
 	};
diff --git a/test/tree-tests/left-key-module.js b/test/tree-tests/left-key-module.js
index e4306b74c..d943c82d2 100644
--- a/test/tree-tests/left-key-module.js
+++ b/test/tree-tests/left-key-module.js
@@ -31,6 +31,8 @@ define(function keyboardNavigationModuleFactory (require) {
 			});
 
 			QUnit.skip('on child node when branch is closed', function loadTree (assert) {
+				// The following doesn't actually work due to issues with browsers and focus.
+				// Gave up due to time constraints. If you touch this part of the tree, please complete this test
 				assert.expect( 4 );
 				var $tree = this.$tree;
 				var self = this;
diff --git a/test/tree-tests/right-key-module.js b/test/tree-tests/right-key-module.js
index 14a188cda..6a9a10acf 100644
--- a/test/tree-tests/right-key-module.js
+++ b/test/tree-tests/right-key-module.js
@@ -4,11 +4,11 @@ define(function keyboardNavigationModuleFactory (require) {
 	return function rightKeyModule (QUnit) {
 		QUnit.module( 'should respond to right key', {}, function testRightKeyPresses () {
 			QUnit.skip('when branch is closed, discloses branch', function loadTree (assert) {
-
+				// Skipped due to time constraints. If you touch this part of the tree, please complete this test
 			});
 
 			QUnit.skip('when branch is disclosed, focuses into branch', function respondsToKeyboardInput (assert) {
-
+				// Skipped due to time constraints. If you touch this part of the tree, please complete this test
 			});
 		});
 	};
diff --git a/test/tree-tests/space-key-module.js b/test/tree-tests/space-key-module.js
index f7e5ae92e..01c4af7b7 100644
--- a/test/tree-tests/space-key-module.js
+++ b/test/tree-tests/space-key-module.js
@@ -4,15 +4,15 @@ define(function keyboardNavigationModuleFactory (require) {
 	return function spaceKeyModule (QUnit) {
 		QUnit.module( 'should respond to space key', {}, function testSpaceKeyPresses () {
 			QUnit.skip('when focus is on selectable node, select node', function loadTree (assert) {
-
+				// Skipped due to time constraints. If you touch this part of the tree, please complete this test
 			});
 
 			QUnit.skip('when focus is on non-selectable, disclose-able node, toggles node', function loadTree (assert) {
-
+				// Skipped due to time constraints. If you touch this part of the tree, please complete this test
 			});
 
 			QUnit.skip('when focus is on non-selectable, non-disclose-able node, clicks on node (this is probably "loading...")', function respondsToKeyboardInput (assert) {
-
+				// Skipped due to time constraints. If you touch this part of the tree, please complete this test
 			});
 		});
 	};
diff --git a/test/tree-tests/tab-indexes.js b/test/tree-tests/tab-indexes.js
index 2d56dfd73..10cb78c98 100644
--- a/test/tree-tests/tab-indexes.js
+++ b/test/tree-tests/tab-indexes.js
@@ -5,16 +5,16 @@ define(function Module (require) {
 	return function tabIndexModule (QUnit) {
 		QUnit.module( 'tab indexes', {}, function testTabIndexes () {
 			QUnit.skip('are all set to -1 on tree load', function loadTree (assert) {
-
+				// Skipped due to time constraints. If you touch this part of the tree, please complete this test
 			});
 			QUnit.skip('are set to 1 for selected items', function loadTree (assert) {
-
+				// Skipped due to time constraints. If you touch this part of the tree, please complete this test
 			});
 			QUnit.skip('are all set to -1 on new item selection', function loadTree (assert) {
-
+				// Skipped due to time constraints. If you touch this part of the tree, please complete this test
 			});
 			QUnit.skip('root tree element is set to -1 on item selection', function loadTree (assert) {
-
+				// Skipped due to time constraints. If you touch this part of the tree, please complete this test
 			});
 		});
 	};
diff --git a/test/tree-tests/up-key-module.js b/test/tree-tests/up-key-module.js
index f0005ae66..1330cd5cd 100644
--- a/test/tree-tests/up-key-module.js
+++ b/test/tree-tests/up-key-module.js
@@ -4,15 +4,15 @@ define(function keyboardNavigationModuleFactory (require) {
 	return function upKeyModule (QUnit) {
 		QUnit.module( 'should respond to up key', {}, function testUpKeyPresses () {
 			QUnit.skip('when focus is on node below sibling node, moves focus up to sibling', function loadTree (assert) {
-
+				// Skipped due to time constraints. If you touch this part of the tree, please complete this test
 			});
 
 			QUnit.skip('when focus is below open sibling, moves focus into last focusable child of sibling', function loadTree (assert) {
-
+				// Skipped due to time constraints. If you touch this part of the tree, please complete this test
 			});
 
 			QUnit.skip('when focus is in first child of open branch, moves focus onto parent', function respondsToKeyboardInput (assert) {
-
+				// Skipped due to time constraints. If you touch this part of the tree, please complete this test
 			});
 		});
 	};

From af3961c29d8d4615ca227734a9424e44ad82f1e4 Mon Sep 17 00:00:00 2001
From: Christopher McCulloh <cmcculloh@exacttarget.com>
Date: Wed, 28 Jun 2017 09:22:26 -0400
Subject: [PATCH 31/31] (CH1972) removes incorrect markup variants

---
 index.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/index.html b/index.html
index c3b610998..24998365f 100644
--- a/index.html
+++ b/index.html
@@ -59,14 +59,14 @@ <h2>Checkboxes</h2>
 				<div class="thin-box">
 					<section id="checkboxes-toggling">
 						<div class="checkbox">
-							<label class="checkbox-custom" data-initialize="checkbox" data-ignore-visibility-check=true id="myCustomTogglingCheckbox1">
-								<input type="checkbox" class="sr-only" data-toggle=".checkboxToggle" style="visibility: hidden;" />
+							<label class="checkbox-custom" data-initialize="checkbox" id="myCustomTogglingCheckbox1">
+								<input type="checkbox" class="sr-only" data-toggle=".checkboxToggle" />
 								<span class="checkbox-label">Custom checkbox toggles by class</span>
 							</label>
 						</div>
 						<div class="checkbox">
 							<label class="checkbox-custom" data-initialize="checkbox" id="myCustomTogglingCheckbox2">
-								<input type="checkbox" class="sr-only" data-toggle="#checkboxToggle" style="visibility: hidden;" />
+								<input type="checkbox" class="sr-only" data-toggle="#checkboxToggle" />
 								<span class="checkbox-label">Custom checkbox toggles by id</span>
 							</label>
 						</div>
@@ -654,14 +654,14 @@ <h2>Radio Buttons</h2>
 				<div class="thin-box">
 					<!--Block-level Radios-->
 					<div class="radio">
-						<label class="radio-custom" data-initialize="radio" data-ignore-visibility-check=true id="myCustomRadio1">
-							<input class="sr-only" name="radio1" type="radio" value="" id="radio1" style="visibility: hidden;"/>
+						<label class="radio-custom" data-initialize="radio" id="myCustomRadio1">
+							<input class="sr-only" name="radio1" type="radio" value="" id="radio1" />
 							<span class="radio-label">Custom radio unchecked on page load</span>
 						</label>
 					</div>
 					<div class="radio">
 						<label class="radio-custom" data-initialize="radio" id="myCustomRadio2">
-							<input checked="checked" class="checked sr-only" name="radio1" type="radio" value="" id="radio2" style="visibility: hidden;"/>
+							<input checked="checked" class="checked sr-only" name="radio1" type="radio" value="" id="radio2" />
 							<span class="radio-label">Custom radio checked on page load</span>
 						</label>
 					</div>