upgrades ember-cli, adds ember-cli-eslint

.eslintrc.js

@@ -0,0 +1,7 @@
+module.exports = {
+  extends: './node_modules/ember-cli-eslint/coding-standard/ember-application.js',
+  "globals": {
+    "moment": true,
+    "$": true
+  }
+};

.travis.yml

@@ -1,24 +1,17 @@
 ---
 language: node_js
 node_js:
-  - "4.2"
+  - "4"
 
-sudo: required
-dist: trusty
-
-addons:
-  apt:
-    sources:
-    - google-chrome
-    packages:
-    - google-chrome-stable
+sudo: false
 
 cache:
   directories:
     - node_modules
 
 env:
   - EMBER_TRY_SCENARIO=default
+  - EMBER_TRY_SCENARIO=ember-1.13
   - EMBER_TRY_SCENARIO=ember-release
   - EMBER_TRY_SCENARIO=ember-beta
   - EMBER_TRY_SCENARIO=ember-canary
@@ -29,15 +22,17 @@ matrix:
     - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - "npm config set spin false"
-  - "npm install -g npm@^2"
+  - npm config set spin false
+  - npm install -g bower
+  - bower --version
+  - npm install phantomjs-prebuilt
+  - phantomjs --version
 
 install:
-  - npm install -g bower
   - npm install
   - bower install
 
 script:
-  - ember try $EMBER_TRY_SCENARIO test
+  # Usually, it's ok to finish the test scenario without reverting
+  #  to the addon's original dependency state, skipping "cleanup".
+  - ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup

addon/helpers/data-sparkler.js

@@ -12,7 +12,7 @@ let getGroupDomain = function({ data, outputKey, groupKey, sortFn }) {
   return values.map(({ [groupKey]: g }) => g);
 };
 
