diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-23 09:50:44 +0100 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-05-23 09:53:32 +0100 |
commit | 3d5ace273ea78e3387a337df8240ab55075bbf81 (patch) | |
tree | 942a128edc12abe9f32a5ae63619491594a56f21 | |
parent | d71577468cbf54bdd2621fac5f5a62f93193d4ea (diff) | |
download | gitlab-ce-add-supported-browsers-for-karma.tar.gz |
Add all supported browsers for karma and adjust npm scripts to only use phantomjsadd-supported-browsers-for-karma
-rw-r--r-- | config/karma.config.js | 8 | ||||
-rw-r--r-- | package.json | 10 | ||||
-rw-r--r-- | yarn.lock | 41 |
3 files changed, 53 insertions, 6 deletions
diff --git a/config/karma.config.js b/config/karma.config.js index eb082dd28bf..5005fdacca3 100644 --- a/config/karma.config.js +++ b/config/karma.config.js @@ -19,7 +19,13 @@ module.exports = function(config) { var karmaConfig = { basePath: ROOT_PATH, - browsers: ['PhantomJS'], + browsers: [ + 'PhantomJS', + 'Chrome', + 'Firefox', + 'IE', + 'Edge', + ], frameworks: ['jasmine'], files: [ { pattern: 'spec/javascripts/test_bundle.js', watched: false }, diff --git a/package.json b/package.json index 800327d8a08..bc8a31e1c03 100644 --- a/package.json +++ b/package.json @@ -5,9 +5,9 @@ "eslint": "eslint --max-warnings 0 --ext .js,.vue .", "eslint-fix": "eslint --max-warnings 0 --ext .js,.vue --fix .", "eslint-report": "eslint --max-warnings 0 --ext .js,.vue --format html --output-file ./eslint-report.html .", - "karma": "karma start config/karma.config.js --single-run", - "karma-coverage": "BABEL_ENV=coverage karma start config/karma.config.js --single-run", - "karma-start": "karma start config/karma.config.js", + "karma": "karma start config/karma.config.js --single-run --browsers PhantomJS", + "karma-coverage": "BABEL_ENV=coverage karma start config/karma.config.js --single-run --browsers PhantomJS", + "karma-start": "karma start config/karma.config.js --browsers PhantomJS", "webpack": "webpack --config config/webpack.config.js", "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js" }, @@ -73,7 +73,11 @@ "jasmine-core": "^2.5.2", "jasmine-jquery": "^2.1.1", "karma": "^1.4.1", + "karma-chrome-launcher": "^2.1.1", "karma-coverage-istanbul-reporter": "^0.2.0", + "karma-edge-launcher": "^0.4.1", + "karma-firefox-launcher": "^1.0.1", + "karma-ie-launcher": "^1.0.0", "karma-jasmine": "^1.1.0", "karma-mocha-reporter": "^2.2.2", "karma-phantomjs-launcher": "^1.0.2", diff --git a/yarn.lock b/yarn.lock index 8aac2b1b1cd..c6456460670 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1720,6 +1720,10 @@ ecc-jsbn@~0.1.1: dependencies: jsbn "~0.1.0" +edge-launcher@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/edge-launcher/-/edge-launcher-1.2.2.tgz#eb40aafbd067a6ea76efffab0647bcd5509b37b2" + editorconfig@^0.13.2: version "0.13.2" resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.13.2.tgz#8e57926d9ee69ab6cb999f027c2171467acceb35" @@ -2393,6 +2397,12 @@ from@~0: version "0.1.7" resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" +fs-access@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a" + dependencies: + null-check "^1.0.0" + fs-extra@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950" @@ -3238,12 +3248,35 @@ jszip@^3.1.3: pako "~1.0.2" readable-stream "~2.0.6" +karma-chrome-launcher@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.1.1.tgz#216879c68ac04d8d5140e99619ba04b59afd46cf" + dependencies: + fs-access "^1.0.0" + which "^1.2.1" + karma-coverage-istanbul-reporter@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-0.2.0.tgz#5766263338adeb0026f7e4ac7a89a5f056c5642c" dependencies: istanbul-api "^1.1.1" +karma-edge-launcher@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/karma-edge-launcher/-/karma-edge-launcher-0.4.1.tgz#b04eb96b8cf6004eba0b0fed294b51da9360e244" + dependencies: + edge-launcher "1.2.2" + +karma-firefox-launcher@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/karma-firefox-launcher/-/karma-firefox-launcher-1.0.1.tgz#ce58f47c2013a88156d55a5d61337c099cf5bb51" + +karma-ie-launcher@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/karma-ie-launcher/-/karma-ie-launcher-1.0.0.tgz#497986842c490190346cd89f5494ca9830c6d59c" + dependencies: + lodash "^4.6.1" + karma-jasmine@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.0.tgz#22e4c06bf9a182e5294d1f705e3733811b810acf" @@ -3533,7 +3566,7 @@ lodash@^3.8.0: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.0.0, lodash@^4.0.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0: +lodash@^4.0.0, lodash@^4.0.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.6.1: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -3866,6 +3899,10 @@ npmlog@^4.0.1: gauge "~2.7.1" set-blocking "~2.0.0" +null-check@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd" + num2fraction@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" @@ -5832,7 +5869,7 @@ which-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" -which@^1.1.1, which@~1.2.10: +which@^1.1.1, which@^1.2.1, which@~1.2.10: version "1.2.12" resolved "https://registry.yarnpkg.com/which/-/which-1.2.12.tgz#de67b5e450269f194909ef23ece4ebe416fa1192" dependencies: |