@samitouri / QOS-React-2 / commits / 49eb84efdd

Run jest with grunt, add to travis

This is to make sure we don't end up with differences in our different testing methods. We may switch out the failure allowances later (maybe just jest will be good enough and we can let phantom fail for a little bit).

Paul O’Shannessy committed Jan 27, 2015 at 17:59 UTC 49eb84efdd86ed1a54cda7ff506cb7d8d57a681e
2 files changed +3 -1
.travis.yml
+1
@@ -41,6 +41,7 @@ after_script:
41 env:
42 matrix:
43 - TEST_TYPE=test
44 + - TEST_TYPE=jest
45 - TEST_TYPE=lint
46 - TEST_TYPE=test:webdriver:saucelabs:modern
47 global:
package.json
+2 -1
@@ -48,6 +48,7 @@
48 "grunt-contrib-connect": "~0.6.0",
49 "grunt-contrib-copy": "^0.7.0",
50 "grunt-contrib-jshint": "^0.10.0",
51 + "grunt-jest": "^0.1.2",
52 "gzip-js": "~0.3.2",
53 "jasmine-tapreporter": "~0.2.2",
54 "jest-cli": "^0.2.1",
@@ -58,8 +59,8 @@
59 "populist": "~0.1.6",
60 "recast": "^0.9.11",
61 "sauce-tunnel": "~1.1.0",
61 - "ts-compiler": "^2.0.0",
62 "tmp": "~0.0.18",
63 + "ts-compiler": "^2.0.0",
64 "uglify-js": "~2.4.0",
65 "uglifyify": "^2.4.0",
66 "wd": "~0.2.6"