Tests: Rename {widget}_defaults.js -> {widget}_common.js

diff --git a/tests/unit/accordion/accordion.html b/tests/unit/accordion/accordion.html
index 5c9169ea3c93a384a6c2e0feeb0150826455a230..ec78390199bd9c03ab3477ffc337ef00967525d8 100644 (file)
--- a/tests/unit/accordion/accordion.html
+++ b/tests/unit/accordion/accordion.html
@@ -26,7 +26,7 @@
        <script src="../testsuite.js"></script>
 
        <script src="accordion_test_helpers.js"></script>
-       <script src="accordion_defaults.js"></script>
+       <script src="accordion_common.js"></script>
        <script src="accordion_core.js"></script>
        <script src="accordion_events.js"></script>
        <script src="accordion_methods.js"></script>
@@ -93,7 +93,7 @@
                                <li><a href="?p=1.1.1.3">Amps</a></li>
                                <li><a href="?p=1.1.1.4">Effects</a></li>
                                <li><a href="?p=1.1.1.5">Accessories</a></li>
-                       </ul> 
+                       </ul>
                </li>
                <li>
                        <h2><a href="?p=1.1.2"><span>Bass</span></a></h2>
@@ -105,7 +105,7 @@
                                <li><a href="?p=1.1.2.5">Accessories</a></li>
                                <li><a href="?p=1.1.2.5">Accessories</a></li>
                                <li><a href="?p=1.1.2.5">Accessories</a></li>
-                       </ul> 
+                       </ul>
                </li>
                <li>
                        <h2><a href="?p=1.1.3">Drums</a></h2>
@@ -113,7 +113,7 @@
                                <li><a href="?p=1.1.3.2">Acoustic</a></li>
                                <li><a href="?p=1.1.3.3">Electronic</a></li>
                                <li><a href="?p=1.1.3.6">Accessories</a></li>
-                       </ul> 
+                       </ul>
                </li>
        </ul>
 </div>

diff --git a/tests/unit/accordion/accordion_common.js b/tests/unit/accordion/accordion_common.js
new file mode 100644 (file)
index 0000000..ef24cf2
--- /dev/null
+++ b/tests/unit/accordion/accordion_common.js
@@ -0,0 +1,20 @@
+TestHelpers.commonWidgetTests( "accordion", {
+       defaults: {
+               active: 0,
+               animate: {},
+               collapsible: false,
+               disabled: false,
+               event: "click",
+               header: "> li > :first-child,> :not(li):even",
+               heightStyle: "auto",
+               icons: {
+                       "activeHeader": "ui-icon-triangle-1-s",
+                       "header": "ui-icon-triangle-1-e"
+               },
+
+               // callbacks
+               activate: null,
+               beforeActivate: null,
+               create: null
+       }
+});

diff --git a/tests/unit/accordion/accordion_common_deprecated.js b/tests/unit/accordion/accordion_common_deprecated.js
new file mode 100644 (file)
index 0000000..22d5e12
--- /dev/null
+++ b/tests/unit/accordion/accordion_common_deprecated.js
@@ -0,0 +1,29 @@
+TestHelpers.commonWidgetTests( "accordion", {
+       defaults: {
+               active: 0,
+               animate: null,
+               animated: "slide",
+               autoHeight: true,
+               clearStyle: false,
+               collapsible: false,
+               disabled: false,
+               event: "click",
+               fillSpace: false,
+               header: "> li > :first-child,> :not(li):even",
+               heightStyle: null,
+               icons: {
+                       "activeHeader": null,
+                       "header": "ui-icon-triangle-1-e",
+                       "headerSelected": "ui-icon-triangle-1-s"
+               },
+               navigation: false,
+               navigationFilter: function() {},
+
+               // callbacks
+               activate: null,
+               beforeActivate: null,
+               change: null,
+               changestart: null,
+               create: null
+       }
+});

diff --git a/tests/unit/accordion/accordion_defaults.js b/tests/unit/accordion/accordion_defaults.js
deleted file mode 100644 (file)
index ef24cf2..0000000
--- a/tests/unit/accordion/accordion_defaults.js
+++ /dev/null
@@ -1,20 +0,0 @@
-TestHelpers.commonWidgetTests( "accordion", {
-       defaults: {
-               active: 0,
-               animate: {},
-               collapsible: false,
-               disabled: false,
-               event: "click",
-               header: "> li > :first-child,> :not(li):even",
-               heightStyle: "auto",
-               icons: {
-                       "activeHeader": "ui-icon-triangle-1-s",
-                       "header": "ui-icon-triangle-1-e"
-               },
-
-               // callbacks
-               activate: null,
-               beforeActivate: null,
-               create: null
-       }
-});

diff --git a/tests/unit/accordion/accordion_defaults_deprecated.js b/tests/unit/accordion/accordion_defaults_deprecated.js
deleted file mode 100644 (file)
index 22d5e12..0000000
--- a/tests/unit/accordion/accordion_defaults_deprecated.js
+++ /dev/null
@@ -1,29 +0,0 @@
-TestHelpers.commonWidgetTests( "accordion", {
-       defaults: {
-               active: 0,
-               animate: null,
-               animated: "slide",
-               autoHeight: true,
-               clearStyle: false,
-               collapsible: false,
-               disabled: false,
-               event: "click",
-               fillSpace: false,
-               header: "> li > :first-child,> :not(li):even",
-               heightStyle: null,
-               icons: {
-                       "activeHeader": null,
-                       "header": "ui-icon-triangle-1-e",
-                       "headerSelected": "ui-icon-triangle-1-s"
-               },
-               navigation: false,
-               navigationFilter: function() {},
-
-               // callbacks
-               activate: null,
-               beforeActivate: null,
-               change: null,
-               changestart: null,
-               create: null
-       }
-});

