Merge pull request #106 from notmessenger/EmberCLI

Closes #77
softlayer · Dec 7, 2014 · 323b477 · 323b477
2 parents fa268fd + 4c70589
commit 323b477
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/.ember-cli b/.ember-cli
@@ -5,5 +5,5 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": true
+  "disableAnalytics": false
 }
diff --git a/Brocfile.js b/Brocfile.js
@@ -1,3 +1,4 @@
+/* jshint node: true */
 /* global require, module, process */
 
 var EmberAddon = require('ember-cli/lib/broccoli/ember-addon'),

diff --git a/package.json b/package.json
@@ -44,9 +44,9 @@
     "broccoli-static-compiler": "^0.2.1"
   },
   "devDependencies": {
-    "broccoli-asset-rev": "1.0.0",
+    "broccoli-asset-rev": "^1.0.0",
     "broccoli-ember-hbs-template-compiler": "^1.6.1",
-    "ember-cli": "^0.1.3",
+    "ember-cli": "0.1.4",
     "ember-cli-dependency-checker": "0.0.6",
     "ember-cli-esnext": "0.1.1",
     "ember-cli-ic-ajax": "0.1.1",

diff --git a/tests/dummy/app/index.html b/tests/dummy/app/index.html
@@ -11,11 +11,15 @@
 
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/sl-ember-components.css">
+
+    {{content-for 'head-footer'}}
   </head>
   <body>
     {{content-for 'body'}}
 
     <script src="assets/vendor.js"></script>
     <script src="assets/dummy.js"></script>
+
+    {{content-for 'body-footer'}}
   </body>
 </html>
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
@@ -33,7 +33,7 @@ module.exports = function(environment) {
     if (environment === 'test') {
         // Testem prefers this...
         ENV.baseURL = '/';
-        ENV.locationType = 'auto';
+        ENV.locationType = 'none';
 
         // keep test console output quieter
         ENV.APP.LOG_ACTIVE_GENERATION = false;

diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -10,18 +10,12 @@ export default function startApp(attrs) {
   var attributes = Ember.merge({}, config.APP);
   attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 
-  Router.reopen({
-    location: 'none'
-  });
-
   Ember.run(function() {
     App = Application.create(attributes);
     App.setupForTesting();
     slregisterTestHelpers();
     App.injectTestHelpers();
   });
 
-  App.reset(); // this shouldn't be needed, i want to be able to "start an app at a specific URL"
-
   return App;
 }
diff --git a/tests/index.html b/tests/index.html
@@ -30,6 +30,9 @@
         zoom: 50%;
       }
     </style>
+
+    {{content-for 'head-footer'}}
+    {{content-for 'test-head-footer'}}
   </head>
   <body>
 
@@ -38,9 +41,10 @@
     <script src="assets/vendor.js"></script>
     <script src="assets/test-support.js"></script>
     <script src="assets/dummy.js"></script>
-    <script src="assets/sinon.js"></script>
-    <script src="assets/sinon-qunit.js"></script>
     <script src="testem.js"></script>
     <script src="assets/test-loader.js"></script>
+
+    {{content-for 'body-footer'}}
+    {{content-for 'test-body-footer'}}
   </body>
 </html>