Fix the tests don't run correctly on CI (#167)

Author: watilde

.travis.yml

@@ -2,7 +2,9 @@ language: node_js
 node_js:
   - '0.10'
   - '0.12'
-
+before_install:
+  - npm install -g npm@3
+  - npm --version
 addons:
   sauce_connect:
     username: andyearnshaw

Gruntfile.js

@@ -30,7 +30,7 @@ module.exports = function (grunt) {
                 dest  : 'tests/test262',
                 src   : [
                     'LICENSE',
-                    'test/intl402/*.js',
+                    'test/intl402/**/*.js',
                     'harness/*.js',
                 ],
             },

package.json

@@ -39,6 +39,7 @@
     "cli-color": "^1.0.0",
     "clui": "^0.3.1",
     "eslint": "^2.2.0",
+    "estraverse-fb": "^1.3.1",
     "finalhandler": "^0.4.0",
     "glob": "^5.0.3",
     "grunt": "^0.4.5",
@@ -51,7 +52,7 @@
     "mkdirp": "^0.5.1",
     "object.assign": "^1.1.1",
     "rimraf": "^2.4.2",
-    "rollup": "^0.25.0",
+    "rollup": "^0.26.0",
     "rollup-plugin-babel": "^2.3.9",
     "rollup-plugin-commonjs": "^2.2.0",
     "rollup-plugin-memory": "^1.0.0",

scripts/build-dist.js

@@ -17,6 +17,7 @@ const bundleConfig = {
     format: 'umd',
     moduleName: 'IntlPolyfill',
     sourceMap: true,
+    external: ['Intl'],
 };
 
 let babelConfig = JSON.parse(fs.readFileSync('src/.babelrc', 'utf8'));

src/12.datetimeformat.js

@@ -861,7 +861,7 @@ function CreateDateTimeParts(dateTimeFormat, x) {
     let internal = dateTimeFormat.__getInternalProperties(secret);
 
     // Creating restore point for properties on the RegExp object... please wait
-    /* let regexpState = */createRegExpRestore(); // todo: review this
+    /* let regexpState = */createRegExpRestore(); // ###TODO: review this
 
     // 2. Let locale be the value of the [[locale]] internal property of dateTimeFormat.
     let locale = internal['[[locale]]'];
@@ -988,10 +988,10 @@ function CreateDateTimeParts(dateTimeFormat, x) {
                     break;
 
                   case 'timeZoneName':
-                    fv = ''; // TODO
+                    fv = ''; // ###TODO
                     break;
 
-                    // TODO: Era
+                    // ###TODO: Era
                   default:
                     fv = tm['[['+ p +']]'];
                 }

src/cldr.js

@@ -108,10 +108,8 @@ function expDTComponentsMeta($0, formatObj) {
             // day of the month
             formatObj.day = $0.length === 2 ? '2-digit' : 'numeric';
             return '{day}';
-        case 'D':
-            // day of the year
-        case 'F':
-            // day of the week
+        case 'D': // day of the year
+        case 'F': // day of the week
         case 'g':
             // 1..n: Modified Julian day
             formatObj.day = 'numeric';

src/main.js

@@ -1,9 +1,13 @@
 import IntlPolyfill from "./core.js";
 
 // hack to export the polyfill as global Intl if needed
-if (typeof Intl !== undefined) {
-    Intl = IntlPolyfill;
-    IntlPolyfill.__applyLocaleSensitivePrototypes();
+if (typeof Intl !== 'undefined') {
+    try {
+        Intl = IntlPolyfill;
+        IntlPolyfill.__applyLocaleSensitivePrototypes();
+    } catch (e) {
+        // can be read only property
+    }
 }
 
 export default IntlPolyfill;

tests/noderunner.js

@@ -5,11 +5,11 @@ var LIBS = {
         path:   require('path'),
         vm:     require('vm'),
     },
-    POLYFILL_PATH = __dirname + '/../dist/Intl.js',
+    POLYFILL_PATH = LIBS.path.resolve(__dirname + '/../dist/Intl.js'),
     POLYFILL_CODE = LIBS.fs.readFileSync(POLYFILL_PATH).toString(),
-    DATA_PATH = __dirname + '/../locale-data/complete.js',
+    DATA_PATH = LIBS.path.resolve(__dirname + '/../locale-data/complete.js'),
     DATA_CODE = LIBS.fs.readFileSync(DATA_PATH).toString(),
-    TEST_DIR = __dirname + '/test262/pages';
+    TEST_DIR = LIBS.path.resolve(__dirname + '/test262/pages');
 
 
 // returns Error if test threw one