test: add common.hasIntl

jasnell · MylesBorins · commit 944488313142 · 2018-02-12T03:21:26.000-05:00
Backport-PR-URL: #17365 PR-URL: #9246 Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Roman Reiss <me@silverwind.io> Reviewed-By: Johan Bergström <bugs@bergstroem.nu> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
diff --git a/test/common/index.js b/test/common/index.js
@@ -577,6 +577,12 @@ exports.expectWarning = function(name, expected) {
   }, expected.length));
 };
 
+Object.defineProperty(exports, 'hasIntl', {
+  get: function() {
+    return process.binding('config').hasIntl;
+  }
+});
+
 // Crash the process on unhandled rejections.
 exports.crashOnUnhandledRejection = function() {
   process.on('unhandledRejection',
diff --git a/test/parallel/test-intl-v8BreakIterator.js b/test/parallel/test-intl-v8BreakIterator.js
@@ -2,8 +2,9 @@
 const common = require('../common');
 const assert = require('assert');
 
-if (global.Intl === undefined || Intl.v8BreakIterator === undefined)
+if (!common.hasIntl || Intl.v8BreakIterator === undefined) {
   common.skip('no Intl');
+}
 
 try {
   new Intl.v8BreakIterator();
diff --git a/test/parallel/test-intl.js b/test/parallel/test-intl.js
@@ -8,9 +8,6 @@ if (enablei18n === undefined) {
   enablei18n = 0;
 }
 
-// is the Intl object present?
-const haveIntl = (global.Intl !== undefined);
-
 // Returns true if no specific locale ids were configured (i.e. "all")
 // Else, returns true if loc is in the configured list
 // Else, returns false
@@ -19,7 +16,7 @@ function haveLocale(loc) {
   return locs.includes(loc);
 }
 
-if (!haveIntl) {
+if (!common.hasIntl) {
   const erMsg =
     `"Intl" object is NOT present but v8_enable_i18n_support is ${enablei18n}`;
   assert.strictEqual(enablei18n, 0, erMsg);
diff --git a/test/parallel/test-process-versions.js b/test/parallel/test-process-versions.js
@@ -9,7 +9,7 @@ if (common.hasCrypto) {
   expected_keys.push('openssl');
 }
 
-if (typeof Intl !== 'undefined') {
+if (common.hasIntl) {
   expected_keys.push('icu');
 }
 
diff --git a/test/parallel/test-repl-tab-complete.js b/test/parallel/test-repl-tab-complete.js
@@ -344,7 +344,7 @@ const testNonGlobal = repl.start({
 const builtins = [['Infinity', '', 'Int16Array', 'Int32Array',
                    'Int8Array'], 'I'];
 
-if (typeof Intl === 'object') {
+if (common.hasIntl) {
   builtins[0].push('Intl');
 }
 testNonGlobal.complete('I', common.mustCall((error, data) => {

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ if (common.hasCrypto) {`
`9`	`9`	`expected_keys.push('openssl');`
`10`	`10`	`}`
`11`	`11`
`12`		`-if (typeof Intl !== 'undefined') {`
	`12`	`+if (common.hasIntl) {`
`13`	`13`	`expected_keys.push('icu');`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -344,7 +344,7 @@ const testNonGlobal = repl.start({`
`344`	`344`	`const builtins = [['Infinity', '', 'Int16Array', 'Int32Array',`
`345`	`345`	`'Int8Array'], 'I'];`
`346`	`346`
`347`		`-if (typeof Intl === 'object') {`
	`347`	`+if (common.hasIntl) {`
`348`	`348`	`builtins[0].push('Intl');`
`349`	`349`	`}`
`350`	`350`	`testNonGlobal.complete('I', common.mustCall((error, data) => {`