aboutsummaryrefslogtreecommitdiffstats
path: root/tests/unit
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2011-07-29 14:57:06 -0400
committerScott González <scott.gonzalez@gmail.com>2011-07-29 14:57:06 -0400
commitb796cc57bd1eb0557849ece88c5794b70656f5cd (patch)
treea62f6d04b43aacf9931bba56785d9fa7e6248cbf /tests/unit
parent4b17402262f917cfd7b49b43151925aadf8880e4 (diff)
downloadjquery-ui-b796cc57bd1eb0557849ece88c5794b70656f5cd.tar.gz
jquery-ui-b796cc57bd1eb0557849ece88c5794b70656f5cd.zip
jQuery 1.6 support.
Diffstat (limited to 'tests/unit')
-rw-r--r--tests/unit/button/button_options.js10
-rw-r--r--tests/unit/core/core.html8
-rw-r--r--tests/unit/core/selector.js18
-rw-r--r--tests/unit/datepicker/datepicker_methods.js6
-rw-r--r--tests/unit/datepicker/datepicker_options.js2
-rw-r--r--tests/unit/widget/widget_core.js4
6 files changed, 11 insertions, 37 deletions
diff --git a/tests/unit/button/button_options.js b/tests/unit/button/button_options.js
index 5b25ecd63..565315f05 100644
--- a/tests/unit/button/button_options.js
+++ b/tests/unit/button/button_options.js
@@ -9,24 +9,24 @@ test("disabled, explicity value", function() {
$("#radio01").button({ disabled: false });
same(false, $("#radio01").button("option", "disabled"),
"disabled option set to false");
- same(false, $("#radio01").attr("disabled"), "element is disabled");
+ same(false, $("#radio01").propAttr("disabled"), "element is disabled");
$("#radio02").button({ disabled: true });
same(true, $("#radio02").button("option", "disabled"),
"disabled option set to true");
- same(true, $("#radio02").attr("disabled"), "element is not disabled");
+ same(true, $("#radio02").propAttr("disabled"), "element is not disabled");
});
test("disabled, null", function() {
$("#radio01").button({ disabled: null });
same(false, $("#radio01").button("option", "disabled"),
"disabled option set to false");
- same(false, $("#radio01").attr("disabled"), "element is disabled");
+ same(false, $("#radio01").propAttr("disabled"), "element is disabled");
- $("#radio02").attr("disabled", "disabled").button({ disabled: null });
+ $("#radio02").propAttr("disabled", true).button({ disabled: null });
same(true, $("#radio02").button("option", "disabled"),
"disabled option set to true");
- same(true, $("#radio02").attr("disabled"), "element is not disabled");
+ same(true, $("#radio02").propAttr("disabled"), "element is not disabled");
});
test("text false without icon", function() {
diff --git a/tests/unit/core/core.html b/tests/unit/core/core.html
index 7e49c5a83..810633a95 100644
--- a/tests/unit/core/core.html
+++ b/tests/unit/core/core.html
@@ -107,14 +107,6 @@
<span id="spanTabindex-50" tabindex="-50">.</span>
</div>
- <div>
- <input id="inputTabindexfoo" tabindex="foo" />
- <input id="inputTabindex3foo" tabindex="3foo" />
-
- <span id="spanTabindexfoo" tabindex="foo">.</span>
- <span id="spanTabindex3foo" tabindex="3foo">.</span>
- </div>
-
<div id="zIndex100" style="z-index: 100; position: absolute">
<div id="zIndexAutoWithParent">.</div>
</div>
diff --git a/tests/unit/core/selector.js b/tests/unit/core/selector.js
index e7b7f9b6c..44888ad88 100644
--- a/tests/unit/core/selector.js
+++ b/tests/unit/core/selector.js
@@ -147,15 +147,6 @@ test("focusable - not natively focusable with various tabindex", function() {
isFocusable('#spanTabindex-50', 'span, tabindex -50');
});
-test("focusable - invalid tabindex", function() {
- expect(4);
-
- isFocusable('#inputTabindexfoo', 'input, tabindex foo');
- isFocusable('#inputTabindex3foo', 'input, tabindex 3foo');
- isNotFocusable('#spanTabindexfoo', 'span tabindex foo');
- isNotFocusable('#spanTabindex3foo', 'span, tabindex 3foo');
-});
-
test("focusable - area elements", function() {
isNotFocusable('#areaCoordsNoHref', 'coords but no href');
isFocusable('#areaCoordsHref', 'coords and href');
@@ -233,15 +224,6 @@ test("tabbable - not natively tabbable with various tabindex", function() {
isNotTabbable('#spanTabindex-50', 'span, tabindex -50');
});
-test("tabbable - invalid tabindex", function() {
- expect(4);
-
- isTabbable('#inputTabindexfoo', 'input, tabindex foo');
- isTabbable('#inputTabindex3foo', 'input, tabindex 3foo');
- isNotTabbable('#spanTabindexfoo', 'span tabindex foo');
- isNotTabbable('#spanTabindex3foo', 'span, tabindex 3foo');
-});
-
test("tabbable - area elements", function() {
isNotTabbable('#areaCoordsNoHref', 'coords but no href');
isTabbable('#areaCoordsHref', 'coords and href');
diff --git a/tests/unit/datepicker/datepicker_methods.js b/tests/unit/datepicker/datepicker_methods.js
index ee14f353b..df35fdb7a 100644
--- a/tests/unit/datepicker/datepicker_methods.js
+++ b/tests/unit/datepicker/datepicker_methods.js
@@ -111,15 +111,15 @@ test('enableDisable', function() {
var dp = $('.ui-datepicker-inline', inl);
ok(!inl.datepicker('isDisabled'), 'Enable/disable inline - initially marked as enabled');
ok(!dp.children().is('.ui-state-disabled'), 'Enable/disable inline - not visually disabled initially');
- ok(!dp.find('select').attr('disabled'), 'Enable/disable inline - form element enabled initially');
+ ok(!dp.find('select').propAttr('disabled'), 'Enable/disable inline - form element enabled initially');
inl.datepicker('disable');
ok(inl.datepicker('isDisabled'), 'Enable/disable inline - now marked as disabled');
ok(dp.children().is('.ui-state-disabled'), 'Enable/disable inline - visually disabled');
- ok(dp.find('select').attr('disabled'), 'Enable/disable inline - form element disabled');
+ ok(dp.find('select').propAttr('disabled'), 'Enable/disable inline - form element disabled');
inl.datepicker('enable');
ok(!inl.datepicker('isDisabled'), 'Enable/disable inline - now marked as enabled');
ok(!dp.children().is('.ui-state-disabled'), 'Enable/disable inline - not visiually disabled');
- ok(!dp.find('select').attr('disabled'), 'Enable/disable inline - form element enabled');
+ ok(!dp.find('select').propAttr('disabled'), 'Enable/disable inline - form element enabled');
inl.datepicker('destroy');
});
diff --git a/tests/unit/datepicker/datepicker_options.js b/tests/unit/datepicker/datepicker_options.js
index f82bada2f..15005c8be 100644
--- a/tests/unit/datepicker/datepicker_options.js
+++ b/tests/unit/datepicker/datepicker_options.js
@@ -692,7 +692,7 @@ test('callbacks', function() {
ok(day21.is('.ui-datepicker-unselectable'), 'Before show day - unselectable 21');
ok(day20.is('.day10'), 'Before show day - CSS 20');
ok(!day21.is('.day10'), 'Before show day - CSS 21');
- ok(day20.attr('title') == '', 'Before show day - title 20');
+ ok(!day20.attr('title'), 'Before show day - title 20');
ok(day21.attr('title') == 'Divisble by 3', 'Before show day - title 21');
inp.datepicker('hide').datepicker('destroy');
});
diff --git a/tests/unit/widget/widget_core.js b/tests/unit/widget/widget_core.js
index 2673350f3..55f609159 100644
--- a/tests/unit/widget/widget_core.js
+++ b/tests/unit/widget/widget_core.js
@@ -162,12 +162,12 @@ test( "_getCreateOptions()", function() {
options: {
option1: "valuex",
option2: "valuex",
- option3: "value3",
+ option3: "value3"
},
_getCreateOptions: function() {
return {
option1: "override1",
- option2: "overideX",
+ option2: "overideX"
};
},
_create: function() {