diff --git a/tests/unit/accordion/accordion_deprecated.html b/tests/unit/accordion/accordion_deprecated.html
index 116eb43b50c32e51036941cc917e0272a6901181..f3494c6fc71e49fa4e3fd1d6a2f0542c82fefd39 100644 (file)
--- a/tests/unit/accordion/accordion_deprecated.html
+++ b/tests/unit/accordion/accordion_deprecated.html
@@ -23,7 +23,7 @@
        <script src="../testsuite.js"></script>
 
        <script src="accordion_test_helpers.js"></script>
-       <script src="accordion_defaults_deprecated.js"></script>
+       <script src="accordion_common_deprecated.js"></script>
        <script src="accordion_core.js"></script>
        <script src="accordion_events.js"></script>
        <script src="accordion_methods.js"></script>
@@ -91,7 +91,7 @@
                                <li><a href="?p=1.1.1.3">Amps</a></li>
                                <li><a href="?p=1.1.1.4">Effects</a></li>
                                <li><a href="?p=1.1.1.5">Accessories</a></li>
-                       </ul> 
+                       </ul>
                </li>
                <li>
                        <h2><a href="?p=1.1.2"><span>Bass</span></a></h2>
@@ -103,7 +103,7 @@
                                <li><a href="?p=1.1.2.5">Accessories</a></li>
                                <li><a href="?p=1.1.2.5">Accessories</a></li>
                                <li><a href="?p=1.1.2.5">Accessories</a></li>
-                       </ul> 
+                       </ul>
                </li>
                <li>
                        <h2><a href="?p=1.1.3">Drums</a></h2>
@@ -111,7 +111,7 @@
                                <li><a href="?p=1.1.3.2">Acoustic</a></li>
                                <li><a href="?p=1.1.3.3">Electronic</a></li>
                                <li><a href="?p=1.1.3.6">Accessories</a></li>
-                       </ul> 
+                       </ul>
                </li>
        </ul>
 </div>

diff --git a/tests/unit/autocomplete/autocomplete.html b/tests/unit/autocomplete/autocomplete.html
index 70d2ecfd15478ac4a3a6a4087eb7acfe611d1440..259def349648381e09c65197fce8d6074a3cea04 100644 (file)
--- a/tests/unit/autocomplete/autocomplete.html
+++ b/tests/unit/autocomplete/autocomplete.html
@@ -24,7 +24,7 @@
        <script src="../../jquery.simulate.js"></script>
        <script src="../testsuite.js"></script>
 
-       <script src="autocomplete_defaults.js"></script>
+       <script src="autocomplete_common.js"></script>
        <script src="autocomplete_core.js"></script>
        <script src="autocomplete_events.js"></script>
        <script src="autocomplete_methods.js"></script>

diff --git a/tests/unit/autocomplete/autocomplete_common.js b/tests/unit/autocomplete/autocomplete_common.js
new file mode 100644 (file)
index 0000000..c090ce4
--- /dev/null
+++ b/tests/unit/autocomplete/autocomplete_common.js
@@ -0,0 +1,25 @@
+TestHelpers.commonWidgetTests( "autocomplete", {
+       defaults: {
+               appendTo: "body",
+               autoFocus: false,
+               delay: 300,
+               disabled: false,
+               minLength: 1,
+               position: {
+                       my: "left top",
+                       at: "left bottom",
+                       collision: "none"
+               },
+               source: null,
+
+               // callbacks
+               change: null,
+               close: null,
+               create: null,
+               focus: null,
+               open: null,
+               response: null,
+               search: null,
+               select: null
+       }
+});

diff --git a/tests/unit/autocomplete/autocomplete_defaults.js b/tests/unit/autocomplete/autocomplete_defaults.js
deleted file mode 100644 (file)
index c090ce4..0000000
--- a/tests/unit/autocomplete/autocomplete_defaults.js
+++ /dev/null
@@ -1,25 +0,0 @@
-TestHelpers.commonWidgetTests( "autocomplete", {
-       defaults: {
-               appendTo: "body",
-               autoFocus: false,
-               delay: 300,
-               disabled: false,
-               minLength: 1,
-               position: {
-                       my: "left top",
-                       at: "left bottom",
-                       collision: "none"
-               },
-               source: null,
-
-               // callbacks
-               change: null,
-               close: null,
-               create: null,
-               focus: null,
-               open: null,
-               response: null,
-               search: null,
-               select: null
-       }
-});

diff --git a/tests/unit/button/button.html b/tests/unit/button/button.html
index 5ec7e316afb3d3c6881a56ea2d58d76c83f01c42..5f27740c4045c9d436a8760e3b95468ac4368f4e 100644 (file)
--- a/tests/unit/button/button.html
+++ b/tests/unit/button/button.html
@@ -22,8 +22,8 @@
        <script src="../../jquery.simulate.js"></script>
        <script src="../testsuite.js"></script>
 
+       <script src="button_common.js"></script>
        <script src="button_core.js"></script>
