From 5f270a56a40ec64e3868e80ecb4900992ed57869 Mon Sep 17 00:00:00 2001 From: ishita12 <30434843+ishita12@users.noreply.github.com> Date: Tue, 23 Jan 2018 15:54:57 -0500 Subject: [PATCH] ChromeCanary Support --- .travis.yml | 2 +- package-lock.json | 84 +++++++++++------------ test/karma.conf.js | 165 +++++++++++++++++++++------------------------ 3 files changed, 120 insertions(+), 131 deletions(-) diff --git a/.travis.yml b/.travis.yml index b0e93f7cf..6776e444a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,4 @@ sudo: required dist: trusty language: node_js addons: - chrome: stable + chrome: stable diff --git a/package-lock.json b/package-lock.json index ce1369a8d..aeaef9f6e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,22 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "Base64": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz", + "integrity": "sha1-ujpCMHCOGGcFBl5mur3Uw1z2ACg=", + "dev": true + }, + "JSONStream": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz", + "integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=", + "dev": true, + "requires": { + "jsonparse": "1.3.1", + "through": "2.3.8" + } + }, "abbrev": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", @@ -776,12 +792,6 @@ "strip-bom": "2.0.0" } }, - "Base64": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz", - "integrity": "sha1-ujpCMHCOGGcFBl5mur3Uw1z2ACg=", - "dev": true - }, "base64-arraybuffer": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", @@ -954,9 +964,9 @@ "integrity": "sha1-QZdxmyDG4KqglFHFER5T77b7wY0=", "dev": true, "requires": { + "JSONStream": "1.3.1", "combine-source-map": "0.6.1", "defined": "1.0.0", - "JSONStream": "1.3.1", "through2": "1.1.1", "umd": "3.0.1" } @@ -1009,6 +1019,7 @@ "integrity": "sha1-oRu53SCdeVcrgT9+7q+Cil9cDk4=", "dev": true, "requires": { + "JSONStream": "1.3.1", "assert": "1.3.0", "browser-pack": "5.0.1", "browser-resolve": "1.11.2", @@ -1032,7 +1043,6 @@ "inherits": "2.0.3", "insert-module-globals": "6.6.3", "isarray": "0.0.1", - "JSONStream": "1.3.1", "labeled-stream-splicer": "1.0.2", "module-deps": "3.9.1", "os-browserify": "0.1.2", @@ -4188,14 +4198,6 @@ } } }, - "string_decoder": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.0.1" - } - }, "string-width": { "version": "1.0.2", "bundled": true, @@ -4206,6 +4208,14 @@ "strip-ansi": "3.0.1" } }, + "string_decoder": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "requires": { + "safe-buffer": "5.0.1" + } + }, "stringstream": { "version": "0.0.5", "bundled": true, @@ -4884,10 +4894,10 @@ "integrity": "sha1-IGOOKaMPntHKLjqCX7wsulJG3fw=", "dev": true, "requires": { + "JSONStream": "1.3.1", "combine-source-map": "0.6.1", "concat-stream": "1.4.10", "is-buffer": "1.1.6", - "JSONStream": "1.3.1", "lexical-scope": "1.2.0", "process": "0.11.10", "through2": "1.1.1", @@ -5519,16 +5529,6 @@ "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=", "dev": true }, - "JSONStream": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz", - "integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=", - "dev": true, - "requires": { - "jsonparse": "1.3.1", - "through": "2.3.8" - } - }, "karma": { "version": "1.7.1", "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz", @@ -5632,6 +5632,7 @@ "integrity": "sha1-9qGNTWqzERP5/fg/ED+gFyioIGo=", "dev": true, "requires": { + "JSONStream": "1.3.1", "assert": "1.3.0", "browser-pack": "5.0.1", "browser-resolve": "1.11.2", @@ -5657,7 +5658,6 @@ "inherits": "2.0.3", "insert-module-globals": "6.6.3", "isarray": "0.0.1", - "JSONStream": "1.3.1", "labeled-stream-splicer": "1.0.2", "module-deps": "3.9.1", "os-browserify": "0.1.2", @@ -6610,13 +6610,13 @@ "integrity": "sha1-6nXK+RmQkNJbDVUStaysuW5/h/M=", "dev": true, "requires": { + "JSONStream": "1.3.1", "browser-resolve": "1.11.2", "concat-stream": "1.4.10", "defined": "1.0.0", "detective": "4.5.0", "duplexer2": "0.0.2", "inherits": "2.0.3", - "JSONStream": "1.3.1", "parents": "1.0.1", "readable-stream": "1.1.14", "resolve": "1.5.0", @@ -8697,15 +8697,6 @@ } } }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", @@ -8744,6 +8735,15 @@ "function-bind": "1.1.1" } }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, "stringmap": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz", @@ -9612,9 +9612,9 @@ "integrity": "sha1-+GzWzvT1MAyOY+B6TVEvZfv/RTE=", "dev": true, "requires": { + "JSONStream": "1.3.1", "combine-source-map": "0.7.2", "defined": "1.0.0", - "JSONStream": "1.3.1", "through2": "2.0.3", "umd": "3.0.1" } @@ -9625,6 +9625,7 @@ "integrity": "sha512-gKfOsNQv/toWz+60nSPfYzuwSEdzvV2WdxrVPUbPD/qui44rAkB3t3muNtmmGYHqrG56FGwX9SUEQmzNLAeS7g==", "dev": true, "requires": { + "JSONStream": "1.3.1", "assert": "1.4.1", "browser-pack": "6.0.2", "browser-resolve": "1.11.2", @@ -9646,7 +9647,6 @@ "https-browserify": "1.0.0", "inherits": "2.0.3", "insert-module-globals": "7.0.1", - "JSONStream": "1.3.1", "labeled-stream-splicer": "2.0.0", "module-deps": "4.1.1", "os-browserify": "0.3.0", @@ -9818,10 +9818,10 @@ "integrity": "sha1-wDv04BywhtW15azorQr+eInWOMM=", "dev": true, "requires": { + "JSONStream": "1.3.1", "combine-source-map": "0.7.2", "concat-stream": "1.5.2", "is-buffer": "1.1.6", - "JSONStream": "1.3.1", "lexical-scope": "1.2.0", "process": "0.11.10", "through2": "2.0.3", @@ -9862,6 +9862,7 @@ "integrity": "sha1-IyFYM/HaE/1gbMuAh7RIUty4If0=", "dev": true, "requires": { + "JSONStream": "1.3.1", "browser-resolve": "1.11.2", "cached-path-relative": "1.0.1", "concat-stream": "1.5.2", @@ -9869,7 +9870,6 @@ "detective": "4.5.0", "duplexer2": "0.1.4", "inherits": "2.0.3", - "JSONStream": "1.3.1", "parents": "1.0.1", "readable-stream": "2.3.3", "resolve": "1.5.0", diff --git a/test/karma.conf.js b/test/karma.conf.js index 120bbf6bc..bb7726061 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -8,106 +8,95 @@ module.exports = function(config) { usePhantomJS: false, postDetection: function(availableBrowsers) { var safariIndex = availableBrowsers.indexOf('Safari'); - // var firfoxIndex = availableBrowsers.indexOf('Firefox'); - //var chromeIndex = availableBrowsers.indexOf('Chrome'); if(safariIndex !== -1) { availableBrowsers.splice(safariIndex, 1); console.log("Disabled Safari as it was/is not supported"); } - /* if(firfoxIndex !== -1) { - availableBrowsers.splice(firfoxIndex, 1); - console.log("Disabled Firefox as it was/is not supported"); + return availableBrowsers; } - if(chromeIndex !== -1) { - availableBrowsers.splice(chromeIndex, 1); - console.log("Disabled Chrome as it was/is not supported"); - } - */ - return availableBrowsers; -} -}; + }; -if (process.env.TRAVIS) { - config.browsers = ['ChromeHeadlessNoSandbox','Chrome_Canary']; -} + if (process.env.TRAVIS) { + config.browsers = ['ChromeHeadlessNoSandbox','ChromeCanaryHeadlessNoSandbox']; + } -// If no browsers are specified, we enable `karma-detect-browsers` -// this will detect all browsers that are available for testing -if (!config.browsers.length) { - detectBrowsers.enabled = true; -} + // If no browsers are specified, we enable `karma-detect-browsers` + // this will detect all browsers that are available for testing + if (!config.browsers.length) { + detectBrowsers.enabled = true; + } -config.set({ - basePath: '..', - frameworks: ['qunit', 'browserify', 'detectBrowsers'], - files: [ - 'node_modules/sinon/pkg/sinon.js', - 'node_modules/sinon/pkg/sinon-ie.js', - 'node_modules/video.js/dist/video.js', - 'node_modules/video.js/dist/video-js.css', - 'node_modules/videojs-flash/dist/videojs-flash.js', - 'dist-test/browserify-test.js', - 'dist-test/webpack-test.js', - 'dist-test/videojs-http-streaming.js' - ], - browserConsoleLogOptions: { - level: 'error', - terminal: false - }, - customLaunchers: { - ChromeHeadlessNoSandbox: { - base: 'ChromeHeadless', - flags: ['--no-sandbox'] - }, - Chrome_Canary: { - base: 'ChromeCanaryHeadless', - flags: ['--no-sandbox','--autoplay-policy=no-user-gesture-required'], - } - }, - preprocessors: { - 'test/**/*.test.js': ['browserify'] - }, - browserify: { - debug: true, - transform: [ - 'babelify', - ['browserify-shim', { global: true }] + config.set({ + basePath: '..', + frameworks: ['qunit', 'browserify', 'detectBrowsers'], + files: [ + 'node_modules/sinon/pkg/sinon.js', + 'node_modules/sinon/pkg/sinon-ie.js', + 'node_modules/video.js/dist/video.js', + 'node_modules/video.js/dist/video-js.css', + 'node_modules/videojs-flash/dist/videojs-flash.js', + 'dist-test/browserify-test.js', + 'dist-test/webpack-test.js', + 'dist-test/videojs-http-streaming.js' ], - noParse: [ - 'test/data/**', - ] - }, - babelPreprocessor: { - options: { - presets: ['es2015'], - sourceMap: 'inline' + browserConsoleLogOptions: { + level: 'error', + terminal: false }, - sourceFileName: function (file) { - return file.originalPath; - } - }, - detectBrowsers: detectBrowsers, - reporters: ['dots'], - port: 9876, - colors: true, - autoWatch: false, - singleRun: true, - concurrency: Infinity -}); + customLaunchers: { + ChromeHeadlessNoSandbox: { + base: 'ChromeHeadless', + flags: ['--no-sandbox'] + }, + ChromeCanaryHeadlessNoSandbox: { + base: 'ChromeCanaryHeadless', + flags: ['--no-sandbox','--autoplay-policy=no-user-gesture-required'], + } + }, + preprocessors: { + 'test/**/*.test.js': ['browserify'] + }, + browserify: { + debug: true, + transform: [ + 'babelify', + ['browserify-shim', { global: true }] + ], + noParse: [ + 'test/data/**', + ] + }, + babelPreprocessor: { + options: { + presets: ['es2015'], + sourceMap: 'inline' + }, + sourceFileName: function (file) { + return file.originalPath; + } + }, + detectBrowsers: detectBrowsers, + reporters: ['dots'], + port: 9876, + colors: true, + autoWatch: false, + singleRun: true, + concurrency: Infinity + }); -// Coverage reporting -// Coverage is enabled by passing the flag --coverage to npm test -var coverageFlag = process.env.npm_config_coverage; -var reportCoverage = process.env.TRAVIS || coverageFlag; + // Coverage reporting + // Coverage is enabled by passing the flag --coverage to npm test + var coverageFlag = process.env.npm_config_coverage; + var reportCoverage = process.env.TRAVIS || coverageFlag; -if (reportCoverage) { - config.reporters.push('coverage'); - config.browserify.transform.push(istanbul({ - instrumenter: isparta, - ignore: ['**/node_modules/**', '**/test/**'] - })); - config.preprocessors['src/**/*.js'] = ['browserify', 'coverage']; -} + if (reportCoverage) { + config.reporters.push('coverage'); + config.browserify.transform.push(istanbul({ + instrumenter: isparta, + ignore: ['**/node_modules/**', '**/test/**'] + })); + config.preprocessors['src/**/*.js'] = ['browserify', 'coverage']; + } };