diff --git a/.bowerrc b/.bowerrc
index 69fad35..959e169 100644
--- a/.bowerrc
+++ b/.bowerrc
@@ -1,3 +1,4 @@
{
- "directory": "bower_components"
+ "directory": "bower_components",
+ "analytics": false
}
diff --git a/app/index.html b/app/index.html
index aaa2666..1df1d88 100644
--- a/app/index.html
+++ b/app/index.html
@@ -13,11 +13,13 @@
+
diff --git a/bower.json b/bower.json
index 4bdf268..5d1fde2 100644
--- a/bower.json
+++ b/bower.json
@@ -8,6 +8,9 @@
"loader": "stefanpenner/loader.js#1.0.1",
"ember-cli-shims": "stefanpenner/ember-cli-shims#0.0.3",
"ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.0.4",
- "ember-load-initializers": "stefanpenner/ember-load-initializers#0.0.2"
+ "ember-load-initializers": "stefanpenner/ember-load-initializers#0.0.2",
+ "ember-qunit": "0.1.8",
+ "ember-qunit-notifications": "0.0.4",
+ "qunit": "~1.15.0"
}
}
diff --git a/package.json b/package.json
index 7314898..828a29b 100644
--- a/package.json
+++ b/package.json
@@ -21,11 +21,11 @@
"body-parser": "^1.2.0",
"broccoli-asset-rev": "0.0.17",
"broccoli-ember-hbs-template-compiler": "^1.6.1",
- "ember-cli": "0.0.42",
+ "ember-cli": "0.0.43",
"ember-cli-ember-data": "0.1.0",
- "ember-cli-inject-live-reload": "^1.0.2",
"ember-cli-ic-ajax": "0.1.1",
- "ember-cli-qunit": "0.0.5",
+ "ember-cli-inject-live-reload": "^1.0.2",
+ "ember-cli-qunit": "0.1.0",
"express": "^4.8.5",
"glob": "^4.0.5"
}
diff --git a/testem.json b/testem.json
index bbcd347..eff93f9 100644
--- a/testem.json
+++ b/testem.json
@@ -1,6 +1,11 @@
{
"framework": "qunit",
"test_page": "tests/index.html",
- "launch_in_ci": ["PhantomJS"],
- "launch_in_dev": ["PhantomJS", "Chrome"]
+ "launch_in_ci": [
+ "PhantomJS"
+ ],
+ "launch_in_dev": [
+ "PhantomJS",
+ "Chrome"
+ ]
}
diff --git a/tests/.jshintrc b/tests/.jshintrc
index e1892e0..95db7f3 100644
--- a/tests/.jshintrc
+++ b/tests/.jshintrc
@@ -34,6 +34,7 @@
"fillIn",
"click",
"keyEvent",
+ "triggerEvent",
"find",
"findWithAssert",
"wait",
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
index f1848c3..96baf51 100644
--- a/tests/helpers/start-app.js
+++ b/tests/helpers/start-app.js
@@ -1,8 +1,6 @@
-/* global require */
-
-var Application = require('my-app/app')['default'];
-var Router = require('my-app/router')['default'];
import Ember from 'ember';
+import Application from 'my-app/app';
+import Router from 'my-app/router';
export default function startApp(attrs) {
var App;
diff --git a/tests/index.html b/tests/index.html
index e837e1e..d376505 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -33,14 +33,15 @@
+
diff --git a/tests/test-helper.js b/tests/test-helper.js
index a8835c0..f77e5a2 100644
--- a/tests/test-helper.js
+++ b/tests/test-helper.js
@@ -1,5 +1,7 @@
import resolver from './helpers/resolver';
-import { setResolver } from 'ember-qunit';
+import {
+ setResolver
+} from 'ember-qunit';
setResolver(resolver);