upgrade ember to 2.10.1 which fixes emberjs/ember.js#14654

.gitignore

@@ -1,4 +1,4 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
+# See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
 /dist
@@ -13,5 +13,5 @@
 /connect.lock
 /coverage/*
 /libpeerconnection.log
-npm-debug.log
+npm-debug.log*
 testem.log

.travis.yml

@@ -7,21 +7,20 @@ sudo: false
 
 cache:
   directories:
-    - node_modules
+    - $HOME/.npm
+    - $HOME/.cache # includes bowers cache
 
 env:
-  - EMBER_TRY_SCENARIO=default
-  - EMBER_TRY_SCENARIO=ember-1.13
-  - EMBER_TRY_SCENARIO=ember-glimmer-1
+  # we recommend testing LTS's and latest stable release (bonus points to beta/canary)
+  - EMBER_TRY_SCENARIO=ember-lts-2.4
+  - EMBER_TRY_SCENARIO=ember-lts-2.8
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary
 
 matrix:
   fast_finish: true
   allow_failures:
-    - env: EMBER_TRY_SCENARIO=ember-1.13 # Doesn't have contextual commponents
-    - env: EMBER_TRY_SCENARIO=ember-beta
     - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "ember-select-box",
   "dependencies": {
-    "ember": "~2.10.0",
+    "ember": "~2.10.1",
     "ember-cli-shims": "0.1.3"
   }
 }

config/ember-try.js

@@ -1,65 +1,59 @@
-/* eslint-disable no-undef */
+/* eslint-disable no-undef, quote-props */
 
 module.exports = {
   scenarios: [
     {
-      name: 'default',
-      bower: {
-        dependencies: { }
-      }
-    },
-    {
-      name: 'ember-1.13',
+      name: 'ember-lts-2.4',
       bower: {
         dependencies: {
-          ember: '~1.13.0'
+          'ember': 'components/ember#lts-2-4'
         },
         resolutions: {
-          ember: '~1.13.0'
+          'ember': 'lts-2-4'
         }
       }
     },
     {
-      name: 'ember-glimmer-1',
+      name: 'ember-lts-2.8',
       bower: {
         dependencies: {
-          ember: '2.9.1'
+          'ember': 'components/ember#lts-2-8'
         },
         resolutions: {
-          ember: '2.9.1'
+          'ember': 'lts-2-8'
         }
       }
     },
     {
       name: 'ember-release',
       bower: {
         dependencies: {
-          ember: 'components/ember#release'
+          'ember': 'components/ember#release'
         },
         resolutions: {
-          ember: 'release'
+          'ember': 'release'
         }
       }
     },
     {
       name: 'ember-beta',
       bower: {
         dependencies: {
-          ember: 'components/ember#beta'
+          'ember': 'components/ember#beta'
         },
         resolutions: {
-          ember: 'beta'
+          'ember': 'beta'
         }
       }
     },
     {
       name: 'ember-canary',
       bower: {
         dependencies: {
-          ember: 'components/ember#canary'
+          'ember': 'components/ember#canary'
         },
         resolutions: {
-          ember: 'canary'
+          'ember': 'canary'
         }
       }
     }

package.json

@@ -16,41 +16,39 @@
     "url": "https://github.com/amk221/ember-select-box.git"
   },
   "engines": {
-    "node": ">= 0.10.0"
+    "node": ">= 0.12.0"
   },
   "author": "Andrew Kirwin",
   "license": "MIT",
   "devDependencies": {
-    "bower": "1.8.0",
-    "broccoli-asset-rev": "^2.5.0",
-    "ember-cli-dependency-checker": "^1.3.0",
-    "ember-cli-eslint": "^3.0.0",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.6",
-    "ember-cli-htmlbars": "^1.1.0",
-    "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^3.0.2",
-    "ember-cli-release": "^0.2.9",
-    "ember-cli-sri": "^2.1.1",
-    "ember-cli-test-loader": "^1.1.0",
-    "ember-cli-uglify": "^1.2.0",
-    "ember-cli": "^2.9.1",
+    "broccoli-asset-rev": "2.5.0",
+    "ember-cli-dependency-checker": "1.3.0",
+    "ember-cli-eslint": "3.0.0",
+    "ember-cli-htmlbars-inline-precompile": "0.3.6",
+    "ember-cli-htmlbars": "1.1.1",
+    "ember-cli-inject-live-reload": "1.4.1",
+    "ember-cli-qunit": "3.0.2",
+    "ember-cli-release": "0.2.9",
+    "ember-cli-sri": "2.1.1",
+    "ember-cli-test-loader": "1.1.0",
+    "ember-cli-uglify": "1.2.0",
+    "ember-cli": "2.10.0",
     "ember-disable-prototype-extensions": "1.1.0",
-    "ember-disable-proxy-controllers": "^1.0.1",
-    "ember-load-initializers": "^0.5.1",
-    "ember-resolver": "^2.1.0",
-    "loader.js": "^4.0.11",
-    "phantomjs-prebuilt": "2.1.13"
+    "ember-disable-proxy-controllers": "1.0.1",
+    "ember-load-initializers": "0.6.0",
+    "ember-resolver": "2.1.0",
+    "loader.js": "4.0.11"
+  },
+  "dependencies": {
+    "ember-cli-babel": "^5.1.10",
+    "ember-cli-htmlbars": "^1.1.0"
   },
   "keywords": [
     "ember-addon",
     "select",
     "select-box",
     "dropdown"
   ],
-  "dependencies": {
-    "ember-cli-babel": "^5.1.10",
-    "ember-cli-htmlbars": "^1.1.0"
-  },
   "ember-addon": {
     "configPath": "tests/dummy/config",
     "versionCompatibility": {

tests/helpers/start-app.js

@@ -5,8 +5,8 @@ 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;
+  // use defaults, but you can override
+  const attributes = Ember.assign({}, config.APP, attrs);
 
   Ember.run(() => {
     application = Application.create(attributes);

tests/index.html

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