Upgrade ember-cli

.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,7 +13,6 @@
 /connect.lock
 /coverage/*
 /libpeerconnection.log
-npm-debug.log
+npm-debug.log*
 testem.log
-
 .env.deploy.*

.travis.yml

@@ -1,24 +1,43 @@
+---
 language: node_js
 node_js:
-  - '4'
+  - "4"
+
 sudo: false
+
 cache:
+  yarn: true
   directories:
     - node_modules
+
+env:
+  # 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-canary
+
 before_install:
-  - npm config set spin false
-  - npm install -g bower
   - npm install -g yarn
+  - yarn add global bower
   - bower --version
-  - npm i phantomjs-prebuilt
-  - phantomjs --version
+  - yarn add phantomjs-prebuilt
+  - node_modules/phantomjs-prebuilt/bin/phantomjs --version
+
 install:
   - yarn
   - bower install
 
 after_success:
   test $TRAVIS_BRANCH = "master" && ember deploy production
+
 script:
   # Usually, it's ok to finish the test scenario without reverting
   #  to the addon's original dependency state, skipping "cleanup".
-  - ember try:each --skip-cleanup
+  - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup

bower.json

@@ -4,10 +4,10 @@
     "ember-mocha": "0.8.8",
     "chai-jquery": "~2.0.0",
     "sinon-chai": "~2.8.0",
-    "ember": "~2.3.0",
-    "ember-cli-shims": "0.1.1",
     "bootstrap": "v4.0.0-alpha.4",
     "marked": "^0.3.6",
-    "highlightjs": "^9.6.0"
+    "highlightjs": "^9.6.0",
+    "ember": "~2.10.0",
+    "ember-cli-shims": "0.1.3"
   }
 }

config/ember-try.js

@@ -2,9 +2,25 @@
 module.exports = {
   scenarios: [
     {
-      name: 'default',
+      name: 'ember-lts-2.4',
       bower: {
-        dependencies: { }
+        dependencies: {
+          'ember': 'components/ember#lts-2-4'
+        },
+        resolutions: {
+          'ember': 'lts-2-4'
+        }
+      }
+    },
+    {
+      name: 'ember-lts-2.8',
+      bower: {
+        dependencies: {
+          'ember': 'components/ember#lts-2-8'
+        },
+        resolutions: {
+          'ember': 'lts-2-8'
+        }
       }
     },
     {
@@ -39,20 +55,6 @@ module.exports = {
           'ember': 'canary'
         }
       }
-    },
-    {
-      name: 'ember-source',
-      allowedToFail: true,
-      bower: {
-        dependencies: {
-          'ember': null
-        }
-      },
-      npm: {
-        devDependencies: {
-          'ember-source': '^2.11.0-alpha.1'
-        }
-      }
     }
   ]
 };

package.json

@@ -12,27 +12,22 @@
     "test": "ember try:each"
   },
   "repository": "https://github.com/thefrontside/emberx-select",
-  "engines": {
-    "node": ">= 0.10.0"
-  },
-  "author": "",
-  "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.4.2",
-    "ember-ajax": "^2.0.1",
-    "ember-cli": "2.7.0",
-    "ember-cli-app-version": "^1.0.0",
-    "ember-cli-dependency-checker": "^1.2.0",
     "ember-cli-deploy": "0.5.1",
     "ember-cli-eslint": "3.0.0",
-    "ember-cli-document-title": "0.3.1",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
-    "ember-cli-inject-live-reload": "^1.4.0",
+    "ember-cli-document-title": "0.3.3",
     "ember-cli-mocha": "0.10.4",
+    "broccoli-asset-rev": "^2.4.5",
+    "ember-ajax": "^2.4.1",
+    "ember-cli": "2.10.0",
+    "ember-cli-app-version": "^2.0.0",
+    "ember-cli-dependency-checker": "^1.3.0",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.3",
+    "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-release": "^0.2.9",
     "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.7.0",
+    "ember-data": "^2.10.0",
     "ember-disable-prototype-extensions": "^1.1.0",
     "ember-export-application-global": "^1.0.5",
     "ember-load-initializers": "^0.5.1",
@@ -41,8 +36,8 @@
     "ember-sinon": "0.5.1",
     "eslint-plugin-prefer-let": "^0.1.0",
     "fs-branding": "0.1.2",
-    "loader.js": "^4.0.1",
-    "markdown-code-highlighting": "0.1.0"
+    "markdown-code-highlighting": "0.1.0",
+    "loader.js": "^4.0.10"
   },
   "keywords": [
     "ember-addon",
@@ -53,15 +48,19 @@
     "ember select component"
   ],
   "dependencies": {
-    "ember-cli-babel": "^5.1.6",
-    "ember-cli-htmlbars": "^1.1.1",
+    "ember-cli-babel": "^5.1.7",
+    "ember-cli-htmlbars": "^1.0.10",
     "ember-cli-version-checker": "^1.1.6"
   },
+  "engines": {
+    "node": ">= 0.12.0"
+  },
   "ember-addon": {
     "demoURL": "http://emberx-select.pagefrontapp.com",
     "configPath": "tests/dummy/config",
     "versionCompatibility": {
       "ember": ">=1.13.4"
-    }
+    },
+    "configPath": "tests/dummy/config"
   }
 }

tests/dummy/config/environment.js

@@ -4,12 +4,16 @@ module.exports = function(environment) {
   var ENV = {
     modulePrefix: 'dummy',
     environment: environment,
-    locationType: 'auto',
     rootURL: '/',
+    locationType: 'auto',
     EmberENV: {
       FEATURES: {
         // Here you can enable experimental features on an ember canary build
         // e.g. 'with-controller': true
+      },
+      EXTEND_PROTOTYPES: {
+        // Prevent Ember Data from overriding Date.parse.
+        Date: false
       }
     },
 
@@ -30,7 +34,6 @@ module.exports = function(environment) {
   if (environment === 'test') {
     // Testem prefers this...
     ENV.locationType = 'none';
-    ENV.rootURL = "/";
 
     // keep test console output quieter
     ENV.APP.LOG_ACTIVE_GENERATION = false;
@@ -40,6 +43,7 @@ module.exports = function(environment) {
   }
 
   if (environment === 'production') {
+
   }
 
   return ENV;

tests/helpers/start-app.js

@@ -6,6 +6,9 @@ import './get-component-by-id';
 export default function startApp(attrs) {
   let application;
 
+  // Warning for the Ember-CLI upgrader:
+  // Don't update this line to Ember.assign because we must test in
+  // versions of ember that don't have Ember.assign.
   let attributes = Ember.merge({}, config.APP);
   attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
 

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>