From d606ba2228b4fbf3e4e3db88cc8afdf4e51fa73c Mon Sep 17 00:00:00 2001
From: Matthew Dillon <mrdillon@alaska.edu>
Date: Fri, 27 Feb 2015 14:17:54 -0900
Subject: [PATCH] Upgrade ember-cli to v0.2.0-beta.1. Closes #4.

---
 bower.json           | 11 +++++------
 package.json         | 14 ++++++++------
 tests/.jshintrc      | 23 -----------------------
 tests/index.html     | 16 ----------------
 tests/test-helper.js |  6 ------
 5 files changed, 13 insertions(+), 57 deletions(-)

diff --git a/bower.json b/bower.json
index 22b314f..0c73477 100644
--- a/bower.json
+++ b/bower.json
@@ -1,17 +1,16 @@
 {
   "name": "hymenobacterdotinfo",
   "dependencies": {
-    "handlebars": "~1.3.0",
     "jquery": "~2.1.1",
-    "ember": "1.8.1",
-    "ember-data": "1.0.0-beta.12",
+    "ember": "1.10.0",
+    "ember-data": "1.0.0-beta.15",
     "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.5",
+    "ember-qunit": "0.2.8",
+    "ember-qunit-notifications": "0.0.7",
     "qunit": "~1.17.1",
     "flakes": "~1.0.0",
     "ember-simple-auth": "~0.7.2",
diff --git a/package.json b/package.json
index 4492967..6d5b28f 100644
--- a/package.json
+++ b/package.json
@@ -20,18 +20,20 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.0.0",
-    "broccoli-ember-hbs-template-compiler": "^1.6.1",
-    "ember-cli": "^0.1.9",
-    "ember-cli-6to5": "0.2.1",
+    "ember-cli": "0.2.0-beta.1",
+    "ember-cli-babel": "^4.0.0",
+    "ember-cli-app-version": "0.3.1",
     "ember-cli-content-security-policy": "0.3.0",
     "ember-cli-dependency-checker": "0.0.7",
     "ember-cli-divshot": "^0.1.7",
+    "ember-cli-htmlbars": "0.7.4",
     "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-qunit": "0.1.2",
+    "ember-cli-qunit": "0.3.8",
     "ember-cli-simple-auth": "^0.7.2",
-    "ember-data": "1.0.0-beta.12",
-    "ember-export-application-global": "^1.0.0",
+    "ember-cli-uglify": "1.0.1",
+    "ember-data": "1.0.0-beta.15",
+    "ember-export-application-global": "^1.0.2",
     "express": "^4.8.5",
     "glob": "^4.0.5"
   }
diff --git a/tests/.jshintrc b/tests/.jshintrc
index 6ebf71a..ea8b88f 100644
--- a/tests/.jshintrc
+++ b/tests/.jshintrc
@@ -6,29 +6,8 @@
     "setTimeout",
     "$",
     "-Promise",
-    "QUnit",
     "define",
     "console",
-    "equal",
-    "notEqual",
-    "notStrictEqual",
-    "test",
-    "asyncTest",
-    "testBoth",
-    "testWithDefault",
-    "raises",
-    "throws",
-    "deepEqual",
-    "start",
-    "stop",
-    "ok",
-    "strictEqual",
-    "module",
-    "moduleFor",
-    "moduleForComponent",
-    "moduleForModel",
-    "process",
-    "expect",
     "visit",
     "exists",
     "fillIn",
@@ -39,8 +18,6 @@
     "findWithAssert",
     "wait",
     "DS",
-    "isolatedContainer",
-    "startApp",
     "andThen",
     "currentURL",
     "currentPath",
diff --git a/tests/index.html b/tests/index.html
index 41a663f..648f884 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/hymenobacterdotinfo.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 b7f4520..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;