Merge pull request #461 from fauxton/ember-cli-2.3

Upgrade to Ember-CLI 2.3.0

app/app.js

@@ -1,6 +1,6 @@
 import Ember from 'ember';
-import Resolver from 'ember-resolver';
-import loadInitializers from 'ember/load-initializers';
+import Resolver from './resolver';
+import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
 Ember.MODEL_FACTORY_INJECTIONS = true;

app/resolver.js

@@ -0,0 +1,3 @@
+import Resolver from 'ember-resolver';
+
+export default Resolver;

bower.json

@@ -19,6 +19,7 @@
     "ember-resolver": "~0.1.20"
   },
   "resolutions": {
-    "ember": "2.2.1"
+    "ember": "2.2.1",
+    "ember-qunit-notifications": "0.1.0"
   }
 }

package.json

@@ -23,28 +23,31 @@
     "broccoli-asset-rev": "^2.2.0",
     "broccoli-sass": "0.6.6",
     "ember-ajax": "0.7.1",
-    "ember-cli": "2.2.0-beta.6",
+    "ember-cli": "^2.3.0",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-autoprefixer": "^0.5.0",
-    "ember-cli-babel": "5.1.5",
+    "ember-cli-babel": "^5.1.5",
     "ember-cli-dependency-checker": "^1.2.0",
-    "ember-cli-deprecation-workflow": "0.1.5",
+    "ember-cli-deprecation-workflow": "0.1.6",
     "ember-cli-document-title": "0.2.0",
-    "ember-cli-htmlbars": "1.0.1",
+    "ember-cli-htmlbars": "^1.0.1",
     "ember-cli-htmlbars-inline-precompile": "^0.3.1",
     "ember-cli-inject-live-reload": "^1.3.1",
     "ember-cli-inline-images": "^0.0.4",
     "ember-cli-pretender": "0.3.1",
-    "ember-cli-qunit": "^1.1.0",
+    "ember-cli-qunit": "^1.2.1",
     "ember-cli-release": "0.2.8",
     "ember-cli-sauce": "^1.1.0",
-    "ember-cli-uglify": "1.2.0",
+    "ember-cli-sri": "^2.0.0",
+    "ember-cli-uglify": "^1.2.0",
     "ember-data": "^2.3.0",
     "ember-data-filter": "1.13.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.4",
+    "ember-load-initializers": "^0.5.0",
     "ember-resolver": "^2.0.3",
     "ember-try": "0.0.7",
-    "emberx-select": "2.0.2"
+    "emberx-select": "2.0.2",
+    "loader.js": "^4.0.0"
   }
 }

tests/helpers/resolver.js

@@ -1,4 +1,4 @@
-import Resolver from 'ember-resolver';
+import Resolver from '../../resolver';
 import config from '../../config/environment';
 
 const resolver = Resolver.create();

tests/index.html

@@ -30,7 +30,7 @@
 
     {{content-for "body"}}
     {{content-for "test-body"}}
-    <script src="testem.js"></script>
+    <script src="testem.js" integrity=""></script>
     <script src="assets/vendor.js"></script>
     <script src="assets/test-support.js"></script>
     <script src="assets/travis.js"></script>