-       <script src="button_defaults.js"></script>
        <script src="button_events.js"></script>
        <script src="button_methods.js"></script>
        <script src="button_options.js"></script>

diff --git a/tests/unit/button/button_common.js b/tests/unit/button/button_common.js
new file mode 100644 (file)
index 0000000..ef22d30
--- /dev/null
+++ b/tests/unit/button/button_common.js
@@ -0,0 +1,14 @@
+TestHelpers.commonWidgetTests( "button", {
+       defaults: {
+               disabled: null,
+               icons: {
+                       primary: null,
+                       secondary: null
+               },
+               label: null,
+               text: true,
+
+               // callbacks
+               create: null
+       }
+});

diff --git a/tests/unit/button/button_defaults.js b/tests/unit/button/button_defaults.js
deleted file mode 100644 (file)
index ef22d30..0000000
--- a/tests/unit/button/button_defaults.js
+++ /dev/null
@@ -1,14 +0,0 @@
-TestHelpers.commonWidgetTests( "button", {
-       defaults: {
-               disabled: null,
-               icons: {
-                       primary: null,
-                       secondary: null
-               },
-               label: null,
-               text: true,
-
-               // callbacks
-               create: null
-       }
-});

diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html
index 94b20a225af81a5934dd367dede4f7c22bc92e88..1f940400cfd1615c74f255dbf51006df54421a47 100644 (file)
--- a/tests/unit/dialog/dialog.html
+++ b/tests/unit/dialog/dialog.html
@@ -27,8 +27,8 @@
        <script src="../../jquery.simulate.js"></script>
        <script src="../testsuite.js"></script>
 
+       <script src="dialog_common.js"></script>
        <script src="dialog_core.js"></script>
-       <script src="dialog_defaults.js"></script>
        <script src="dialog_events.js"></script>
        <script src="dialog_methods.js"></script>
        <script src="dialog_options.js"></script>

diff --git a/tests/unit/dialog/dialog_common.js b/tests/unit/dialog/dialog_common.js
new file mode 100644 (file)
index 0000000..623908d
--- /dev/null
+++ b/tests/unit/dialog/dialog_common.js
@@ -0,0 +1,34 @@
+TestHelpers.commonWidgetTests( "dialog", {
+       defaults: {
+               autoOpen: true,
+               buttons: {},
+               closeOnEscape: true,
+               closeText: 'close',
+               disabled: false,
+               dialogClass: '',
+               draggable: true,
+               height: 'auto',
+               hide: null,
+               maxHeight: false,
+               maxWidth: false,
+               minHeight: 150,
+               minWidth: 150,
+               modal: false,
+               position: {
+                       my: 'center',
+                       at: 'center',
+                       of: window,
+                       collision: 'fit',
+                       using: $.ui.dialog.prototype.options.position.using
+               },
+               resizable: true,
+               show: null,
+               stack: true,
+               title: '',
+               width: 300,
+               zIndex: 1000,
+
+               // callbacks
+               create: null
+       }
+});

diff --git a/tests/unit/dialog/dialog_defaults.js b/tests/unit/dialog/dialog_defaults.js
deleted file mode 100644 (file)
index 623908d..0000000
--- a/tests/unit/dialog/dialog_defaults.js
+++ /dev/null
@@ -1,34 +0,0 @@
-TestHelpers.commonWidgetTests( "dialog", {
-       defaults: {
-               autoOpen: true,
-               buttons: {},
-               closeOnEscape: true,
-               closeText: 'close',
-               disabled: false,
-               dialogClass: '',
-               draggable: true,
-               height: 'auto',
-               hide: null,
-               maxHeight: false,
-               maxWidth: false,
-               minHeight: 150,
-               minWidth: 150,
-               modal: false,
-               position: {
-                       my: 'center',
-                       at: 'center',
-                       of: window,
-                       collision: 'fit',
-                       using: $.ui.dialog.prototype.options.position.using
-               },
-               resizable: true,
-               show: null,
-               stack: true,
-               title: '',
-               width: 300,
-               zIndex: 1000,
-
-               // callbacks
-               create: null
-       }
-});

diff --git a/tests/unit/draggable/draggable.html b/tests/unit/draggable/draggable.html
index 5be71f460654c3b33547b2537b80a475abd7ddc4..acc50effe417abf9b527afdb0b313cf0ddc630e4 100644 (file)
--- a/tests/unit/draggable/draggable.html
+++ b/tests/unit/draggable/draggable.html
@@ -23,8 +23,8 @@
        <script src="../../jquery.simulate.js"></script>
        <script src="../testsuite.js"></script>
 
+       <script src="draggable_common.js"></script>
        <script src="draggable_core.js"></script>
-       <script src="draggable_defaults.js"></script>
        <script src="draggable_events.js"></script>
        <script src="draggable_methods.js"></script>
        <script src="draggable_options.js"></script>

