aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorJulie2014-02-19 21:01:54 -0800
committerJulie2014-02-21 16:57:04 -0800
commit39c82f3fb7a8459304d5e07dc87bd0623ad1efd0 (patch)
treecff2cb48fa3199d40ab292cca9ddf5ee4ef5505e /.travis.yml
parent1293cc88cd3d2e72c55fa8b8d268fab246e79fed (diff)
downloadangular.js-39c82f3fb7a8459304d5e07dc87bd0623ad1efd0.tar.bz2
chore(travis): reorganize protractor configs to group by spec instead of by browser
Use the multiConfiguration ability of Protractor to start tests on multiple browsers from the same travis cell. Group tests by type (jquery, jqlite, or docs tests) instead of by browser. Turn on tests for jQuery.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml9
1 files changed, 3 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index d22001fc..bf081458 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,12 +9,9 @@ branches:
env:
matrix:
- JOB=unit
- - JOB=e2e BROWSER=chrome JQVERSION=jqlite
- - JOB=e2e BROWSER=firefox JQVERSION=jqlite
-# - JOB=e2e BROWSER=safari JQVERSION=jqlite
-# - JOB=e2e BROWSER=chrome JQVERSION=jquery
-# - JOB=e2e BROWSER=firefox JQVERSION=jquery
-# - JOB=e2e BROWSER=safari JQVERSION=jquery
+ - JOB=e2e TEST_TARGET=jqlite
+ - JOB=e2e TEST_TARGET=jquery
+ - JOB=e2e TEST_TARGET=doce2e
global:
- SAUCE_USERNAME=angular-ci
- SAUCE_ACCESS_KEY=9b988f434ff8-fbca-8aa4-4ae3-35442987