0.0.43

ember-cli · Dec 13, 2014 · a84279b · a84279b
1 parent 0e09ae8
commit a84279b
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 17 deletions.
diff --git 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
@@ -13,11 +13,13 @@
     <link rel="stylesheet" href="assets/my-app.css">
   </head>
   <body>
+    <script>
+      window.MyAppENV = {{ENV}};
+      window.EmberENV = window.MyAppENV.EmberENV;
+    </script>
     <script src="assets/vendor.js"></script>
     <script src="assets/my-app.js"></script>
     <script>
-      window.MyAppENV = require('my-app/config/environment')['default'];
-      window.EmberENV = window.MyAppENV.EmberENV;
       window.MyApp = require('my-app/app')['default'].create(MyAppENV.APP);
     </script>
   </body>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -33,14 +33,15 @@
     <div id="qunit"></div>
     <div id="qunit-fixture"></div>
 
+    <script>
+      window.MyAppENV = {{ENV}};
+      window.EmberENV = window.MyAppENV.EmberENV;
+    </script>
     <script src="assets/vendor.js"></script>
     <script src="assets/test-support.js"></script>
     <script src="assets/my-app.js"></script>
     <script src="testem.js"></script>
     <script>
-      window.MyAppENV = require('my-app/config/environment')['default'];
-      window.EmberENV = window.MyAppENV.EmberENV;
-
       require('my-app/tests/test-helper');
     </script>
     <script src="assets/test-loader.js"></script>

diff --git 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);