diff --git a/tests/unit/draggable/draggable_common.js b/tests/unit/draggable/draggable_common.js
new file mode 100644 (file)
index 0000000..b47b139
--- /dev/null
+++ b/tests/unit/draggable/draggable_common.js
@@ -0,0 +1,32 @@
+TestHelpers.commonWidgetTests( "draggable", {
+       defaults: {
+               addClasses: true,
+               appendTo: "parent",
+               axis: false,
+               cancel: ":input,option",
+               connectToSortable: false,
+               containment: false,
+               cursor: "auto",
+               cursorAt: false,
+               delay: 0,
+               disabled: false,
+               distance: 1,
+               grid: false,
+               handle: false,
+               helper: "original",
+               iframeFix: false,
+               opacity: false,
+               refreshPositions: false,
+               revert: false,
+               revertDuration: 500,
+               scroll: true,
+               scrollSensitivity: 20,
+               scrollSpeed: 20,
+               scope: "default",
+               snap: false,
+               snapMode: "both",
+               snapTolerance: 20,
+               stack: false,
+               zIndex: false
+       }
+});

diff --git a/tests/unit/draggable/draggable_defaults.js b/tests/unit/draggable/draggable_defaults.js
deleted file mode 100644 (file)
index b47b139..0000000
--- a/tests/unit/draggable/draggable_defaults.js
+++ /dev/null
@@ -1,32 +0,0 @@
-TestHelpers.commonWidgetTests( "draggable", {
-       defaults: {
-               addClasses: true,
-               appendTo: "parent",
-               axis: false,
-               cancel: ":input,option",
-               connectToSortable: false,
-               containment: false,
-               cursor: "auto",
-               cursorAt: false,
-               delay: 0,
-               disabled: false,
-               distance: 1,
-               grid: false,
-               handle: false,
-               helper: "original",
-               iframeFix: false,
-               opacity: false,
-               refreshPositions: false,
-               revert: false,
-               revertDuration: 500,
-               scroll: true,
-               scrollSensitivity: 20,
-               scrollSpeed: 20,
-               scope: "default",
-               snap: false,
-               snapMode: "both",
-               snapTolerance: 20,
-               stack: false,
-               zIndex: false
-       }
-});

diff --git a/tests/unit/droppable/droppable.html b/tests/unit/droppable/droppable.html
index abf94f0c7b95ee8e9492a91c385520ded41b80f2..eb2215763597ff49f9c515b5561d954bc788dc47 100644 (file)
--- a/tests/unit/droppable/droppable.html
+++ b/tests/unit/droppable/droppable.html
@@ -24,8 +24,8 @@
        <script src="../../jquery.simulate.js"></script>
        <script src="../testsuite.js"></script>
 
+       <script src="droppable_common.js"></script>
        <script src="droppable_core.js"></script>
-       <script src="droppable_defaults.js"></script>
        <script src="droppable_events.js"></script>
        <script src="droppable_methods.js"></script>
        <script src="droppable_options.js"></script>

diff --git a/tests/unit/droppable/droppable_common.js b/tests/unit/droppable/droppable_common.js
new file mode 100644 (file)
index 0000000..985dba0
--- /dev/null
+++ b/tests/unit/droppable/droppable_common.js
@@ -0,0 +1,12 @@
+TestHelpers.commonWidgetTests( "droppable", {
+       defaults: {
+               accept: "*",
+               activeClass: false,
+               addClasses: true,
+               disabled: false,
+               greedy: false,
+               hoverClass: false,
+               scope: "default",
+               tolerance: "intersect"
+       }
+});

diff --git a/tests/unit/droppable/droppable_defaults.js b/tests/unit/droppable/droppable_defaults.js
deleted file mode 100644 (file)
index 985dba0..0000000
--- a/tests/unit/droppable/droppable_defaults.js
+++ /dev/null
@@ -1,12 +0,0 @@
-TestHelpers.commonWidgetTests( "droppable", {
-       defaults: {
-               accept: "*",
-               activeClass: false,
-               addClasses: true,
-               disabled: false,
-               greedy: false,
-               hoverClass: false,
-               scope: "default",
-               tolerance: "intersect"
-       }
-});

diff --git a/tests/unit/menu/menu.html b/tests/unit/menu/menu.html
index 9a598ec8d3dd8a8dd96d9431a6b6b349991afce3..54a2ecaa01179226fed841baa169d517feb68995 100644 (file)
--- a/tests/unit/menu/menu.html
+++ b/tests/unit/menu/menu.html
@@ -23,8 +23,8 @@
        <script src="../testsuite.js"></script>
 
        <script src="menu_test_helpers.js"></script>
+       <script src="menu_common.js"></script>
        <script src="menu_core.js"></script>
-       <script src="menu_defaults.js"></script>
        <script src="menu_events.js"></script>
        <script src="menu_methods.js"></script>
        <script src="menu_options.js"></script>

diff --git a/tests/unit/menu/menu_common.js b/tests/unit/menu/menu_common.js
new file mode 100644 (file)
index 0000000..ddcdbeb
--- /dev/null
+++ b/tests/unit/menu/menu_common.js
@@ -0,0 +1,16 @@
+TestHelpers.commonWidgetTests( "menu", {
+       defaults: {
+               disabled: false,
+               menus: "ul",
+               position: {
+                       my: "left top",
+                       at: "right top"
+               },
+
+               // callbacks
+               blur: null,
+               create: null,
+               focus: null,
+               select: null
+       }
+});

diff --git a/tests/unit/menu/menu_defaults.js b/tests/unit/menu/menu_defaults.js
deleted file mode 100644 (file)
index ddcdbeb..0000000
--- a/tests/unit/menu/menu_defaults.js
+++ /dev/null
@@ -1,16 +0,0 @@
-TestHelpers.commonWidgetTests( "menu", {
-       defaults: {
-               disabled: false,
-               menus: "ul",
-               position: {
-                       my: "left top",
-                       at: "right top"
-               },
-
-               // callbacks
-               blur: null,
-               create: null,
-               focus: null,
-               select: null
-       }
-});

