From ffd45397b69622f5b1144ba75dff7e29808d3019 Mon Sep 17 00:00:00 2001
From: Szymon Nowak <szimek@gmail.com>
Date: Sat, 21 Feb 2015 23:14:14 +0100
Subject: [PATCH] Update ember-cli to 0.2.0 beta

---
 .jshintrc                     |  1 -
 app/templates/application.hbs |  4 ++--
 bower.json                    | 11 +++++------
 config/environment.js         |  7 ++++++-
 package.json                  | 20 ++++++++++++++------
 testem.json                   |  2 +-
 tests/.jshintrc               |  1 +
 tests/index.html              | 16 ----------------
 tests/test-helper.js          |  6 ------
 9 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/.jshintrc b/.jshintrc
index 749105c..b11af91 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -16,7 +16,6 @@
   "laxbreak": false,
   "newcap": true,
   "noarg": true,
-  "node": true,
   "noempty": false,
   "nonew": false,
   "nomen": false,
diff --git a/app/templates/application.hbs b/app/templates/application.hbs
index 6002a7b..e631888 100644
--- a/app/templates/application.hbs
+++ b/app/templates/application.hbs
@@ -29,10 +29,10 @@
 </header>
 
 {{outlet}}
-{{outlet modal}}
+{{outlet "modal"}}
 
 <footer class="l-footer">
-  <p class="about">{{outlet about_you}}</p>
+  <p class="about">{{outlet "about_you"}}</p>
   <div class="cowbell-labs">
     <span>Made by</span>
     <a href="https://cowbell-labs.com/" target="_blank"><span>Cowbell Labs</span></a>
diff --git a/bower.json b/bower.json
index 166e063..cda92b2 100644
--- a/bower.json
+++ b/bower.json
@@ -1,17 +1,16 @@
 {
   "name": "share-drop",
   "dependencies": {
-    "handlebars": "~1.3.0",
     "jquery": "^1.11.1",
-    "ember": "1.8.1",
+    "ember": "1.10.0",
     "ember-resolver": "~0.1.11",
     "loader.js": "ember-cli/loader.js#1.0.1",
     "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
-    "ember-cli-test-loader": "rwjblue/ember-cli-test-loader#0.0.4",
+    "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
     "ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
-    "ember-qunit": "0.1.8",
-    "ember-qunit-notifications": "0.0.4",
-    "qunit": "~1.15.0"
+    "ember-qunit": "0.2.8",
+    "ember-qunit-notifications": "0.0.7",
+    "qunit": "~1.17.1"
   },
   "devDependencies": {
     "bootstrap": "~3.3.1"
diff --git a/config/environment.js b/config/environment.js
index 44526d2..8eb3031 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -18,7 +18,12 @@ module.exports = function (environment) {
       // when it is created
     },
 
-    FIREBASE_URL: process.env.FIREBASE_URL
+    FIREBASE_URL: process.env.FIREBASE_URL,
+
+    sassOptions: {
+        inputFile: 'app.sass',
+        outputFile: 'share-drop.css'
+    }
   };
 
   if (environment === 'development') {
diff --git a/package.json b/package.json
index d0b6f66..8af5310 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,11 @@
   "name": "share-drop",
   "version": "1.0.0",
   "description": "P2P file sharing",
+  "private": true,
+  "directories": {
+    "doc": "doc",
+    "test": "tests"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/cowbell/sharedrop.git"
@@ -16,17 +21,20 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.0",
-    "broccoli-ember-hbs-template-compiler": "^1.6.1",
-    "broccoli-sass": "^0.3.3",
-    "ember-cli": "0.1.7",
+    "ember-cli": "0.2.0-beta.1",
+    "ember-cli-babel": "^4.0.0",
+    "ember-cli-app-version": "0.3.1",
     "ember-cli-dependency-checker": "0.0.7",
+    "ember-cli-htmlbars": "0.7.4",
     "ember-cli-dotenv": "^0.3.4",
-    "ember-cli-6to5": "0.2.1",
     "ember-cli-google-analytics": "^1.2.0",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.1.2",
-    "ember-export-application-global": "^1.0.0",
+    "ember-cli-qunit": "0.3.8",
+    "ember-cli-sass": "3.0.6",
+    "ember-cli-uglify": "1.0.1",
+    "ember-export-application-global": "^1.0.2",
+    "express": "^4.8.5",
     "glob": "^4.0.5"
   },
   "dependencies": {
diff --git a/testem.json b/testem.json
index eff93f9..42a4ddb 100644
--- a/testem.json
+++ b/testem.json
@@ -1,6 +1,6 @@
 {
   "framework": "qunit",
-  "test_page": "tests/index.html",
+  "test_page": "tests/index.html?hidepassed",
   "launch_in_ci": [
     "PhantomJS"
   ],
diff --git a/tests/.jshintrc b/tests/.jshintrc
index 6ebf71a..afb318a 100644
--- a/tests/.jshintrc
+++ b/tests/.jshintrc
@@ -22,6 +22,7 @@
     "start",
     "stop",
     "ok",
+    "ok",
     "strictEqual",
     "module",
     "moduleFor",
diff --git a/tests/index.html b/tests/index.html
index e337d00..c3b29c2 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -13,22 +13,6 @@
     <link rel="stylesheet" href="assets/vendor.css">
     <link rel="stylesheet" href="assets/share-drop.css">
     <link rel="stylesheet" href="assets/test-support.css">
-    <style>
-      #ember-testing-container {
-        position: absolute;
-        background: white;
-        bottom: 0;
-        right: 0;
-        width: 640px;
-        height: 384px;
-        overflow: auto;
-        z-index: 9999;
-        border: 1px solid #ccc;
-      }
-      #ember-testing {
-        zoom: 50%;
-      }
-    </style>
 
     {{content-for 'head-footer'}}
     {{content-for 'test-head-footer'}}
diff --git a/tests/test-helper.js b/tests/test-helper.js
index b5f6449..e6cfb70 100644
--- a/tests/test-helper.js
+++ b/tests/test-helper.js
@@ -4,9 +4,3 @@ import {
 } from 'ember-qunit';
 
 setResolver(resolver);
-
-document.write('<div id="ember-testing-container"><div id="ember-testing"></div></div>');
-
-QUnit.config.urlConfig.push({ id: 'nocontainer', label: 'Hide container'});
-var containerVisibility = QUnit.urlParams.nocontainer ? 'hidden' : 'visible';
-document.getElementById('ember-testing-container').style.visibility = containerVisibility;