Merge pull request #332 from forbesjo/test-e2e-2

Fix grunt-protractor-runner dependency

@@ -222,7 +222,8 @@ module.exports = function(grunt) {
     },
     protractor: {
       options: {
-        configFile: 'test/functional/protractor.config.js'
+        configFile: 'test/functional/protractor.config.js',
+        webdriverManagerUpdate: process.env.TRAVIS ? false : true
       },
 
       chrome: {

@@ -30,7 +30,7 @@
     "grunt-github-releaser": "^0.1.17",
     "grunt-karma": "~0.6.2",
     "grunt-open": "0.2.3",
-    "grunt-protractor-runner": "git+https://github.com/forbesjo/grunt-protractor-runner.git#update-webdriver",
+    "grunt-protractor-runner": "git+https://github.com/forbesjo/grunt-protractor-runner.git#webdriverManagerUpdate",
     "grunt-shell": "0.6.1",
     "grunt-version": "^1.0.0",
     "karma": "~0.10.0",