aboutsummaryrefslogtreecommitdiffstats
path: root/tests/unit/resizable
diff options
context:
space:
mode:
Diffstat (limited to 'tests/unit/resizable')
-rw-r--r--tests/unit/resizable/all.html4
-rw-r--r--tests/unit/resizable/resizable.html14
-rw-r--r--tests/unit/resizable/resizable_common.js (renamed from tests/unit/resizable/resizable_defaults.js)5
-rw-r--r--tests/unit/resizable/resizable_events.js12
-rw-r--r--tests/unit/resizable/resizable_methods.js55
-rw-r--r--tests/unit/resizable/resizable_options.js4
6 files changed, 14 insertions, 80 deletions
diff --git a/tests/unit/resizable/all.html b/tests/unit/resizable/all.html
index 1c6811282..bef29ff6e 100644
--- a/tests/unit/resizable/all.html
+++ b/tests/unit/resizable/all.html
@@ -7,9 +7,9 @@
<script src="../../../jquery-1.7.2.js"></script>
<link rel="stylesheet" href="../../../external/qunit.css">
- <link rel="stylesheet" href="../subsuiteRunner.css">
+ <link rel="stylesheet" href="../qunit-composite.css">
<script src="../../../external/qunit.js"></script>
- <script src="../subsuiteRunner.js"></script>
+ <script src="../qunit-composite.js"></script>
<script src="../subsuite.js"></script>
<script>
diff --git a/tests/unit/resizable/resizable.html b/tests/unit/resizable/resizable.html
index 4e886d2fd..9baa67493 100644
--- a/tests/unit/resizable/resizable.html
+++ b/tests/unit/resizable/resizable.html
@@ -5,9 +5,12 @@
<title>jQuery UI Resizable Test Suite</title>
<script src="../../jquery.js"></script>
- <script src="../../resource_loader.js"></script>
+ <link rel="stylesheet" href="../../../external/qunit.css">
+ <script src="../../../external/qunit.js"></script>
+ <script src="../../jquery.simulate.js"></script>
+ <script src="../testsuite.js"></script>
<script>
- loadResources({
+ TestHelpers.loadResources({
css: [ "ui.core", "ui.resizable" ],
js: [
"ui/jquery.ui.core.js",
@@ -18,13 +21,8 @@
});
</script>
- <link rel="stylesheet" href="../../../external/qunit.css">
- <script src="../../../external/qunit.js"></script>
- <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_defaults.js b/tests/unit/resizable/resizable_common.js
index c46e10781..617cdd2ad 100644
--- a/tests/unit/resizable/resizable_defaults.js
+++ b/tests/unit/resizable/resizable_common.js
@@ -19,6 +19,9 @@ TestHelpers.commonWidgetTests('resizable', {
maxWidth: null,
minHeight: 10,
minWidth: 10,
- zIndex: 1000
+ zIndex: 1000,
+
+ // callbacks
+ create: null
}
});
diff --git a/tests/unit/resizable/resizable_events.js b/tests/unit/resizable/resizable_events.js
index e8041f064..52d55731c 100644
--- a/tests/unit/resizable/resizable_events.js
+++ b/tests/unit/resizable/resizable_events.js
@@ -5,16 +5,4 @@
module("resizable: events");
-test("start", function() {
- ok(false, "missing test - untested code is broken code.");
-});
-
-test("resize", function() {
- ok(false, "missing test - untested code is broken code.");
-});
-
-test("stop", function() {
- ok(false, "missing test - untested code is broken code.");
-});
-
})(jQuery);
diff --git a/tests/unit/resizable/resizable_methods.js b/tests/unit/resizable/resizable_methods.js
index 2b4c4256c..87859acf7 100644
--- a/tests/unit/resizable/resizable_methods.js
+++ b/tests/unit/resizable/resizable_methods.js
@@ -5,60 +5,5 @@
module("resizable: methods");
-test("init", function() {
- expect(6);
-
- $("<div></div>").appendTo('body').resizable().remove();
- ok(true, '.resizable() called on element');
-
- $([]).resizable().remove();
- ok(true, '.resizable() called on empty collection');
-
- $('<div></div>').resizable().remove();
- ok(true, '.resizable() called on disconnected DOMElement');
-
- $('<div></div>').resizable().resizable("foo").remove();
- ok(true, 'arbitrary method called after init');
-
- el = $('<div></div>').resizable();
- var foo = el.resizable("option", "foo");
- el.remove();
- ok(true, 'arbitrary option getter after init');
-
- $('<div></div>').resizable().resizable("option", "foo", "bar").remove();
- ok(true, 'arbitrary option setter after init');
-});
-
-test("destroy", function() {
- $("<div></div>").appendTo('body').resizable().resizable("destroy").remove();
- ok(true, '.resizable("destroy") called on element');
-
- $([]).resizable().resizable("destroy").remove();
- ok(true, '.resizable("destroy") called on empty collection');
-
- $('<div></div>').resizable().resizable("destroy").remove();
- ok(true, '.resizable("destroy") called on disconnected DOMElement');
-
- $('<div></div>').resizable().resizable("destroy").resizable("foo").remove();
- ok(true, 'arbitrary method called after destroy');
-
- var expected = $('<div></div>').resizable(),
- actual = expected.resizable('destroy');
- equal(actual, expected, 'destroy is chainable');
-});
-
-test("enable", function() {
- var expected = $('<div></div>').resizable(),
- actual = expected.resizable('enable');
- equal(actual, expected, 'enable is chainable');
- ok(false, "missing test - untested code is broken code.");
-});
-
-test("disable", function() {
- var expected = $('<div></div>').resizable(),
- actual = expected.resizable('disable');
- equal(actual, expected, 'disable is chainable');
- ok(false, "missing test - untested code is broken code.");
-});
})(jQuery);
diff --git a/tests/unit/resizable/resizable_options.js b/tests/unit/resizable/resizable_options.js
index 275639ca1..e10a55a31 100644
--- a/tests/unit/resizable/resizable_options.js
+++ b/tests/unit/resizable/resizable_options.js
@@ -189,10 +189,10 @@ test("ui-resizable-nw { handles: 'all', minWidth: 60, minHeight: 60, maxWidth: 1
test("zIndex, applied to all handles", function() {
expect(8);
-
+
var target = $('<div></div>').resizable({ handles: 'all', zIndex: 100 });
target.children( '.ui-resizable-handle' ).each( function( index, handle ) {
- equals( $( handle ).css( 'zIndex' ), 100, 'compare zIndex' );
+ equal( $( handle ).css( 'zIndex' ), 100, 'compare zIndex' );
});
});