Merge pull request #9 from markandey/saucelabs

Add saucelab tests.

Author: markandey

.travis.yml

@@ -1,8 +1,12 @@
 language: node_js
 node_js:
   - "6"
+
 addons:
   firefox: "49.0"
+  sauce_connect:
+    username: "date-time-format-timezone"
+    access_key: "***********************"
 install:
   - npm install
 before_script:

Gruntfile.js

@@ -81,6 +81,12 @@ module.exports = function(grunt) {
 				],
 				dest: 'build/browserified/test/test-complete.js'
 			},
+			sauceLabTest: {
+				src: [
+					'build/test/test-saucelabs.js'
+				],
+				dest: 'build/browserified/test/test-saucelabs.js'
+			},
 			specificTimezone: {
 				src: [
 					'build/test/test-specific-zone-only.js'
@@ -158,6 +164,14 @@ module.exports = function(grunt) {
 				}, {
 					src: 'build/browserified/test/test-specific-zone-specific-locale.js'
 				}]
+			},
+			saucelabsTest: {
+				configFile: 'karma.conf.saucelabs.js',
+				files: [{
+					src: 'node_modules/intl/dist/Intl.complete.js'
+				}, {
+					src: 'build/browserified/test/test-saucelabs.js'
+				}]
 			}
 		},
 		mochaTest: {
@@ -207,9 +221,17 @@ module.exports = function(grunt) {
 		pkg: grunt.file.readJSON('package.json')
 	});
 
+	function allBut(task, subtask) {
+		return Object.keys(grunt.config.get(task)).
+		filter(sub => subtask !== sub).
+		map(sub => [task, sub].join(':'));
+	}
+
 	grunt.loadTasks('tasks');
 	grunt.registerTask('build', ['clean:build', 'eslint', 'babel', 'copy', 'gen-package', 'browserify', 'uglify']);
-	grunt.registerTask('test', ['mochaTest', 'karma']);
+
+	grunt.registerTask('test', process.env.TRAVIS ? ['mochaTest', 'karma'] : ['mochaTest'].concat(allBut('karma', 'saucelabsTest')));
+
 	grunt.registerTask('default', ['build', 'test']);
 	grunt.loadNpmTasks('grunt-contrib-copy');
 	grunt.loadNpmTasks('grunt-contrib-clean');

karma.conf.js

