Merge pull request #554 from jamestalmage/travis-e2e

Run e2e tests in Travis.

Author: Jacob Wenger

package.json

@@ -53,6 +53,7 @@
     "karma-chrome-launcher": "^0.1.7",
     "karma-coverage": "^0.2.7",
     "karma-failed-reporter": "0.0.3",
+    "karma-firefox-launcher": "^0.1.4",
     "karma-html2js-preprocessor": "~0.1.0",
     "karma-jasmine": "^0.3.5",
     "karma-phantomjs-launcher": "~0.1.4",

tests/local_protractor.conf.js

@@ -10,7 +10,7 @@ exports.config = {
   // Capabilities to be passed to the webdriver instance
   // For a full list of available capabilities, see https://code.google.com/p/selenium/wiki/DesiredCapabilities
   capabilities: {
-    'browserName': 'chrome'
+    'browserName': process.env.TRAVIS ? 'firefox' : 'chrome'
   },
 
   // Calls to protractor.get() with relative paths will be prepended with the baseUrl

tests/travis.sh

@@ -2,6 +2,7 @@
 set -e
 grunt build
 grunt test:unit
+grunt test:e2e
 if [ $TRAVIS_TAG ]; then
   grunt sauce:unit;
 fi