-export function dataSparkler([], hash) {
+export function dataSparkler([ params ], hash) {
   let outputMax = getOutputMax(hash);
   let groupDomain = getGroupDomain(hash);
   return { outputMax, groupDomain, ...hash };

addon/helpers/log-debug.js

@@ -1,3 +1,5 @@
+/* eslint-disable no-console */
+
 import Ember from 'ember';
 
 export function logDebug([ value ], { msg }) {

bower.json

@@ -1,9 +1,8 @@
 {
   "name": "ember-sparkles",
   "dependencies": {
-    "ember": "~2.4.3",
+    "ember": "~2.7.0-beta.1",
     "ember-cli-shims": "~0.1.1",
-    "ember-cli-test-loader": "0.2.2",
     "ember-qunit-notifications": "0.1.0",
     "moment-range": "^2.2.0"
   }

package.json

@@ -9,7 +9,7 @@
   "scripts": {
     "build": "ember build",
     "start": "ember server",
-    "test": "ember try:testall"
+    "test": "ember try:each"
   },
   "repository": "https://github.com/LocusEnergy/ember-sparkles",
   "engines": {
@@ -19,26 +19,27 @@
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.2",
-    "ember-ajax": "0.7.1",
-    "ember-cli": "2.4.3",
+    "ember-ajax": "2.0.1",
+    "ember-cli": "^2.7.0-beta.4",
     "ember-cli-app-version": "^1.0.0",
     "ember-cli-dependency-checker": "^1.2.0",
+    "ember-cli-eslint": "1.6.0",
     "ember-cli-htmlbars-inline-precompile": "^0.3.1",
     "ember-cli-inject-live-reload": "^1.4.0",
-    "ember-cli-qunit": "^1.4.0",
+    "ember-cli-qunit": "^2.0.0",
     "ember-cli-release": "1.0.0-beta.2",
     "ember-cli-sass": "5.3.1",
     "ember-cli-sri": "^2.1.0",
+    "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-concurrency": "0.6.3",
-    "ember-data": "^2.4.2",
+    "ember-data": "^2.7.0-beta.1",
     "ember-disable-prototype-extensions": "^1.1.0",
     "ember-export-application-global": "^1.0.5",
     "ember-interpolate-helper": "0.1.1",
     "ember-load-initializers": "^0.5.1",
     "ember-lodash": "0.0.7",
     "ember-resolver": "^2.0.3",
-    "ember-try": "0.2.4",
     "loader.js": "^4.0.1"
   },
   "keywords": [

testem.js

@@ -0,0 +1,13 @@
+/*jshint node:true*/
+module.exports = {
+  "framework": "qunit",
+  "test_page": "tests/index.html?hidepassed",
+  "disable_watching": true,
+  "launch_in_ci": [
+    "PhantomJS"
+  ],
+  "launch_in_dev": [
+    "PhantomJS",
+    "Chrome"
+  ]
+};

tests/.eslintrc.js

@@ -0,0 +1,3 @@
+module.exports = {
+  extends: '../node_modules/ember-cli-eslint/coding-standard/ember-testing.js'
+};

tests/dummy/app/index.html

@@ -9,16 +9,16 @@
 
     {{content-for "head"}}
 
-    <link rel="stylesheet" href="assets/vendor.css">
-    <link rel="stylesheet" href="assets/dummy.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/dummy.css">
 
     {{content-for "head-footer"}}
   </head>
   <body>
     {{content-for "body"}}
 
-    <script src="assets/vendor.js"></script>
-    <script src="assets/dummy.js"></script>
+    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script src="{{rootURL}}assets/dummy.js"></script>
 
     {{content-for "body-footer"}}
   </body>

tests/dummy/app/router.js

@@ -2,7 +2,8 @@ import Ember from 'ember';
 import config from './config/environment';
 
 const Router = Ember.Router.extend({
-  location: config.locationType
+  location: config.locationType,
+  rootURL: config.rootURL
 });
 
 Router.map(function() {

tests/dummy/app/utils/fixture-data.js

@@ -138,7 +138,7 @@ export const SEPTEMBER_MANY_DATAPOINTS = {
     {
       ts: '2014-09-29T00:00:00',
       value: 1166
-    },
+    }
   ]
 };
 

tests/dummy/app/views/application.js

@@ -1,5 +1,5 @@
 import Ember from 'ember';
 
 export default Ember.Component.extend({
-  elementId: 'ember-sparkles',
+  elementId: 'ember-sparkles'
 });

tests/dummy/config/environment.js

@@ -4,7 +4,7 @@ module.exports = function(environment) {
   var ENV = {
     modulePrefix: 'dummy',
     environment: environment,
-    baseURL: '/',
+    rootURL: '/',
     locationType: 'auto',
     EmberENV: {
       FEATURES: {
@@ -29,7 +29,6 @@ module.exports = function(environment) {
 
   if (environment === 'test') {
     // Testem prefers this...
-    ENV.baseURL = '/';
     ENV.locationType = 'none';
 
     // keep test console output quieter

tests/helpers/module-for-acceptance.js

@@ -1,23 +1,23 @@
 import { module } from 'qunit';
+import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
 
+const { RSVP: { Promise } } = Ember;
+
 export default function(name, options = {}) {
   module(name, {
     beforeEach() {
       this.application = startApp();
 
       if (options.beforeEach) {
-        options.beforeEach.apply(this, arguments);
+        return options.beforeEach.apply(this, arguments);
       }
     },
 
     afterEach() {
-      if (options.afterEach) {
-        options.afterEach.apply(this, arguments);
-      }
-
-      destroyApp(this.application);
+      let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
+      return Promise.resolve(afterEach).then(() => destroyApp(this.application));
     }
   });
 }

tests/index.html

@@ -10,9 +10,9 @@
     {{content-for "head"}}
     {{content-for "test-head"}}
 
-    <link rel="stylesheet" href="assets/vendor.css">
-    <!--<link rel="stylesheet" href="assets/dummy.css">-->
-    <link rel="stylesheet" href="assets/test-support.css">
+    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <!-- <link rel="stylesheet" href="{{rootURL}}assets/dummy.css"> -->
+    <link rel="stylesheet" href="{{rootURL}}assets/test-support.css">
 
     {{content-for "head-footer"}}
     {{content-for "test-head-footer"}}
@@ -21,12 +21,11 @@
     {{content-for "body"}}
     {{content-for "test-body"}}
 
-    <script src="testem.js" integrity=""></script>
-    <script src="assets/vendor.js"></script>
-    <script src="assets/test-support.js"></script>
-    <script src="assets/dummy.js"></script>
-    <script src="assets/tests.js"></script>
-    <script src="assets/test-loader.js"></script>
+    <script src="{{rootURL}}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>
+    <script src="{{rootURL}}assets/tests.js"></script>
 
     {{content-for "body-footer"}}
     {{content-for "test-body-footer"}}