From da76cd2dcfc231f3be525a432fcd2e4fd20596c6 Mon Sep 17 00:00:00 2001 From: Tooru Fujisawa Date: Wed, 28 Jan 2015 13:06:38 +0900 Subject: [PATCH] Bug 1069416 - Part 7: Remove JS_HAS_SYMBOLS from dom. r=smaug --- dom/bindings/test/test_sequence_detection.html | 4 +--- dom/html/test/test_formelements.html | 11 ++--------- dom/html/test/test_htmlcollection.html | 11 ++--------- dom/html/test/test_named_options.html | 7 +------ dom/html/test/test_rowscollection.html | 11 ++--------- 5 files changed, 8 insertions(+), 36 deletions(-) diff --git a/dom/bindings/test/test_sequence_detection.html b/dom/bindings/test/test_sequence_detection.html index c48415a2509..6ae032cc7b6 100644 --- a/dom/bindings/test/test_sequence_detection.html +++ b/dom/bindings/test/test_sequence_detection.html @@ -16,9 +16,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1066432 var testInterfaceJS = new TestInterfaceJS(); ok(testInterfaceJS, "got a TestInterfaceJS object"); - var JS_HAS_SYMBOLS = typeof Symbol === "function"; - var std_iterator = JS_HAS_SYMBOLS ? Symbol.iterator : "@@iterator"; - var nonIterableObject = {[std_iterator]: 5}; + var nonIterableObject = {[Symbol.iterator]: 5}; try { testInterfaceJS.testSequenceOverload(nonIterableObject); diff --git a/dom/html/test/test_formelements.html b/dom/html/test/test_formelements.html index 3e4a19e2d6d..c4714aa6b6f 100644 --- a/dom/html/test/test_formelements.html +++ b/dom/html/test/test_formelements.html @@ -32,9 +32,7 @@ names = []; for (var name in x) { names.push(name); } -var JS_HAS_SYMBOLS = typeof Symbol === "function"; -is(names.length, JS_HAS_SYMBOLS ? 9 : 10, - "Should have 9 enumerated names (or 10 with '@@iterator')"); +is(names.length, 9, "Should have 9 enumerated names"); is(names[0], "0", "Enum entry 1"); is(names[1], "1", "Enum entry 2"); is(names[2], "2", "Enum entry 3"); @@ -43,12 +41,7 @@ is(names[4], "4", "Enum entry 5"); is(names[5], "something", "Enum entry 6"); is(names[6], "namedItem", "Enum entry 7"); is(names[7], "item", "Enum entry 8"); -if (JS_HAS_SYMBOLS) { - is(names[8], "length", "Enum entry 9"); -} else { - is(names[8], "@@iterator", "Enum entry 9"); - is(names[9], "length", "Enum entry 10"); -} +is(names[8], "length", "Enum entry 9"); names = Object.getOwnPropertyNames(x); is(names.length, 10, "Should have 10 items"); diff --git a/dom/html/test/test_htmlcollection.html b/dom/html/test/test_htmlcollection.html index 1016ea6bf1e..1452f0c3cd9 100644 --- a/dom/html/test/test_htmlcollection.html +++ b/dom/html/test/test_htmlcollection.html @@ -28,9 +28,7 @@ var names = []; for (var name in x) { names.push(name); } -var JS_HAS_SYMBOLS = typeof Symbol === "function"; -is(names.length, JS_HAS_SYMBOLS ? 8 : 9, - "Should have 8 enumerated names (or 9 with '@@iterator')"); +is(names.length, 8, "Should have 8 enumerated names"); is(names[0], "0", "Enum entry 1") is(names[1], "1", "Enum entry 2") is(names[2], "2", "Enum entry 3") @@ -38,12 +36,7 @@ is(names[3], "3", "Enum entry 4") is(names[4], "something", "Enum entry 5") is(names[5], "item", "Enum entry 6") is(names[6], "namedItem", "Enum entry 7") -if (JS_HAS_SYMBOLS) { - is(names[7], "length", "Enum entry 8"); -} else { - is(names[7], "@@iterator", "Enum entry 8"); - is(names[8], "length", "Enum entry 9"); -} +is(names[7], "length", "Enum entry 8"); names = Object.getOwnPropertyNames(x); is(names.length, 9, "Should have 9 items"); diff --git a/dom/html/test/test_named_options.html b/dom/html/test/test_named_options.html index 8be15d06437..b6e84a9f2c3 100644 --- a/dom/html/test/test_named_options.html +++ b/dom/html/test/test_named_options.html @@ -42,9 +42,7 @@ var names2 = []; for (var name in opt) { names2.push(name); } -var JS_HAS_SYMBOLS = typeof Symbol === "function"; -is(names2.length, JS_HAS_SYMBOLS ? 11 : 12, - "Should have eleven enumerated names (or twelve with '@@iterator')"); +is(names2.length, 11, "Should have eleven enumerated names"); is(names2[0], "0", "Enum entry 1") is(names2[1], "1", "Enum entry 2") is(names2[2], "2", "Enum entry 3") @@ -56,9 +54,6 @@ is(names2[7], "length", "Enum entry 8") is(names2[8], "selectedIndex", "Enum entry 9") is(names2[9], "item", "Enum entry 10") is(names2[10], "namedItem", "Enum entry 11") -if (!JS_HAS_SYMBOLS) { - is(names2[11], "@@iterator", "Enum entry 12"); -} diff --git a/dom/html/test/test_rowscollection.html b/dom/html/test/test_rowscollection.html index 02914bec339..7a726b8a8ff 100644 --- a/dom/html/test/test_rowscollection.html +++ b/dom/html/test/test_rowscollection.html @@ -38,9 +38,7 @@ var names = []; for (var name in x) { names.push(name); } -var JS_HAS_SYMBOLS = typeof Symbol === "function"; -is(names.length, JS_HAS_SYMBOLS ? 10 : 11, - "Should have 10 enumerated names (or 11 with '@@iterator')"); +is(names.length, 10, "Should have 10 enumerated names"); is(names[0], "0", "Enum entry 1") is(names[1], "1", "Enum entry 2") is(names[2], "2", "Enum entry 3") @@ -50,12 +48,7 @@ is(names[5], "5", "Enum entry 6") is(names[6], "something", "Enum entry 7") is(names[7], "item", "Enum entry 8") is(names[8], "namedItem", "Enum entry 9") -if (JS_HAS_SYMBOLS) { - is(names[9], "length", "Enum entry 10"); -} else { - is(names[9], "@@iterator", "Enum entry 10"); - is(names[10], "length", "Enum entry 11"); -} +is(names[9], "length", "Enum entry 10"); names = Object.getOwnPropertyNames(x); is(names.length, 11, "Should have 11 items");