diff --git a/.travis.yml b/.travis.yml index cce5c682a8..25b863926a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js node_js: - - "0.10" + - "5.1.0" before_script: - export DISPLAY=:99.0 diff --git a/bower.json b/bower.json index 5234f47856..9b7822f6c9 100644 --- a/bower.json +++ b/bower.json @@ -6,10 +6,10 @@ "license": "MIT", "private": true, "dependencies": { - "angular": "~1.4.0", - "angular-route": "~1.4.0", - "angular-loader": "~1.4.0", - "angular-mocks": "~1.4.0", + "angular": "~1.4.8", + "angular-route": "~1.4.8", + "angular-loader": "~1.4.8", + "angular-mocks": "~1.4.8", "html5-boilerplate": "~5.2.0" } } diff --git a/e2e-tests/protractor.conf.js b/e2e-tests/protractor.conf.js index b45a117aa5..5a4d906c23 100644 --- a/e2e-tests/protractor.conf.js +++ b/e2e-tests/protractor.conf.js @@ -1,4 +1,7 @@ exports.config = { + + directConnect: true, + allScriptsTimeout: 11000, specs: [ diff --git a/package.json b/package.json index d0edbc8b61..74f2e01ba6 100644 --- a/package.json +++ b/package.json @@ -6,16 +6,16 @@ "repository": "https://github.com/angular/angular-seed", "license": "MIT", "devDependencies": { - "bower": "^1.3.1", - "http-server": "^0.6.1", + "bower": "^1.6.5", + "http-server": "^0.8.5", "jasmine-core": "^2.3.4", - "karma": "~0.12", - "karma-chrome-launcher": "^0.1.12", - "karma-firefox-launcher": "^0.1.6", - "karma-jasmine": "^0.3.5", - "karma-junit-reporter": "^0.2.2", - "protractor": "^2.1.0", - "shelljs": "^0.2.6" + "karma": "~0.13", + "karma-chrome-launcher": "^0.2.1", + "karma-firefox-launcher": "^0.1.7", + "karma-jasmine": "^0.3.6", + "karma-junit-reporter": "^0.3.8", + "protractor": "^3.0.0", + "shelljs": "^0.5.3" }, "scripts": { "postinstall": "bower install",