Updated to ember-cli 2.12.2 and ember 2.11.0

Note that I cannot update to ember 2.12 just yet until there is a resolution for emberjs/ember.js#15013

.eslintrc.js

@@ -0,0 +1,13 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 6,
+    sourceType: 'module'
+  },
+  extends: 'eslint:recommended',
+  env: {
+    browser: true
+  },
+  rules: {
+  }
+};

.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

.npmignore

@@ -8,7 +8,7 @@
 .editorconfig
 .ember-cli
 .gitignore
-.jshintrc
+.eslintrc.js
 .watchmanconfig
 .travis.yml
 bower.json

addon/helpers/r/debugger.js

@@ -3,9 +3,9 @@ import Ember from 'ember';
 export function rDebugger(params, hash) {
   return function(value) {
     /** These are here to make sure that they show up in Chrome debugger after babel processes them */
-    params = params;
-    hash = hash;
-    debugger; // jshint ignore:line
+    params = params; // eslint-disable-line
+    hash = hash; // eslint-disable-line
+    debugger; // eslint-disable-line
     return value;
   };
 }

bower.json

@@ -1,11 +1,5 @@
 {
   "name": "ember-reactive-helpers",
   "dependencies": {
-    "ember": "~2.9.0-beta.1",
-    "ember-cli-shims": "0.1.3",
-    "mocha": "~2.2.4",
-    "chai": "~2.3.0",
-    "ember-mocha-adapter": "~0.3.1",
-    "es5-shim": "^4.5.8"
   }
 }

config/ember-try.js

@@ -1,20 +1,35 @@
-/*jshint node:true*/
+/* eslint-env node */
 module.exports = {
   scenarios: [
     {
-      name: 'default',
+      name: 'ember-lts-2.4',
       bower: {
-        dependencies: { }
+        dependencies: {
+          'ember': 'components/ember#lts-2-4'
+        },
+        resolutions: {
+          'ember': 'lts-2-4'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
-      name: 'ember-1.13',
+      name: 'ember-lts-2.8',
       bower: {
         dependencies: {
-          'ember': '~1.13.0'
+          'ember': 'components/ember#lts-2-8'
         },
         resolutions: {
-          'ember': '~1.13.0'
+          'ember': 'lts-2-8'
+        }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
         }
       }
     },
@@ -27,6 +42,11 @@ module.exports = {
         resolutions: {
           'ember': 'release'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
@@ -38,6 +58,11 @@ module.exports = {
         resolutions: {
           'ember': 'beta'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
       }
     },
     {
@@ -49,6 +74,17 @@ module.exports = {
         resolutions: {
           'ember': 'canary'
         }
+      },
+      npm: {
+        devDependencies: {
+          'ember-source': null
+        }
+      }
+    },
+    {
+      name: 'ember-default',
+      npm: {
+        devDependencies: {}
       }
     }
   ]

config/environment.js

@@ -1,4 +1,4 @@
-/*jshint node:true*/
+/* eslint-env node */
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {

ember-cli-build.js

@@ -1,6 +1,5 @@
-/*jshint node:true*/
-/* global require, module */
-var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
+/* eslint-env node */
+const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
   var app = new EmberAddon(defaults, {

index.js

@@ -1,4 +1,4 @@
-/* jshint node: true */
+/* eslint-env node */
 'use strict';
 
 module.exports = {

package.json

@@ -17,42 +17,42 @@
     "url": "git@github.com:EmberSherpa/ember-reactive-helpers.git"
   },
   "engines": {
-    "node": ">= 0.10.0"
+    "node": ">= 4"
   },
   "author": "Taras Mankovski <tarasm@gmail.com>",
   "license": "MIT",
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
     "ember-addon-genie": "0.0.6",
     "ember-ajax": "^2.5.1",
-    "ember-cli": "2.9.0-beta.1",
-    "ember-cli-app-version": "^2.0.0",
+    "ember-cli": "2.12.2",
+    "ember-cli-chai": "^0.3.2",
     "ember-cli-dependency-checker": "^1.3.0",
-    "ember-cli-htmlbars": "^1.0.10",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.3",
-    "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-jshint": "^1.0.4",
+    "ember-cli-eslint": "^3.0.0",
     "ember-cli-github-pages": "0.1.0",
-    "ember-cli-mocha": "0.10.4",
+    "ember-cli-htmlbars": "^1.1.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.6",
+    "ember-cli-inject-live-reload": "^1.4.1",
+    "ember-cli-mocha": "0.14.0",
     "ember-cli-release": "^0.2.9",
+    "ember-cli-shims": "^1.0.2",
     "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-disable-prototype-extensions": "^1.1.0",
     "ember-export-application-global": "^1.0.5",
     "ember-let": "0.5.2",
-    "ember-load-initializers": "^0.5.1",
+    "ember-load-initializers": "^0.6.0",
     "ember-math-helpers": "1.2.1",
     "ember-promise-helpers": "1.0.2",
     "ember-resolver": "^2.0.3",
-    "loader.js": "^4.0.10"
+    "ember-source": "2.11.0",
+    "loader.js": "^4.2.3"
   },
   "keywords": [
     "ember-addon"
   ],
   "dependencies": {
-    "ember-composable-helpers": "1.1.2",    
+    "ember-composable-helpers": "1.1.2",
     "ember-concurrency": "0.7.8",
     "ember-cli-babel": "^5.1.7"
   },

testem.js

@@ -1,4 +1,4 @@
-/*jshint node:true*/
+/* eslint-env node */
 module.exports = {
   "framework": "qunit",
   "test_page": "tests/index.html?hidepassed",

tests/.eslintrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+  env: {
+    embertest: true
+  },
+  globals: {
+    "$": true
+  },
+};

tests/dummy/config/environment.js

@@ -1,4 +1,4 @@
-/* jshint node: true */
+/* eslint-env node */
 
 module.exports = function(environment) {
   var ENV = {

tests/helpers/start-app.js

@@ -3,16 +3,13 @@ import Application from '../../app';
 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
-  let attributes = Ember.assign({}, config.APP, attrs);
-
-  Ember.run(() => {
-    application = Application.create(attributes);
+  return Ember.run(() => {
+    let application = Application.create(attributes);
     application.setupForTesting();
     application.injectTestHelpers();
+    return application;
   });
-
-  return application;
 }

tests/integration/helpers/r-get-test.js

@@ -6,6 +6,9 @@ import {
 } from 'ember-mocha';
 import hbs from 'htmlbars-inline-precompile';
 
+// NOTE: As of Ember 2.11.1, chai can't handle the thrown errors due to a change in error event dispatching
+// see https://github.com/emberjs/ember.js/issues/15013
+
 describeComponent(
   'r/get',
   'Integration: r/get',