diff --git a/tests/unit/progressbar/progressbar.html b/tests/unit/progressbar/progressbar.html
index 8b55f5a890eada145a0f9a5afa2029ce250363a1..f6156d0bbe6a15138da2bc0bfcfeaed537bff9df 100644 (file)
--- a/tests/unit/progressbar/progressbar.html
+++ b/tests/unit/progressbar/progressbar.html
@@ -22,8 +22,8 @@
        <script src="../../jquery.simulate.js"></script>
        <script src="../testsuite.js"></script>
 
+       <script src="progressbar_common.js"></script>
        <script src="progressbar_core.js"></script>
-       <script src="progressbar_defaults.js"></script>
        <script src="progressbar_events.js"></script>
        <script src="progressbar_methods.js"></script>
        <script src="progressbar_options.js"></script>

diff --git a/tests/unit/progressbar/progressbar_common.js b/tests/unit/progressbar/progressbar_common.js
new file mode 100644 (file)
index 0000000..2f97a78
--- /dev/null
+++ b/tests/unit/progressbar/progressbar_common.js
@@ -0,0 +1,10 @@
+TestHelpers.commonWidgetTests( "progressbar", {
+       defaults: {
+               disabled: false,
+               value: 0,
+               max: 100,
+
+               //callbacks
+               create: null
+       }
+});

diff --git a/tests/unit/progressbar/progressbar_defaults.js b/tests/unit/progressbar/progressbar_defaults.js
deleted file mode 100644 (file)
index 2f97a78..0000000
--- a/tests/unit/progressbar/progressbar_defaults.js
+++ /dev/null
@@ -1,10 +0,0 @@
-TestHelpers.commonWidgetTests( "progressbar", {
-       defaults: {
-               disabled: false,
-               value: 0,
-               max: 100,
-
-               //callbacks
-               create: null
-       }
-});

diff --git a/tests/unit/resizable/resizable.html b/tests/unit/resizable/resizable.html
index 4e886d2fd12f74f35cf97d4a11926f1d91f410be..028087842b435119190e37625f537f35ac2992d8 100644 (file)
--- a/tests/unit/resizable/resizable.html
+++ b/tests/unit/resizable/resizable.html
@@ -23,8 +23,8 @@
        <script src="../../jquery.simulate.js"></script>
        <script src="../testsuite.js"></script>
 
+       <script src="resizable_common.js"></script>
        <script src="resizable_core.js"></script>
-       <script src="resizable_defaults.js"></script>
        <script src="resizable_events.js"></script>
        <script src="resizable_methods.js"></script>
        <script src="resizable_options.js"></script>

diff --git a/tests/unit/resizable/resizable_common.js b/tests/unit/resizable/resizable_common.js
new file mode 100644 (file)
index 0000000..617cdd2
--- /dev/null
+++ b/tests/unit/resizable/resizable_common.js
@@ -0,0 +1,27 @@
+TestHelpers.commonWidgetTests('resizable', {
+       defaults: {
+               alsoResize: false,
+               animate: false,
+               animateDuration: 'slow',
+               animateEasing: 'swing',
+               aspectRatio: false,
+               autoHide: false,
+               cancel: ':input,option',
+               containment: false,
+               delay: 0,
+               disabled: false,
+               distance: 1,
+               ghost: false,
+               grid: false,
+               handles: 'e,s,se',
+               helper: false,
+               maxHeight: null,
+               maxWidth: null,
+               minHeight: 10,
+               minWidth: 10,
+               zIndex: 1000,
+
+               // callbacks
+               create: null
+       }
+});

diff --git a/tests/unit/resizable/resizable_defaults.js b/tests/unit/resizable/resizable_defaults.js
deleted file mode 100644 (file)
index 617cdd2..0000000
--- a/tests/unit/resizable/resizable_defaults.js
+++ /dev/null
@@ -1,27 +0,0 @@
-TestHelpers.commonWidgetTests('resizable', {
-       defaults: {
-               alsoResize: false,
-               animate: false,
-               animateDuration: 'slow',
-               animateEasing: 'swing',
-               aspectRatio: false,
-               autoHide: false,
-               cancel: ':input,option',
-               containment: false,
-               delay: 0,
-               disabled: false,
-               distance: 1,
-               ghost: false,
-               grid: false,
-               handles: 'e,s,se',
-               helper: false,
-               maxHeight: null,
-               maxWidth: null,
-               minHeight: 10,
-               minWidth: 10,
-               zIndex: 1000,
-
-               // callbacks
-               create: null
-       }
-});

diff --git a/tests/unit/selectable/selectable.html b/tests/unit/selectable/selectable.html
index 4f70e8dd448011bf6d7f5e7a54a9cb134ea34c67..af4e6d20eb06e2cdc1f473c4da6451fd4c3ce313 100644 (file)
--- a/tests/unit/selectable/selectable.html
+++ b/tests/unit/selectable/selectable.html
@@ -23,8 +23,8 @@
        <script src="../../jquery.simulate.js"></script>
        <script src="../testsuite.js"></script>
 
+       <script src="selectable_common.js"></script>
        <script src="selectable_core.js"></script>
