0.0.42

ember-cli · Jan 25, 2015 · e716909 · e716909
1 parent 91409a1
commit e716909
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -0,0 +1,3 @@
+{
+  "directory": "bower_components"
+}
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "body-parser": "^1.2.0",
     "broccoli-asset-rev": "0.0.17",
     "broccoli-ember-hbs-template-compiler": "^1.6.1",
-    "ember-cli": "0.0.41",
+    "ember-cli": "0.0.42",
     "ember-cli-ember-data": "0.1.0",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-qunit": "0.0.5",

diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html
@@ -13,13 +13,11 @@
     <link rel="stylesheet" href="assets/dummy.css">
   </head>
   <body>
-    <script>
-      window.DummyENV = {{ENV}};
-      window.EmberENV = window.DummyENV.EmberENV;
-    </script>
     <script src="assets/vendor.js"></script>
     <script src="assets/dummy.js"></script>
     <script>
+      window.DummyENV = require('dummy/config/environment')['default'];
+      window.EmberENV = window.DummyENV.EmberENV;
       window.Dummy = require('dummy/app')['default'].create(DummyENV.APP);
     </script>
   </body>

diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
@@ -27,7 +27,7 @@ module.exports = function(environment) {
   }
 
   if (environment === 'test') {
-
+    ENV.baseURL = '/'; // Testem prefers this...
   }
 
   if (environment === 'production') {

diff --git a/tests/index.html b/tests/index.html
@@ -33,15 +33,14 @@
     <div id="qunit"></div>
     <div id="qunit-fixture"></div>
 
-    <script>
-      window.DummyENV = {{ENV}};
-      window.EmberENV = window.DummyENV.EmberENV;
-    </script>
     <script src="assets/vendor.js"></script>
     <script src="assets/test-support.js"></script>
     <script src="assets/dummy.js"></script>
     <script src="testem.js"></script>
     <script>
+      window.DummyENV = require('dummy/config/environment')['default'];
+      window.EmberENV = window.DummyENV.EmberENV;
+
       require('dummy/tests/test-helper');
     </script>
     <script src="assets/test-loader.js"></script>