aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Gołębiowski-Owczarek <m.goleb@gmail.com>2019-10-21 19:06:39 +0200
committerMichał Gołębiowski-Owczarek <m.goleb@gmail.com>2019-10-22 20:07:56 +0200
commitad3c2efa10a9d89506f86ef22fe477fd7efad6d5 (patch)
tree023b44e7372d08a37ad7bb6b72d4f95599c4c044
parent57038faebc6ece5bd666c28303f8a91ff59153eb (diff)
downloadjquery-ad3c2efa10a9d89506f86ef22fe477fd7efad6d5.tar.gz
jquery-ad3c2efa10a9d89506f86ef22fe477fd7efad6d5.zip
Build: Run tests on Travis on FirefoxHeadless as well
Also, run them on both ChromeHeadless & FirefoxHeadless locally on `grunt karma:main`. Plus, so far, the chrome addons were installed for all the jobs, even the ones that weren't used for browser testing. Changing that makes those jobs faster. (cherry-picked from 84835e68239ce55d1fc007b284e8ef4ed2817c2)
-rw-r--r--.travis.yml11
-rw-r--r--Gruntfile.js5
2 files changed, 8 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 10cef4a65..97d54454f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,14 +4,17 @@ node_js:
- "8"
- "10"
- "12"
-addons:
- chrome: stable
env:
- NPM_SCRIPT=test:browserless
matrix:
include:
# Run browser tests only on one Node.js version to save time.
- - node_js: "10"
- env: NPM_SCRIPT=test:browser
+ - node_js: "12"
+ env:
+ - NPM_SCRIPT="test:browser"
+ - BROWSERS="ChromeHeadless,FirefoxHeadless"
+ addons:
+ chrome: stable
+ firefox: latest
script:
- npm run $NPM_SCRIPT
diff --git a/Gruntfile.js b/Gruntfile.js
index 8458a6772..35d7f9413 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -14,7 +14,6 @@ module.exports = function( grunt ) {
var fs = require( "fs" ),
gzip = require( "gzip-js" ),
- isTravis = process.env.TRAVIS,
oldNode = /^v6\./.test( process.version );
// Support: Node.js <8
@@ -223,9 +222,7 @@ module.exports = function( grunt ) {
singleRun: true
},
main: {
-
- // The Chrome sandbox doesn't work on Travis.
- browsers: [ isTravis ? "ChromeHeadlessNoSandbox" : "ChromeHeadless" ]
+ browsers: [ "ChromeHeadless", "FirefoxHeadless" ]
},
jsdom: {