Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

Update to protractor and Angular versions #308

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- "0.10"
- "5.1.0"

before_script:
- export DISPLAY=:99.0
Expand Down
8 changes: 4 additions & 4 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
3 changes: 3 additions & 0 deletions e2e-tests/protractor.conf.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
exports.config = {

directConnect: true,

allScriptsTimeout: 11000,

specs: [
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down