@@ -1,19 +1,6 @@
 // Karma configuration
 
 module.exports = function(config) {
-	const customLaunchers = {
-		sl_ie_9: {
-			base: 'SauceLabs',
-			browserName: 'internet explorer',
-			version: '9'
-		},
-		sl_safari: {
-			base: 'SauceLabs',
-			browserName: 'safari',
-			version: '9'
-		}
-	};
-
 	config.set({
 		basePath: '',
 		plugins: ['karma-chrome-launcher',
@@ -29,8 +16,7 @@ module.exports = function(config) {
 			testName: 'DateTimeFormatTimeZone tests'
 		},
 		frameworks: ['mocha'],
-		customLaunchers: customLaunchers,
-		reporters: [process.env.TRAVIS ? 'dots' : 'progress', 'saucelabs'],
+		reporters: [process.env.TRAVIS ? 'dots' : 'progress'],
 		logLevel: 'ERROR',
 		colors: true,
 		browserNoActivityTimeout: 100000,

karma.conf.saucelabs.js

@@ -0,0 +1,45 @@
+// Karma configuration
+
+module.exports = function(config) {
+	const customLaunchers = {
+		sl_ie_11: {
+			base: 'SauceLabs',
+			browserName: 'internet explorer',
+			version: '11'
+		},
+		sl_safari: {
+			base: 'SauceLabs',
+			browserName: 'safari',
+			version: '10'
+		},
+		sl_edge: {
+			base: 'SauceLabs',
+			browserName: 'microsoftedge'
+		}
+	};
+
+	config.set({
+		basePath: '',
+		plugins: ['karma-chrome-launcher',
+			'karma-firefox-launcher',
+			'karma-phantomjs-launcher',
+			'karma-sauce-launcher',
+			'karma-mocha'
+		],
+		mochaReporter: {
+			output: 'noFailures'
+		},
+		sauceLabs: {
+			testName: 'DateTimeFormatTimeZone tests'
+		},
+		frameworks: ['mocha'],
+		customLaunchers: customLaunchers,
+		reporters: [process.env.TRAVIS ? 'dots' : 'progress', 'saucelabs'],
+		logLevel: 'ERROR',
+		colors: true,
+		browserNoActivityTimeout: 100000,
+		port: 9999,
+		singleRun: true,
+		browsers: ['sl_edge', 'sl_ie_11', 'sl_safari']
+	});
+};

src/code/polyfill.js

@@ -39,24 +39,24 @@ export default function polyfill(globalSpace) {
             const timeZone = (options && options.timeZone) || 'UTC';
 
             if (options === undefined) {
-                // options is provided. this means
-                // we dont need  to format a arbitraray timezone
+                // options is not provided. this means
+                // we don't need to format arbitrary timezone
                 super(locale, options);
 
                 return;
             }
 
             if (checkTimeZoneSupport(timeZone)) {
-                // native method has support for timezone. no pollifyll logic needed.
+                // native method has support for timezone. no polyfill logic needed.
                 super(locale, options);
 
                 return;
             }
 
             const timeZoneData = gIntl._timeZoneData.get(timeZone);
 
+            // check if we have timezone data for this timezone
             if (!timeZoneData) {
-                // check if we have timezone data for this timezone
                 throw new RangeError(`invalid time zone in DateTimeFormat():  ${timeZone}`);
             }
 
@@ -70,14 +70,14 @@ export default function polyfill(globalSpace) {
             if (options.timeZoneName !== undefined) {
                 // We need to include timeZoneName in date format.
                 // Check if we have locale data to able to do that.
-                if (!(gIntl._localeData.get(resolvedLocale) && // availlabillity of localedata
-                        Intl._metaZoneData.get(timeZone))) {   // availlabillity of  metaZone for this timeZone
+                if (!(gIntl._localeData.get(resolvedLocale) && // availability of localedata
+                        Intl._metaZoneData.get(timeZone))) {   // availability of metaZone for this timeZone
                     throw new RangeError(`unsupported value "${options.timeZoneName}" for timeZone ${timeZone}. requires locale data for ${resolvedLocale}`);
                 }
             }
 
-            // to minimize pollution. everything we need to perform polyfill is wraped under one object.
-            this._dateTimeFromatPolyfill = {
+            // to minimize pollution everything we need to perform polyfill is wrapped under one object.
+            this._dateTimeFormatPolyfill = {
                 optionTimeZone: timeZone,
                 optionTimeZoneName: options.timeZoneName,
                 timeZoneData: timeZoneData
@@ -92,7 +92,7 @@ export default function polyfill(globalSpace) {
         }
 
         format(date) {
-            if (!this._dateTimeFromatPolyfill) {
+            if (!this._dateTimeFormatPolyfill) {
                 return super.format(date);
             }
 
@@ -104,7 +104,7 @@ export default function polyfill(globalSpace) {
                 date = new Date(date);
             }
 
-            const polyfill = this._dateTimeFromatPolyfill;
+            const polyfill = this._dateTimeFormatPolyfill;
             const timeZoneOffsetInfo = getTimeZoneOffsetInfo(polyfill.timeZoneData, date);
             const timeZoneOffset = timeZoneOffsetInfo.offset * 60000;
             const shiftedDate = new Date(date.getTime() + timeZoneOffset); // We need to  format time by offseting it
@@ -114,7 +114,7 @@ export default function polyfill(globalSpace) {
 
             if (doNeedToReplaceTimeZoneName) {
                 /*
-                    Since our timeshifted native format  will only return UTC timeZone Name e.g. "1/31/2017, 6:39:55 PM GMT"
+                    Since our timeshifted native format will only return UTC timeZone Name e.g. "1/31/2017, 6:39:55 PM GMT"
                     We have to replace GMT that with actual timezone name. like "Pacific Standard Time"
                     This is achived by replacing timeZoneNameUTC with timeZoneName
                 */
@@ -147,11 +147,11 @@ export default function polyfill(globalSpace) {
         }
 
         resolvedOptions() {
-            if (this._dateTimeFromatPolyfill) {
+            if (this._dateTimeFormatPolyfill) {
                 // since we have altered timezone option for super.
                 // we need to correct that before returing.
                 const options = jsonClone(super.resolvedOptions());
-                options.timeZone = this._dateTimeFromatPolyfill.optionTimeZone;
+                options.timeZone = this._dateTimeFormatPolyfill.optionTimeZone;
 
                 return options;
             }
@@ -214,7 +214,7 @@ export default function polyfill(globalSpace) {
         if (options.day === undefined &&
             options.month === undefined &&
             options.year === undefined) {
-            // LocaleDateString must contain one or more from day month & year
+            // LocaleDateString must contain one or more from day, month & year
             // if none is specified we should fallback to to choose day, month and year
             options = jsonClone(options);
             options.day = defaultDateOption.day;

test/test-complete.js

@@ -7,7 +7,7 @@ import polyfill from '../src/code/polyfill.js';
 import dataLoader from '../src/code/data-loader.js';
 import tzdataMoonLanding from './test-data/tzdata-moon-nearside.js';
 import tzdata from '../src/data/tzdata.js';
-import locale from '../src/data/locale.js';
+import localeData from '../src/data/locale.js';
 import metazone from '../src/data/metazone.js';
 
 const isNode = (typeof global !== "undefined" && {}.toString.call(global) === '[object global]');
@@ -18,21 +18,21 @@ dataLoader(myGlobal);  // Functions facilitates data loading
 polyfill(myGlobal);    // Applies polyfill in place
 metazone(myGlobal);    // Data which maps zoneName to cldr metaNames
 tzdata(myGlobal);      // Loads timezone iana data in memory
-locale(myGlobal);      // Loads timezone CLDR data in memory
+localeData(myGlobal);      // Loads timezone CLDR data in memory
 tzdataMoonLanding(myGlobal);
 
 describe('Polyfill with complete package', () => {
 	describe('DateTimeFormat', () => {
 		describe('Instanceof integrity', () => {
 			it('nativedDateTimeFormat  instanceof Intl.DateTimeFormat', () => {
-				const nativedDateTimeFormat = new Intl.DateTimeFormat(locale, {
+				const nativedDateTimeFormat = new Intl.DateTimeFormat('en', {
 					timeZone: 'America/Los_Angeles'
 				});
 				assert.equal(nativedDateTimeFormat instanceof Intl.DateTimeFormat, true);
 			});
 
 			it('polyfilledDateTimeFormat  instanceof Intl.DateTimeFormat', () => {
-				const polyfilledDateTimeFormat = new Intl.DateTimeFormat(locale, {
+				const polyfilledDateTimeFormat = new Intl.DateTimeFormat('en', {
 					timeZone: 'Moon/Nearside'
 				});
 				assert.equal(polyfilledDateTimeFormat instanceof Intl.DateTimeFormat, true);