Upgrade to Ember 2.10

jbandura · Jun 3, 2017 · 2bf003b · 2bf003b
1 parent 3ff1b46
commit 2bf003b
Show file tree

Hide file tree

Showing 4 changed files with 303 additions and 240 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "ember-legit-forms",
   "dependencies": {
-    "ember": "2.9.0-beta.1",
+    "ember": "2.10.0",
     "ember-cli-shims": "0.1.3"
   }
 }
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
     "ember-ajax": "^2.4.1",
-    "ember-cli": "2.9.0",
+    "ember-cli": "2.10.0",
     "ember-cli-app-version": "^2.0.0",
     "ember-cli-dependency-checker": "^1.3.0",
     "ember-cli-htmlbars": "^1.0.10",
@@ -36,7 +36,7 @@
     "ember-cli-sri": "^2.1.0",
     "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.9.0-beta.1",
+    "ember-data": "^2.10.0",
     "ember-disable-prototype-extensions": "^1.1.0",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.5",

diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -5,8 +5,7 @@ import config from '../../config/environment';
 export default function startApp(attrs) {
   let application;
 
-  let attributes = Ember.merge({}, config.APP);
-  attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
+  let attributes = Ember.assign({}, config.APP, attrs);
 
   Ember.run(() => {
     application = Application.create(attributes);