Merge pull request #120 from gnarf/testem

add testem commands for watch

.travis.yml

@@ -1,6 +1,10 @@
 sudo: false
 language: node_js
 
+before_install:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+
 install:
   - npm install
   - bower install

package.json

@@ -28,7 +28,6 @@
     "postinstall": "bower install",
     "build": "rm -rf build && BROCCOLI_ENV=test broccoli build build",
     "prepublish": "bower install",
-    "pretest": "npm run build",
     "test": "testem ci",
     "start": "BROCCOLI_ENV=test broccoli serve"
   },
@@ -43,6 +42,6 @@
     "broccoli-sourcemap-concat": "^0.4.3",
     "broccoli-string-replace": "0.0.2",
     "git-repo-version": "^0.1.1",
-    "testem": "0.6.38"
+    "testem": "^0.7.6"
   }
 }

testem.json

@@ -1,12 +1,12 @@
 {
   "framework": "qunit",
-  "cwd": "build/",
+  "before_tests": "npm run build",
+  "src_files": ["lib/**/*.js", "test/**/*.js"],
   "serve_files": [
-    "assets/loader.js",
-    "assets/vendor.js",
-    "assets/tests.amd.js",
-    "assets/test-support.js"
+    "build/assets/loader.js",
+    "build/assets/vendor.js",
+    "build/assets/tests.amd.js",
+    "build/assets/test-support.js"
   ],
-  "launch_in_ci": ["PhantomJS"],
-  "launch_in_dev": ["PhantomJS", "Chrome"]
+  "launch_in_ci": ["Firefox"]
 }