Skip to content
This repository was archived by the owner on Mar 17, 2025. It is now read-only.

Commit 74e8506

Browse files
author
Jacob Wenger
authored
Actually run the Travis tests and upgrade dependencies (#891)
1 parent 32cdf6d commit 74e8506

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ install:
1515
- npm install
1616
before_script:
1717
- grunt install
18-
- phantomjs --version
18+
script:
19+
- sh ./tests/travis.sh
1920
after_script:
2021
- cat ./tests/coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
2122
env:

package.json

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,30 +37,29 @@
3737
"angular": "^1.3.0",
3838
"angular-mocks": "^1.6.0",
3939
"coveralls": "^2.11.2",
40-
"grunt": "~0.4.5",
41-
"grunt-cli": "^0.1.13",
42-
"grunt-contrib-concat": "^0.5.0",
43-
"grunt-contrib-connect": "^0.9.0",
40+
"grunt": "^1.0.1",
41+
"grunt-cli": "^1.2.0",
42+
"grunt-contrib-concat": "^1.0.1",
43+
"grunt-contrib-connect": "^1.0.2",
4444
"grunt-contrib-jshint": "^0.11.0",
45-
"grunt-contrib-uglify": "^0.7.0",
46-
"grunt-contrib-watch": "^0.6.1",
47-
"grunt-karma": "^0.10.1",
45+
"grunt-contrib-uglify": "^2.0.0",
46+
"grunt-contrib-watch": "^1.0.0",
47+
"grunt-karma": "^2.0.0",
4848
"grunt-notify": "^0.4.1",
49-
"grunt-protractor-runner": "^1.2.1",
49+
"grunt-protractor-runner": "^4.0.0",
5050
"grunt-shell-spawn": "^0.3.1",
5151
"jasmine-core": "^2.2.0",
5252
"jasmine-spec-reporter": "^2.1.0",
53-
"karma": "~0.12.31",
54-
"karma-chrome-launcher": "^0.2.2",
55-
"karma-coverage": "^0.2.7",
53+
"karma": "^1.3.0",
54+
"karma-chrome-launcher": "^2.0.0",
55+
"karma-coverage": "^1.1.1",
5656
"karma-failed-reporter": "0.0.3",
57-
"karma-firefox-launcher": "^0.1.4",
58-
"karma-html2js-preprocessor": "~0.1.0",
59-
"karma-jasmine": "^0.3.5",
60-
"karma-phantomjs-launcher": "~0.1.4",
61-
"karma-sauce-launcher": "~0.2.10",
62-
"karma-spec-reporter": "0.0.16",
57+
"karma-firefox-launcher": "^1.0.0",
58+
"karma-html2js-preprocessor": "^1.1.0",
59+
"karma-jasmine": "^1.1.0",
60+
"karma-sauce-launcher": "^1.1.0",
61+
"karma-spec-reporter": "^0.0.26",
6362
"load-grunt-tasks": "^3.1.0",
64-
"protractor": "^1.6.1"
63+
"protractor": "^4.0.13"
6564
}
6665
}

0 commit comments

Comments
 (0)