diff options
| author | Vojta Jina | 2013-10-08 10:03:22 -0700 |
|---|---|---|
| committer | Vojta Jina | 2013-10-08 10:14:03 -0700 |
| commit | 80d2c85e3c04964631e822b57ff1fd1996240074 (patch) | |
| tree | 947ca2a6bdac98b181395abdf6382cfdead21fc2 | |
| parent | 9fd92cc3c93a6378e8887fd46fd4ad182a375544 (diff) | |
| download | angular.js-80d2c85e3c04964631e822b57ff1fd1996240074.tar.bz2 | |
chore(travis): enable Firefox again
This updates karma-sauce-launcher plugin, which fixes the issue we were having (it uses the latest version of wd).
This reverts 1c18c93be138c59b5c1b73cae99cc52383272146
| -rw-r--r-- | package.json | 2 | ||||
| -rwxr-xr-x | travis_build.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index f3ae86a6..34176c6d 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "karma-firefox-launcher": "~0.1.0", "karma-ng-scenario": "~0.1.0", "karma-junit-reporter": "git://github.com/karma-runner/karma-junit-reporter#karma-0.11", - "karma-sauce-launcher": "~0.1.0", + "karma-sauce-launcher": "~0.1.1", "karma-script-launcher": "~0.1.0", "yaml-js": "~0.0.8", "marked": "~0.2.9", diff --git a/travis_build.sh b/travis_build.sh index 05cbc8c9..735bdd2c 100755 --- a/travis_build.sh +++ b/travis_build.sh @@ -5,5 +5,5 @@ set -e export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev` grunt parallel:travis --reporters dots \ - --browsers SL_Chrome,SL_Safari,SL_IE_8,SL_IE_9,SL_IE_10 \ + --browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_8,SL_IE_9,SL_IE_10 \ --e2e-browsers SL_Chrome |