Bug 1433303 - Part 4: Enable test2626 tests for Intl.Locale proposal. r=jwalden

Differential Revision: https://phabricator.services.mozilla.com/D38877

--HG--
extra : moz-landing-system : lando

js/src/tests/jstests.list

@@ -61,6 +61,10 @@ skip-if(!this.hasOwnProperty("Intl")) script test262/built-ins/String/prototype/
 # Skip intl402 tests when Intl isn't available.
 skip-if(!this.hasOwnProperty("Intl")) include test262/intl402/jstests.list
 
+# Skip Intl.Locale tests when the addIntlExtras helper isn't available.
+skip-if(!this.hasOwnProperty('addIntlExtras')) include test262/intl402/Locale/jstests.list
+skip-if(!this.hasOwnProperty('addIntlExtras')) script test262/intl402/Intl/getCanonicalLocales/Locale-object.js
+
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1415303
 skip-if(!this.hasOwnProperty("Atomics")) include test262/built-ins/Atomics/jstests.list
 skip-if(!this.hasOwnProperty("SharedArrayBuffer")) include test262/built-ins/SharedArrayBuffer/jstests.list
@@ -527,9 +531,20 @@ skip script test262/built-ins/Promise/race/invoke-resolve-get-error-close.js
 
 # Regular grandfathered tags canonicalized differently in CLDR.
 skip script test262/intl402/Intl/getCanonicalLocales/grandfathered.js
+skip script test262/intl402/Locale/likely-subtags-grandfathered.js
 
 # Deprecated variant subtag mappings are no longer supported.
 skip script test262/intl402/Intl/getCanonicalLocales/preferred-variant.js
+skip script test262/intl402/Locale/constructor-non-iana-canon.js
+
+# 3-digit region subtags are canonicalised.
+skip script test262/intl402/Locale/constructor-options-region-valid.js
+
+# Variant subtags are sorted in alphabetical order.
+skip script test262/intl402/Locale/constructor-tag.js
+
+# "u-kf" now returns "" for the "caseFirst" property.
+skip script test262/intl402/Locale/getters.js
 
 # Test requires signDisplay option to not exist.
 skip script test262/intl402/NumberFormat/prototype/resolvedOptions/order.js

js/src/tests/test262-intl-locale.js

@@ -0,0 +1,14 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+// Call the shell helper to add Intl.Locale to the Intl object.
+if (typeof addIntlExtras === "function") {
+    let intlExtras = {};
+    addIntlExtras(intlExtras);
+
+    Object.defineProperty(Intl, "Locale", {
+        value: intlExtras.Locale,
+        writable: true, enumerable: false, configurable: true
+    });
+}

js/src/tests/test262-update.py

@@ -30,7 +30,6 @@ UNSUPPORTED_FEATURES = set([
     "regexp-lookbehind",
     "regexp-named-groups",
     "regexp-unicode-property-escapes",
-    "Intl.Locale",
     "global",
     "export-star-as-namespace-from-module",
     "Intl.DateTimeFormat-quarter",
@@ -411,6 +410,9 @@ def process_test262(test262Dir, test262OutDir, strictTests, externManifests):
                                                                  "detachArrayBuffer.js", "nans.js"]
     explicitIncludes[os.path.join("built-ins", "TypedArrays")] = ["detachArrayBuffer.js"]
 
+    # Intl.Locale isn't yet enabled by default.
+    localIncludesMap[os.path.join("intl402")] = ["test262-intl-locale.js"]
+
     # Process all test directories recursively.
     for (dirPath, dirNames, fileNames) in os.walk(testDir):
         relPath = os.path.relpath(dirPath, testDir)