Upgrade to ember-cli 2.11.0

.travis.yml

@@ -12,10 +12,9 @@ cache:
 
 before_install:
   - npm config set spin false
-  - npm install -g bower
+  - npm install -g bower phantomjs-prebuilt
   - bower --version
-  - npm install phantomjs-prebuilt
-  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
+  - phantomjs --version
 
 install:
   - npm install

bower.json

@@ -1,8 +1,6 @@
 {
   "name": "myapp",
   "dependencies": {
-    "ember": "~2.10.0",
-    "ember-cli-shims": "0.1.3",
     "selectize": "~0.12.1",
     "sifter": "0.5.x",
     "font-awesome": "~4.4.0"

package.json

@@ -15,16 +15,13 @@
     "test": "ember test"
   },
   "repository": "",
-  "engines": {
-    "node": ">= 0.12.0"
-  },
   "author": "",
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.5.0",
     "broccoli-manifest": "0.0.7",
     "ember-ajax": "^2.5.3",
-    "ember-cli": "2.10.0",
+    "ember-cli": "2.11.0",
     "ember-cli-active-link-wrapper": "0.3.2",
     "ember-cli-app-version": "^2.0.1",
     "ember-cli-babel": "^5.2.1",
@@ -44,18 +41,22 @@
     "ember-cli-qunit": "^3.0.4",
     "ember-cli-release": "^0.2.9",
     "ember-cli-selectize": "0.5.12",
+    "ember-cli-shims": "^1.0.2",
     "ember-cli-sri": "^2.1.1",
     "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "2.10.0",
-    "ember-disable-proxy-controllers": "^1.0.1",
+    "ember-data": "2.11.0",
     "ember-export-application-global": "^1.1.1",
     "ember-font-awesome": "2.2.0",
     "ember-load-initializers": "^0.6.3",
     "ember-pouch": "4.2.3",
     "ember-resolver": "^2.1.0",
+    "ember-source": "^2.11.0",
     "ember-simple-auth-pouch": "0.1.0-beta.3",
     "loader.js": "^4.1.0"
   },
+  "engines": {
+    "node": ">= 0.12.0"
+  },
   "private": true
 }

tests/helpers/start-app.js

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