aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Resig <jeresig@gmail.com>2007-07-30 02:52:24 +0000
committerJohn Resig <jeresig@gmail.com>2007-07-30 02:52:24 +0000
commit660490e6f487332aaf10c19fd9bbb325bc9946af (patch)
tree89df329bdbc790e7c98dba8536350ead87dc49ac
parent334462b23c3daca53f2fbff177693f0f1ba29c48 (diff)
downloadjquery-660490e6f487332aaf10c19fd9bbb325bc9946af.tar.gz
jquery-660490e6f487332aaf10c19fd9bbb325bc9946af.zip
The test for underscore selectors broke under Opera, so the element is now loaded via Ajax and tested. (bug #1084)
-rw-r--r--build/test/data/with_fries.xml1
-rw-r--r--src/selector/selectorTest.js15
2 files changed, 13 insertions, 3 deletions
diff --git a/build/test/data/with_fries.xml b/build/test/data/with_fries.xml
index 30ae2073a..88e0e49d5 100644
--- a/build/test/data/with_fries.xml
+++ b/build/test/data/with_fries.xml
@@ -15,6 +15,7 @@
<property name="prop2">
<thing att="something" />
</property>
+ <foo_bar>foo</foo_bar>
</properties>
</component>
</meta>
diff --git a/src/selector/selectorTest.js b/src/selector/selectorTest.js
index 9e646ce91..ac07bf32d 100644
--- a/src/selector/selectorTest.js
+++ b/src/selector/selectorTest.js
@@ -1,7 +1,7 @@
module("selector");
test("element", function() {
- expect(9);
+ expect(8);
ok( $("*").size() >= 30, "Select all" );
t( "Element Selector", "p", ["firstp","ap","sndp","en","sap","first"] );
t( "Element Selector", "body", ["body"] );
@@ -11,10 +11,19 @@ test("element", function() {
ok( $("#length").length, '&lt;input name="length"&gt; cannot be found under IE, see #945' );
ok( $("#lengthtest input").length, '&lt;input name="length"&gt; cannot be found under IE, see #945' );
-
- t( "Element Selector with underscore", "foo_bar", ["foobar"] );
});
+if ( location.protocol != "file:" ) {
+ test("Element Selector with underscore", function() {
+ expect(1);
+ stop();
+ $.get("data/with_fries.xml", function(xml) {
+ ok( $("foo_bar", xml).length == 1, "Element Selector with underscore" );
+ start();
+ });
+ });
+}
+
test("broken", function() {
expect(7);
t( "Broken Selector", "[", [] );