-       <script src="selectable_defaults.js"></script>
        <script src="selectable_events.js"></script>
        <script src="selectable_methods.js"></script>
        <script src="selectable_options.js"></script>

diff --git a/tests/unit/selectable/selectable_common.js b/tests/unit/selectable/selectable_common.js
new file mode 100644 (file)
index 0000000..27714d0
--- /dev/null
+++ b/tests/unit/selectable/selectable_common.js
@@ -0,0 +1,12 @@
+TestHelpers.commonWidgetTests('selectable', {
+       defaults: {
+               appendTo: 'body',
+               autoRefresh: true,
+               cancel: ':input,option',
+               delay: 0,
+               disabled: false,
+               distance: 0,
+               filter: '*',
+               tolerance: 'touch'
+       }
+});

diff --git a/tests/unit/selectable/selectable_defaults.js b/tests/unit/selectable/selectable_defaults.js
deleted file mode 100644 (file)
index 27714d0..0000000
--- a/tests/unit/selectable/selectable_defaults.js
+++ /dev/null
@@ -1,12 +0,0 @@
-TestHelpers.commonWidgetTests('selectable', {
-       defaults: {
-               appendTo: 'body',
-               autoRefresh: true,
-               cancel: ':input,option',
-               delay: 0,
-               disabled: false,
-               distance: 0,
-               filter: '*',
-               tolerance: 'touch'
-       }
-});

diff --git a/tests/unit/slider/slider.html b/tests/unit/slider/slider.html
index 60d124b7ab6a13fbd5e152ff1482d64037e8f3b1..a63196219dbf42995043125df6fde1d4fcc8d6ee 100644 (file)
--- a/tests/unit/slider/slider.html
+++ b/tests/unit/slider/slider.html
@@ -23,8 +23,8 @@
        <script src="../../jquery.simulate.js"></script>
        <script src="../testsuite.js"></script>
 
+       <script src="slider_common.js"></script>
        <script src="slider_core.js"></script>
-       <script src="slider_defaults.js"></script>
        <script src="slider_events.js"></script>
        <script src="slider_methods.js"></script>
        <script src="slider_options.js"></script>

diff --git a/tests/unit/slider/slider_common.js b/tests/unit/slider/slider_common.js
new file mode 100644 (file)
index 0000000..8a0b347
--- /dev/null
+++ b/tests/unit/slider/slider_common.js
@@ -0,0 +1,19 @@
+TestHelpers.commonWidgetTests( "slider", {
+       defaults: {
+               animate: false,
+               cancel: ':input,option',
+               delay: 0,
+               disabled: false,
+               distance: 0,
+               max: 100,
+               min: 0,
+               orientation: 'horizontal',
+               range: false,
+               step: 1,
+               value: 0,
+               values: null,
+
+               // callbacks
+               create: null
+       }
+});

diff --git a/tests/unit/slider/slider_defaults.js b/tests/unit/slider/slider_defaults.js
deleted file mode 100644 (file)
index 8a0b347..0000000
--- a/tests/unit/slider/slider_defaults.js
+++ /dev/null
@@ -1,19 +0,0 @@
-TestHelpers.commonWidgetTests( "slider", {
-       defaults: {
-               animate: false,
-               cancel: ':input,option',
-               delay: 0,
-               disabled: false,
-               distance: 0,
-               max: 100,
-               min: 0,
-               orientation: 'horizontal',
-               range: false,
-               step: 1,
-               value: 0,
-               values: null,
-
-               // callbacks
-               create: null
-       }
-});

diff --git a/tests/unit/sortable/sortable.html b/tests/unit/sortable/sortable.html
index a20eb7109ee3f58337da0c2121c3f41c2ee7e1f5..4ed4f92ce681848e60821ba7cd8278b501ed7e13 100644 (file)
--- a/tests/unit/sortable/sortable.html
+++ b/tests/unit/sortable/sortable.html
@@ -23,8 +23,8 @@
        <script src="../../jquery.simulate.js"></script>
        <script src="../testsuite.js"></script>
 
+       <script src="sortable_common.js"></script>
        <script src="sortable_core.js"></script>
-       <script src="sortable_defaults.js"></script>
        <script src="sortable_events.js"></script>
        <script src="sortable_methods.js"></script>
        <script src="sortable_options.js"></script>

diff --git a/tests/unit/sortable/sortable_common.js b/tests/unit/sortable/sortable_common.js
new file mode 100644 (file)
index 0000000..b5fc05a
--- /dev/null
+++ b/tests/unit/sortable/sortable_common.js
@@ -0,0 +1,30 @@
+TestHelpers.commonWidgetTests( "sortable", {
+       defaults: {
+               appendTo: "parent",
+               axis: false,
+               cancel: ":input,option",
+               connectWith: false,
+               containment: false,
+               cursor: "auto",
+               cursorAt: false,
+               delay: 0,
+               disabled: false,
+               distance: 1,
+               dropOnEmpty: true,
+               forcePlaceholderSize: false,
+               forceHelperSize: false,
+               grid: false,
+               handle: false,
+               helper: "original",
+               items: "> *",
+               opacity: false,
+               placeholder: false,
+               revert: false,
+               scroll: true,
+               scrollSensitivity: 20,
+               scrollSpeed: 20,
+               scope: "default",
+               tolerance: "intersect",
+               zIndex: 1000
+       }
+});

