From 49eb84efdd86ed1a54cda7ff506cb7d8d57a681e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= <paul@oshannessy.com>
Date: Tue, 27 Jan 2015 17:59:05 -0800
Subject: [PATCH] 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).
---
 .travis.yml  | 1 +
 package.json | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index da1c09e7ae..8fab1828c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,6 +41,7 @@ after_script:
 env:
   matrix:
   - TEST_TYPE=test
+  - TEST_TYPE=jest
   - TEST_TYPE=lint
   - TEST_TYPE=test:webdriver:saucelabs:modern
   global:
diff --git a/package.json b/package.json
index 917c1dc51b..048df10fef 100644
--- a/package.json
+++ b/package.json
@@ -48,6 +48,7 @@
     "grunt-contrib-connect": "~0.6.0",
     "grunt-contrib-copy": "^0.7.0",
     "grunt-contrib-jshint": "^0.10.0",
+    "grunt-jest": "^0.1.2",
     "gzip-js": "~0.3.2",
     "jasmine-tapreporter": "~0.2.2",
     "jest-cli": "^0.2.1",
@@ -58,8 +59,8 @@
     "populist": "~0.1.6",
     "recast": "^0.9.11",
     "sauce-tunnel": "~1.1.0",
-    "ts-compiler": "^2.0.0",
     "tmp": "~0.0.18",
+    "ts-compiler": "^2.0.0",
     "uglify-js": "~2.4.0",
     "uglifyify": "^2.4.0",
     "wd": "~0.2.6"