diff --git a/.travis.yml b/.travis.yml index f4a11bab3613..b4d1922004cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,5 +22,10 @@ script: - gulp build - gulp dist - gulp presubmit + # Unit tests with Travis' default chromium - gulp test + # Integration tests with all saucelabs browsers - gulp test --saucelabs --integration + # All unit tests with an old chrome (best we can do right now to pass tests + # and not start relying on new features). + - gulp test --saucelabs --oldchrome diff --git a/build-system/tasks/test.js b/build-system/tasks/test.js index 9d6664266267..ed973b1df1dd 100644 --- a/build-system/tasks/test.js +++ b/build-system/tasks/test.js @@ -42,7 +42,10 @@ function getConfig() { if (!process.env.SAUCE_ACCESS_KEY) { throw new Error('Missing SAUCE_ACCESS_KEY Env variable'); } - return extend(obj, karmaConfig.saucelabs); + const c = extend(obj, karmaConfig.saucelabs); + if (argv.oldchrome) { + c.browsers = ['SL_Chrome_37'] + } } return extend(obj, karmaConfig.default); @@ -89,6 +92,7 @@ gulp.task('test', 'Runs tests in chrome', ['build'], function(done) { 'saucelabs': ' Runs test on saucelabs (requires setup)', 'safari': ' Runs tests in Safari', 'firefox': ' Runs tests in Firefox', - 'integration': 'Run only integration tests.' + 'integration': 'Run only integration tests.', + 'oldchrome': 'Runs test with an old chrome. Saucelabs only.', } });