diff --git a/tests/unit/sortable/sortable_defaults.js b/tests/unit/sortable/sortable_defaults.js
deleted file mode 100644 (file)
index b5fc05a..0000000
--- a/tests/unit/sortable/sortable_defaults.js
+++ /dev/null
@@ -1,30 +0,0 @@
-TestHelpers.commonWidgetTests( "sortable", {
-       defaults: {
-               appendTo: "parent",
-               axis: false,
-               cancel: ":input,option",
-               connectWith: false,
-               containment: false,
-               cursor: "auto",
-               cursorAt: false,
-               delay: 0,
-               disabled: false,
-               distance: 1,
-               dropOnEmpty: true,
-               forcePlaceholderSize: false,
-               forceHelperSize: false,
-               grid: false,
-               handle: false,
-               helper: "original",
-               items: "> *",
-               opacity: false,
-               placeholder: false,
-               revert: false,
-               scroll: true,
-               scrollSensitivity: 20,
-               scrollSpeed: 20,
-               scope: "default",
-               tolerance: "intersect",
-               zIndex: 1000
-       }
-});

diff --git a/tests/unit/spinner/spinner.html b/tests/unit/spinner/spinner.html
index 0c01a5f4848c4b617697a7dae4bb61fdfad2b691..e495abe1b912a42cce9f1d2c64470cd77bfb2e01 100644 (file)
--- a/tests/unit/spinner/spinner.html
+++ b/tests/unit/spinner/spinner.html
@@ -3,7 +3,7 @@
 <head>
        <meta charset="utf-8">
        <title>jQuery UI Spinner Test Suite</title>
-       
+
        <script src="../../jquery.js"></script>
        <script src="../../../external/jquery.mousewheel-3.0.4.js"></script>
        <script src="../../../external/globalize.js"></script>
@@ -27,8 +27,8 @@
        <script src="../testsuite.js"></script>
 
        <script src="spinner_test_helpers.js"></script>
+       <script src="spinner_common.js"></script>
        <script src="spinner_core.js"></script>
-       <script src="spinner_defaults.js"></script>
        <script src="spinner_events.js"></script>
        <script src="spinner_methods.js"></script>
        <script src="spinner_options.js"></script>

diff --git a/tests/unit/spinner/spinner_common.js b/tests/unit/spinner/spinner_common.js
new file mode 100644 (file)
index 0000000..4f05b1e
--- /dev/null
+++ b/tests/unit/spinner/spinner_common.js
@@ -0,0 +1,19 @@
+TestHelpers.commonWidgetTests( "spinner", {
+       defaults: {
+               culture: null,
+               disabled: false,
+               incremental: true,
+               max: null,
+               min: null,
+               numberFormat: null,
+               page: 10,
+               step: 1,
+
+               // callbacks
+               change: null,
+               create: null,
+               spin: null,
+               start: null,
+               stop: null
+       }
+});

diff --git a/tests/unit/spinner/spinner_defaults.js b/tests/unit/spinner/spinner_defaults.js
deleted file mode 100644 (file)
index 4f05b1e..0000000
--- a/tests/unit/spinner/spinner_defaults.js
+++ /dev/null
@@ -1,19 +0,0 @@
-TestHelpers.commonWidgetTests( "spinner", {
-       defaults: {
-               culture: null,
-               disabled: false,
-               incremental: true,
-               max: null,
-               min: null,
-               numberFormat: null,
-               page: 10,
-               step: 1,
-
-               // callbacks
-               change: null,
-               create: null,
-               spin: null,
-               start: null,
-               stop: null
-       }
-});

diff --git a/tests/unit/tabs/tabs.html b/tests/unit/tabs/tabs.html
index 7f60ad2774786074599a2a16d7ccf21163ccf9ef..a79d30e0ec500f20233091481bb0db71d43abc9d 100644 (file)
--- a/tests/unit/tabs/tabs.html
+++ b/tests/unit/tabs/tabs.html
@@ -26,7 +26,7 @@
        <script src="../testsuite.js"></script>
 
        <script src="tabs_test_helpers.js"></script>
-       <script src="tabs_defaults.js"></script>
+       <script src="tabs_common.js"></script>
        <script src="tabs_core.js"></script>
        <script src="tabs_events.js"></script>
        <script src="tabs_methods.js"></script>

diff --git a/tests/unit/tabs/tabs_common.js b/tests/unit/tabs/tabs_common.js
new file mode 100644 (file)
index 0000000..7ffb05d
--- /dev/null
+++ b/tests/unit/tabs/tabs_common.js
@@ -0,0 +1,16 @@
+TestHelpers.commonWidgetTests( "tabs", {
+       defaults: {
+               active: null,
+               collapsible: false,
+               disabled: false,
+               event: "click",
+               fx: null,
+
+               // callbacks
+               activate: null,
+               beforeActivate: null,
+               beforeLoad: null,
+               create: null,
+               load: null
+       }
+});

diff --git a/tests/unit/tabs/tabs_common_deprecated.js b/tests/unit/tabs/tabs_common_deprecated.js
new file mode 100644 (file)
index 0000000..fdcff21
--- /dev/null
+++ b/tests/unit/tabs/tabs_common_deprecated.js
@@ -0,0 +1,29 @@
+TestHelpers.commonWidgetTests( "tabs", {
+       defaults: {
+               active: null,
+               ajaxOptions: null,
+               cache: false,
+               collapsible: false,
+               cookie: null,
+               disabled: false,
+               event: "click",
+               fx: null,
+               idPrefix: "ui-tabs-",
+               panelTemplate: "<div></div>",
+               spinner: "<em>Loading&#8230;</em>",
+               tabTemplate: "<li><a href='#{href}'><span>#{label}</span></a></li>",
+
+               // callbacks
+               activate: null,
+               add: null,
+               beforeActivate: null,
+               beforeLoad: null,
+               create: null,
+               disable: null,
+               enable: null,
+               load: null,
+               remove: null,
+               select: null,
+               show: null
+       }
+});

diff --git a/tests/unit/tabs/tabs_defaults.js b/tests/unit/tabs/tabs_defaults.js
deleted file mode 100644 (file)
index 7ffb05d..0000000
--- a/tests/unit/tabs/tabs_defaults.js
+++ /dev/null
@@ -1,16 +0,0 @@
-TestHelpers.commonWidgetTests( "tabs", {
-       defaults: {
-               active: null,
-               collapsible: false,
-               disabled: false,
-               event: "click",
-               fx: null,
-
-               // callbacks
-               activate: null,
-               beforeActivate: null,
-               beforeLoad: null,
-               create: null,
-               load: null
-       }
-});

diff --git a/tests/unit/tabs/tabs_defaults_deprecated.js b/tests/unit/tabs/tabs_defaults_deprecated.js
deleted file mode 100644 (file)
index fdcff21..0000000
--- a/tests/unit/tabs/tabs_defaults_deprecated.js
+++ /dev/null
@@ -1,29 +0,0 @@
-TestHelpers.commonWidgetTests( "tabs", {
-       defaults: {
-               active: null,
-               ajaxOptions: null,
-               cache: false,
-               collapsible: false,
-               cookie: null,
-               disabled: false,
-               event: "click",
-               fx: null,
-               idPrefix: "ui-tabs-",
-               panelTemplate: "<div></div>",
-               spinner: "<em>Loading&#8230;</em>",
-               tabTemplate: "<li><a href='#{href}'><span>#{label}</span></a></li>",
-
-               // callbacks
-               activate: null,
-               add: null,
-               beforeActivate: null,
-               beforeLoad: null,
-               create: null,
-               disable: null,
-               enable: null,
-               load: null,
-               remove: null,
-               select: null,
-               show: null
-       }
-});

diff --git a/tests/unit/tabs/tabs_deprecated.html b/tests/unit/tabs/tabs_deprecated.html
index c22ec3369d6ec43a4acb09928bc4062596965c0b..9bb8e413e476c83132768f04696f5c537eb36353 100644 (file)
--- a/tests/unit/tabs/tabs_deprecated.html
+++ b/tests/unit/tabs/tabs_deprecated.html
@@ -24,7 +24,7 @@
        <script src="../testsuite.js"></script>
 
        <script src="tabs_test_helpers.js"></script>
-       <script src="tabs_defaults_deprecated.js"></script>
+       <script src="tabs_common_deprecated.js"></script>
        <script src="tabs_core.js"></script>
        <script src="tabs_events.js"></script>
        <script src="tabs_methods.js"></script>

diff --git a/tests/unit/tooltip/tooltip.html b/tests/unit/tooltip/tooltip.html
index b5e8558e5dc82dbc7dea0a7cfe8ff0a96e553c77..d1f54d544833702a7a3cbd3c2e82e0a2a805ec44 100644 (file)
--- a/tests/unit/tooltip/tooltip.html
+++ b/tests/unit/tooltip/tooltip.html
@@ -23,7 +23,7 @@
        <script src="../../jquery.simulate.js"></script>
        <script src="../testsuite.js"></script>
 
-       <script src="tooltip_defaults.js"></script>
+       <script src="tooltip_common.js"></script>
        <script src="tooltip_core.js"></script>
        <script src="tooltip_events.js"></script>
        <script src="tooltip_methods.js"></script>

diff --git a/tests/unit/tooltip/tooltip_common.js b/tests/unit/tooltip/tooltip_common.js
new file mode 100644 (file)
index 0000000..d12ee95
--- /dev/null
+++ b/tests/unit/tooltip/tooltip_common.js
@@ -0,0 +1,20 @@
+TestHelpers.commonWidgetTests( "tooltip", {
+       defaults: {
+               content: function() {},
+               disabled: false,
+               hide: true,
+               items: "[title]",
+               position: {
+                       my: "left+15 center",
+                       at: "right center",
+                       collision: "flipfit flipfit"
+               },
+               show: true,
+               tooltipClass: null,
+
+               // callbacks
+               close: null,
+               create: null,
+               open: null
+       }
+});

diff --git a/tests/unit/tooltip/tooltip_defaults.js b/tests/unit/tooltip/tooltip_defaults.js
deleted file mode 100644 (file)
index d12ee95..0000000
--- a/tests/unit/tooltip/tooltip_defaults.js
+++ /dev/null
@@ -1,20 +0,0 @@
-TestHelpers.commonWidgetTests( "tooltip", {
-       defaults: {
-               content: function() {},
-               disabled: false,
-               hide: true,
-               items: "[title]",
-               position: {
-                       my: "left+15 center",
-                       at: "right center",
-                       collision: "flipfit flipfit"
-               },
-               show: true,
-               tooltipClass: null,
-
-               // callbacks
-               close: null,
-               create: null,
-               open: null
-       }
-});